trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui(minor): simplify top navigation

This commit is contained in:
Langhammer, Jens 2019-10-10 10:02:48 +02:00
parent 432176ea2f
commit ca3bcc565d
5 changed files with 28 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
passbook/core/templates/base/skeleton.html
View File

@ -46,9 +46,6 @@
<script src="{% static 'js/passbook.js' %}"></script> <script src="{% static 'js/passbook.js' %}"></script>
{% block scripts %} {% block scripts %}
{% endblock %} {% endblock %}
<div class="modals">
{% include 'partials/about_modal.html' %}
</div>
</body> </body>
</html> </html>

3
passbook/core/templates/base/skeleton_login.html
View File

@ -46,9 +46,6 @@
<script src="{% static 'js/passbook.js' %}"></script> <script src="{% static 'js/passbook.js' %}"></script>
{% block scripts %} {% block scripts %}
{% endblock %} {% endblock %}
<div class="modals">
{% include 'partials/about_modal.html' %}
</div>
</body> </body>
</html> </html>

43
passbook/core/templates/overview/base.html
View File

@ -23,37 +23,18 @@
</div> </div>
<nav class="collapse navbar-collapse"> <nav class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right navbar-iconic navbar-utility"> <ul class="nav navbar-nav navbar-right navbar-iconic navbar-utility">
<li class="dropdown"> <a href="{% url 'passbook_core:auth-logout' %}" class="btn btn-link nav-item-iconic" aria-haspopup="true" aria-expanded="true">
<button class="btn btn-link dropdown-toggle nav-item-iconic" id="dropdownMenu1" data-toggle="dropdown" <span title="Username" class="fa fa-sign-out"></span>
aria-haspopup="true" aria-expanded="true"> <span class="dropdown-title">
<span title="Help" class="fa pficon-help"></span> {% trans 'Logout' %}
</button> </span>
<ul class="dropdown-menu" aria-labelledby="dropdownMenu1"> </a>
{% comment %} <li><a href="#0">Help</a></li> {% endcomment %} <a href="{% url 'passbook_core:user-settings' %}" class="btn btn-link nav-item-iconic" aria-haspopup="true" aria-expanded="true">
<li><a data-toggle="modal" data-target="#about-modal" href="#0">{% trans 'About' %}</a></li> <span title="Username" class="fa pficon-user"></span>
</ul> <span class="dropdown-title">
</li> {{ user.username }}
<li class="dropdown"> </span>
<button class="btn btn-link dropdown-toggle nav-item-iconic" id="dropdownMenu2" data-toggle="dropdown" </a>
aria-haspopup="true" aria-expanded="true">
<span title="Username" class="fa pficon-user"></span>
<span class="dropdown-title">
{{ user.username }} <span class="caret"></span>
</span>
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
<li>
<a href="{% url 'passbook_core:user-settings' %}">{% trans 'User Settings' %}</a>
</li>
<li>
<a href="{% url 'passbook_core:user-change-password' %}">{% trans 'Change Password' %}</a>
</li>
<li class="divider"></li>
<li>
<a href="{% url 'passbook_core:auth-logout' %}">{% trans 'Logout' %}</a>
</li>
</ul>
</li>
</ul> </ul>
</nav> </nav>
</nav> </nav>

36
passbook/core/templates/partials/about_modal.html
View File

@ -1,36 +0,0 @@
{% load static %}
{% load i18n %}
{% load cache %}
{% load utils %}
<div class="modal fade" id="about-modal" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content about-modal-pf">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
<span class="pficon pficon-close"></span>
</button>
</div>
<div class="modal-body">
<h1>{% trans 'passbook' %}</h1>
<div class="product-versions-pf">
<ul class="list-unstyled">
{% app_versions as vers %}
{% cache 600 versions %}
{% for app, ver in vers.items %}
<li><strong>{{ app }}</strong> {{ ver }}</li>
{% endfor %}
{% endcache %}
</ul>
</div>
<div class="trademark-pf">
Trademark and Copyright Information
</div>
</div>
<div class="modal-footer">
<img style="max-height:64px;" src="{% static 'img/logo.png' %}" alt=" Symbol">
</div>
</div>
</div>
</div>

28
passbook/core/templates/user/base.html
View File

@ -16,23 +16,27 @@
<i class="fa pficon-edit"></i> {% trans 'Details' %} <i class="fa pficon-edit"></i> {% trans 'Details' %}
</a> </a>
</li> </li>
<li class="nav-divider"></li>
{% user_factors as uf %} {% user_factors as uf %}
{% if uf %}
<li class="nav-divider"></li>
{% endif %}
{% for user_settings in uf %} {% for user_settings in uf %}
<li class="{% is_active user_settings.view_name %}"> <li class="{% is_active user_settings.view_name %}">
<a href="{% url user_settings.view_name %}"> <a href="{% url user_settings.view_name %}">
<i class="{{ user_settings.icon }}"></i> {{ user_settings.name }} <i class="{{ user_settings.icon }}"></i> {{ user_settings.name }}
</a> </a>
</li> </li>
{% endfor %} {% endfor %}
<li class="nav-divider"></li>
{% user_sources as us %} {% user_sources as us %}
{% if us %}
<li class="nav-divider"></li>
{% endif %}
{% for user_settings in us %} {% for user_settings in us %}
<li class="{% if user_settings.view_name == request.get_full_path %} active {% endif %}"> <li class="{% if user_settings.view_name == request.get_full_path %} active {% endif %}">
<a href="{{ user_settings.view_name }}"> <a href="{{ user_settings.view_name }}">
<i class="{{ user_settings.icon }}"></i> {{ user_settings.name }} <i class="{{ user_settings.icon }}"></i> {{ user_settings.name }}
</a> </a>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>