mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-11-04 04:12:45 +00:00 
			
		
		
		
	Bump dependencies. Some parts needed to be deactivated for that. They need to be reimplemented.
- breadcrumbs (!flask-breadcrumbs) - manual modal button - api blueprint (!flask-marshmallow/!marshmallow-sqlalchemy)
This commit is contained in:
		@@ -1,5 +1,5 @@
 | 
			
		||||
<div class="navbar-fixed">
 | 
			
		||||
  <nav class="nav-extended">
 | 
			
		||||
  <nav>
 | 
			
		||||
    <div class="nav-wrapper primary-color">
 | 
			
		||||
      {% if current_user.is_authenticated %}
 | 
			
		||||
      <a href="#" data-target="sidenav" class="sidenav-trigger"><i class="material-icons">menu</i></a>
 | 
			
		||||
@@ -7,12 +7,11 @@
 | 
			
		||||
      <a href="{{ url_for('main.index') }}" class="brand-logo" style="height: 100%; overflow: hidden;">
 | 
			
		||||
        <img class="hide-on-med-and-up" src="{{ url_for('static', filename='images/nopaque_-_logo.svg') }}" style="height: 128px; margin-top: -32px; margin-left: -32px;">
 | 
			
		||||
      </a>
 | 
			
		||||
      <ul class="right hide-on-med-and-down">
 | 
			
		||||
        <li><a href="{{ url_for('main.news') }}"><i class="material-icons left">email</i>News</a></li>
 | 
			
		||||
      <ul class="right hide-on-small-only">
 | 
			
		||||
        <li>
 | 
			
		||||
          <a class="dropdown-trigger no-autoinit" data-target="nav-more-dropdown" href="#!" id="nav-more-dropdown-trigger">
 | 
			
		||||
          <a class="dropdown-trigger no-autoinit" data-target="nav-more-dropdown" id="nav-more-dropdown-trigger">
 | 
			
		||||
            {% if current_user.is_authenticated %}
 | 
			
		||||
            <img src="{{ url_for('users.user_avatar', user_id=current_user.id) }}" alt="avatar" class="circle left" style="height: 54px; padding:8px;">
 | 
			
		||||
            <img src="{{ url_for('users.user_avatar', user_id=current_user.id) }}" class="left circle py-2 mr-1" style="height: 64px;">
 | 
			
		||||
            {{ current_user.username }} ({{ current_user.email }})
 | 
			
		||||
            {% else %}
 | 
			
		||||
            <i class="material-icons left">more_vert</i>
 | 
			
		||||
@@ -21,17 +20,6 @@
 | 
			
		||||
        </li>
 | 
			
		||||
      </ul>
 | 
			
		||||
    </div>
 | 
			
		||||
    <div class="nav-content primary-variant-color">
 | 
			
		||||
      <ul class="tabs tabs-transparent">
 | 
			
		||||
        {%- for breadcrumb in breadcrumbs -%}
 | 
			
		||||
        <li class="tab"><a {{ 'class="active"' if loop.last }} href="{{ breadcrumb.url }}" target="_self">{{ breadcrumb.text }}</a></li>
 | 
			
		||||
        {% if not loop.last %}
 | 
			
		||||
        <li class="tab disabled"><i class="material-icons">navigate_next</i></li>
 | 
			
		||||
        {% endif %}
 | 
			
		||||
        {%- endfor -%}
 | 
			
		||||
      </ul>
 | 
			
		||||
      <a class="btn-floating btn-large halfway-fab modal-trigger pink tooltipped waves-effect waves-light" data-tooltip="Manual" href="#manual-modal"><i class="material-icons">school</i></a>
 | 
			
		||||
    </div>
 | 
			
		||||
  </nav>
 | 
			
		||||
</div>
 | 
			
		||||
 | 
			
		||||
@@ -42,7 +30,7 @@
 | 
			
		||||
  <li class="divider" tabindex="-1"></li>
 | 
			
		||||
  <li><a href="{{ url_for('auth.logout') }}">Log out</a></li>
 | 
			
		||||
  {% else %}
 | 
			
		||||
  <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><a href="{{ url_for('auth.register') }}"><i class="material-icons left">assignment</i>Register</a></li>
 | 
			
		||||
  <li><a href="{{ url_for('auth.login') }}"><i class="material-icons left">login</i>Log in</a></li>
 | 
			
		||||
  {% endif %}
 | 
			
		||||
</ul>
 | 
			
		||||
 
 | 
			
		||||
@@ -6,9 +6,6 @@
 | 
			
		||||
        </a>
 | 
			
		||||
      </div>
 | 
			
		||||
  </li>
 | 
			
		||||
  <li class="primary-variant-color center-align hide-on-small-only" style="padding-top: 8px; height:48px;">
 | 
			
		||||
    <img src="{{ url_for('static', filename='images/nopaque_slogan_transparent.png') }}" style="width:85%">
 | 
			
		||||
  </li>
 | 
			
		||||
  <li class="hide-on-med-and-up"><a class="waves-effect" href="{{ url_for('main.index') }}"><i class="material-icons left">home</i>nopaque</a></li>
 | 
			
		||||
  <li>
 | 
			
		||||
    <a class="waves-effect" href="{{ url_for('main.news') }}"><i class="material-icons left">email</i>News</a>
 | 
			
		||||
@@ -73,9 +70,9 @@
 | 
			
		||||
    <a class="waves-effect" href="{{ url_for('admin.admin') }}"><i class="material-icons">admin_panel_settings</i>Administration</a>
 | 
			
		||||
  </li>
 | 
			
		||||
  {% endif %}
 | 
			
		||||
  {% if current_user.can('USE_API') %}
 | 
			
		||||
  {# {% if current_user.can('USE_API') %}
 | 
			
		||||
  <li>
 | 
			
		||||
    <a class="waves-effect" href="{{ url_for('apifairy.docs') }}"><i class="material-icons">api</i>API</a>
 | 
			
		||||
  </li>
 | 
			
		||||
  {% endif %}
 | 
			
		||||
  {% endif %} #}
 | 
			
		||||
</ul>
 | 
			
		||||
 
 | 
			
		||||
@@ -3,6 +3,7 @@
 | 
			
		||||
{% endif %}
 | 
			
		||||
<link href="{{ url_for('static', filename='css/materialize/sticky_footer.css') }}" media="screen,projection" rel="stylesheet">
 | 
			
		||||
<link href="{{ url_for('static', filename='css/materialize/fixes.css') }}" media="screen,projection" rel="stylesheet">
 | 
			
		||||
<link href="{{ url_for('static', filename='css/spacing.css') }}" media="screen,projection" rel="stylesheet">
 | 
			
		||||
<link href="{{ url_for('static', filename='css/nopaque_icons.css') }}" media="screen,projection" rel="stylesheet">
 | 
			
		||||
<link href="{{ url_for('static', filename='css/queryBuilder.css') }}" media="screen,projection" rel="stylesheet">
 | 
			
		||||
{%- assets
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user