sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-11-04 04:12:45 +00:00
Code Issues Projects Releases Wiki Activity

More Streamlining

Browse Source
This commit is contained in:
Patrick Jentsch
2024-05-03 15:08:57 +02:00
parent 43b38b2216
commit a03b5918d9
18 changed files with 63 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/templates/_base/dropdowns.html.j2 Normal file
View File

@@ -0,0 +1,6 @@
{% if current_user.is_authenticated %}
<ul class="dropdown-content" id="nav-account-dropdown-content">
<li><a href="{{ url_for('settings.settings') }}"><i class="material-icons left">settings</i>Settings</a></li>
<li><a href="{{ url_for('auth.logout') }}"><i class="material-icons left">logout</i>Log out</a></li>
</ul>
{% endif %}

20
app/templates/_base/navbar.html.j2
View File

@@ -9,7 +9,7 @@
{# nopaque logo+wordmark #}
<a href="{{ url_for('main.index') }}" class="brand-logo center" style="height: 100%;">
<img src="{{ url_for('static', filename='images/nopaque-logo+wordmark.png') }}" alt="" class="py-3" style="height: 100%;">
<img src="{{ url_for('static', filename='images/nopaque_-_logo+wordmark.png') }}" alt="" class="py-3" style="height: 100%;">
</a>
{# right items #}
@@ -19,7 +19,7 @@
{# avatar, username and email #}
{# shown for authenticated users #}
<li style="height: 100%;">
<a href="#!" class="dropdown-trigger no-autoinit" data-target="nav-more-dropdown" id="nav-more-dropdown-trigger" style="height: 100%;">
<a href="#!" class="dropdown-trigger no-autoinit" data-target="nav-account-dropdown-content" id="nav-account-dropdown-trigger" style="height: 100%;">
<img src="{{ url_for('users.user_avatar', user_id=current_user.id) }}" alt="" class="left circle py-3 mr-1" style="height: 100%;">
{{ current_user.username }} ({{ current_user.email }})
</a>
@@ -27,18 +27,14 @@
{% else %}
{# log in and register items #}
{# shown for unauthenticated users on all devices #}
<li {% if request.path == url_for('auth.login') %}class="active"{% endif %}><a href="{{ url_for('auth.login') }}"><i class="material-icons left">login</i>Log in</a></li>
<li {% if request.path == url_for('auth.register') %}class="active"{% endif %}><a href="{{ url_for('auth.register') }}"><i class="material-icons left">assignment</i>Register</a></li>
<li {% if request.path == url_for('auth.login') %}class="active"{% endif %}>
<a href="{{ url_for('auth.login') }}"><i class="material-icons left">login</i>Log in</a>
</li>
<li {% if request.path == url_for('auth.register') %}class="active"{% endif %}>
<a href="{{ url_for('auth.register') }}"><i class="material-icons left">assignment</i>Register</a>
</li>
{% endif %}
</ul>
</div>
</nav>
</div>
{% if current_user.is_authenticated %}
<ul class="dropdown-content" id="nav-more-dropdown">
<li><a href="{{ url_for('settings.settings') }}"><i class="material-icons left">settings</i>Settings</a></li>
<li><a href="{{ url_for('auth.logout') }}"><i class="material-icons left">logout</i>Log out</a></li>
</ul>
{% endif %}

19
app/templates/_base/sidenav.html.j2
View File

@@ -10,11 +10,6 @@
</div>
</li>
{# fake-navbar #}
{# shown for large devices #}
<li class="primary-color z-depth-1 hide-on-med-and-down" style="height: 64px;">
</li>
{# general items #}
{# {% if current_user.can('USE_API') %}
<li>
@@ -78,18 +73,22 @@
{# administration items #}
{% if current_user.can('ADMINISTRATE') %}
<li><div class="divider"></div></li>
<li><a class="subheader">Administration</a></li>
<li>
<a class="waves-effect" href="{{ url_for('admin.admin') }}"><i class="material-icons">admin_panel_settings</i>Administration</a>
<a class="waves-effect" href="{{ url_for('admin.corpora') }}"><i class="nopaque-icons">I</i>Corpora</a>
</li>
<li>
<a class="waves-effect" href="{{ url_for('admin.users') }}"><i class="material-icons">manage_accounts</i>Users</a>
</li>
{% endif %}
{# account items #}
<li><div class="divider"></div></li>
<li><a class="subheader">Account</a></li>
<li>
<li class="hide-on-large-only"><div class="divider"></div></li>
<li class="hide-on-large-only"><a class="subheader">Account</a></li>
<li class="hide-on-large-only">
<a class="waves-effect" href="{{ url_for('settings.settings') }}"><i class="material-icons">settings</i>Settings</a>
</li>
<li>
<li class="hide-on-large-only">
<a class="waves-effect" href="{{ url_for('auth.logout') }}"><i class="material-icons">logout</i>Log out</a>
</li>
</ul>