diff options
Diffstat (limited to 'src/templates')
-rw-r--r-- | src/templates/akraino/dashboard/landing.html | 1 | ||||
-rw-r--r-- | src/templates/base/base.html | 43 | ||||
-rw-r--r-- | src/templates/base/dashboard/landing.html | 6 | ||||
-rw-r--r-- | src/templates/base/dashboard/login.html | 5 |
4 files changed, 45 insertions, 10 deletions
diff --git a/src/templates/akraino/dashboard/landing.html b/src/templates/akraino/dashboard/landing.html index d7f434b..5533469 100644 --- a/src/templates/akraino/dashboard/landing.html +++ b/src/templates/akraino/dashboard/landing.html @@ -18,5 +18,6 @@ <p>To get started, book a pod below:</p> <a class="btn btnAkr btn-lg d-flex flex-column justify-content-center align-content-center border text-white p-4" href="/booking/quick/">Book a Pod</a> {% endblock btnGrp %} + {% block returningUsers %} {% endblock returningUsers %} diff --git a/src/templates/base/base.html b/src/templates/base/base.html index cc6d38d..3ecad1a 100644 --- a/src/templates/base/base.html +++ b/src/templates/base/base.html @@ -45,20 +45,49 @@ <i class="fas fa-caret-down rotate"></i> </a> <div class="dropdown-menu dropdown-menu-right"> - {% if user.is_authenticated %} + {% if LFID %} + {% if user.is_authenticated %} <a href="{% url 'account:settings' %}" class="text-dark dropdown-item"> <i class="fas fa-cog"></i> - Settings + Settings </a> - <a href="{% url 'account:logout' %}?next={{ request.path }}" class="text-dark dropdown-item"> + <a id="logout_btn" href="#" method="post" class="text-dark dropdown-item"> <i class="fas fa-sign-out-alt"></i> - Logout + Logout </a> - {% else %} - <a href="{% url 'account:login' %}" class="text-dark dropdown-item"> + <form id="logout_form" action="{% url 'oidc_logout' %}" method="post" style="visibility: hidden;"> + {% csrf_token %} + <input type="submit" value="logout"> + </form> + <script> + const logout_btn = document.getElementById("logout_btn"); + + const logout_form = document.getElementById("logout_form"); + + logout_btn.onclick = function() { logout_form.submit(); }; + </script> + {% else %} + <a href="{% url 'oidc_authentication_init' %}" class="text-dark dropdown-item"> <i class="fas fa-sign-in-alt"></i> - Login with Jira + Login with LFID </a> + {% endif %} + {% else %} + {% if user.is_authenticated %} + <a href="{% url 'account:settings' %}" class="text-dark dropdown-item"> + <i class="fas fa-cog"></i> + Settings + </a> + <a href="{% url 'account:logout' %}?next={{ request.path }}" class="text-dark dropdown-item"> + <i class="fas fa-sign-out-alt"></i> + Logout + </a> + {% else %} + <a href="{% url 'account:login' %}" class="text-dark dropdown-item"> + <i class="fas fa-sign-in-alt"></i> + Login with Jira + </a> + {% endif %} {% endif %} </div> </li> diff --git a/src/templates/base/dashboard/landing.html b/src/templates/base/dashboard/landing.html index ecb12c6..4ed2ec1 100644 --- a/src/templates/base/dashboard/landing.html +++ b/src/templates/base/dashboard/landing.html @@ -43,9 +43,15 @@ <div class="col-12 col-lg-6 mb-4"> <h2 class="border-bottom">Get Started</h2> {% if request.user.is_anonymous %} + {% if LFID %} + <h4 class="text-center"> + To get started, please log in with <a href="{% url 'oidc_authentication_init' %}">Linux Foundation ID</a> + </h4> + {% else %} <h4 class="text-center"> To get started, please log in with your <a href="/accounts/login">Linux Foundation Jira account</a> </h4> + {% endif %} {% else %} {% block btnGrp %} <p>To get started, book a server below:</p> diff --git a/src/templates/base/dashboard/login.html b/src/templates/base/dashboard/login.html index d3aa4ad..5af201a 100644 --- a/src/templates/base/dashboard/login.html +++ b/src/templates/base/dashboard/login.html @@ -1,8 +1,7 @@ {% extends "base.html" %} {% block content %} -<h3>You Must Login To Do That</h3> - -<a href="/accounts/login">Login Here</a> +<h3> You Must Login To Do That<h3> +<a href="{% url 'oidc_authentication_init' %}"> Login Here </a> {% endblock %} |