Rework some basics again

This commit is contained in:
Patrick Jentsch 2020-10-26 12:46:46 +01:00
parent e57822a4bd
commit 03db3f8c35
3 changed files with 133 additions and 126 deletions

View File

@ -1,4 +1,4 @@
{% set colors = {'primary': '#00426f', {% set COLORS = {'primary': '#00426f',
'secondary': '#b1b3b4', 'secondary': '#b1b3b4',
'corpus_analysis': '#aa9cc9', 'corpus_analysis': '#aa9cc9',
'corpus_analysis_darken': '#6b3f89', 'corpus_analysis_darken': '#6b3f89',
@ -12,8 +12,3 @@
'ocr': '#a9d8c8', 'ocr': '#a9d8c8',
'ocr_darken': '#00a58b', 'ocr_darken': '#00a58b',
'ocr_lighten': '#e7f4f1'} %} 'ocr_lighten': '#e7f4f1'} %}
{% if main_class is not defined %}
{% set main_class = 'grey lighten-5' %}
{% endif %}

View File

@ -18,12 +18,22 @@
</head> </head>
<body{% block body_attribs %}{% endblock body_attribs %}> <body{% block body_attribs %}{% endblock body_attribs %}>
{% block body %} {% block body %}
<header{% block header_attribs %}{% endblock header_attribs %}>
{% block header %}
{% block navbar %} {% block navbar %}
{% endblock navbar %} {% endblock navbar %}
{% block sidenav %} {% block sidenav %}
{% endblock sidenav %} {% endblock sidenav %}
{% block content %} {% endblock header %}
{% endblock content %} </header>
<main{% block main_attribs %}{% endblock main_attribs %}>
{% block main %}{% endblock main %}
</main>
<footer{% block footer_attribs %}{% endblock footer_attribs %}>
{% block footer %}{% endblock footer %}
</footer>
{% block scripts %} {% block scripts %}
<script src="{{ url_for('static', filename='js/materialize.min.js') }}"></script> <script src="{{ url_for('static', filename='js/materialize.min.js') }}"></script>

View File

@ -1,5 +1,5 @@
{% extends "materialize/base.html.j2" %} {% extends "materialize/base.html.j2" %}
{% from '_variables.html.j2' import colors %} {% from '_constants.html.j2' import COLORS %}
{% block html_attribs %} lang="en"{% endblock html_attribs %} {% block html_attribs %} lang="en"{% endblock html_attribs %}
@ -23,54 +23,57 @@
<link href="{{ url_for('static', filename='css/materialize.fix.sticky-footer.css') }}" media="screen,projection" rel="stylesheet"> <link href="{{ url_for('static', filename='css/materialize.fix.sticky-footer.css') }}" media="screen,projection" rel="stylesheet">
<link href="{{ url_for('static', filename='css/nopaque.css') }}" media="screen,projection" rel="stylesheet"> <link href="{{ url_for('static', filename='css/nopaque.css') }}" media="screen,projection" rel="stylesheet">
<style> <style>
.primary-color {background-color: {{ colors.primary }} !important;} .primary-color {background-color: {{ COLORS.primary }} !important;}
.primary-color-text {color: {{ colors.primary }} !important;} .primary-color-text {color: {{ COLORS.primary }} !important;}
.secondary-color {background-color: {{ colors.secondary }} !important;} .secondary-color {background-color: {{ COLORS.secondary }} !important;}
.secondary-color-text {color: {{ colors.secondary }} !important;} .secondary-color-text {color: {{ COLORS.secondary }} !important;}
.corpus-analysis-color {background-color: {{ colors.corpus_analysis }} !important;} .corpus-analysis-color {background-color: {{ COLORS.corpus_analysis }} !important;}
.corpus-analysis-color-text {color: {{ colors.corpus_analysis }} !important;} .corpus-analysis-color-text {color: {{ COLORS.corpus_analysis }} !important;}
.corpus-analysis-color.darken {background-color: {{ colors.corpus_analysis_darken }} !important;} .corpus-analysis-color.darken {background-color: {{ COLORS.corpus_analysis_darken }} !important;}
.corpus-analysis-color-text.text-darken {color: {{ colors.corpus_analysis_darken }} !important;} .corpus-analysis-color-text.text-darken {color: {{ COLORS.corpus_analysis_darken }} !important;}
.corpus-analysis-color.lighten {background-color: {{ colors.corpus_analysis_lighten }} !important;} .corpus-analysis-color.lighten {background-color: {{ COLORS.corpus_analysis_lighten }} !important;}
.corpus-analysis-color-text.text-lighten {color: {{ colors.corpus_analysis_lighten }} !important;} .corpus-analysis-color-text.text-lighten {color: {{ COLORS.corpus_analysis_lighten }} !important;}
.file-setup-color {background-color: {{ colors.file_setup }} !important;} .file-setup-color {background-color: {{ COLORS.file_setup }} !important;}
.file-setup-color-text {color: {{ colors.file_setup }} !important;} .file-setup-color-text {color: {{ COLORS.file_setup }} !important;}
.file-setup-color.darken {background-color: {{ colors.file_setup_darken }} !important;} .file-setup-color.darken {background-color: {{ COLORS.file_setup_darken }} !important;}
.file-setup-color-text.text-darken {color: {{ colors.file_setup_darken }} !important;} .file-setup-color-text.text-darken {color: {{ COLORS.file_setup_darken }} !important;}
.file-setup-color.lighten {background-color: {{ colors.file_setup_lighten }} !important;} .file-setup-color.lighten {background-color: {{ COLORS.file_setup_lighten }} !important;}
.file-setup-color-text.text-lighten {color: {{ colors.file_setup_lighten }} !important;} .file-setup-color-text.text-lighten {color: {{ COLORS.file_setup_lighten }} !important;}
.ocr-color {background-color: {{ colors.ocr }} !important;} .ocr-color {background-color: {{ COLORS.ocr }} !important;}
.ocr-color-text {color: {{ colors.ocr }} !important;} .ocr-color-text {color: {{ COLORS.ocr }} !important;}
.ocr-color.darken {background-color: {{ colors.ocr_darken }} !important;} .ocr-color.darken {background-color: {{ COLORS.ocr_darken }} !important;}
.ocr-color-text.text-darken {color: {{ colors.ocr_darken }} !important;} .ocr-color-text.text-darken {color: {{ COLORS.ocr_darken }} !important;}
.ocr-color.lighten {background-color: {{ colors.ocr_lighten }} !important;} .ocr-color.lighten {background-color: {{ COLORS.ocr_lighten }} !important;}
.ocr-color-text.text-lighten {color: {{ colors.ocr_lighten }} !important;} .ocr-color-text.text-lighten {color: {{ COLORS.ocr_lighten }} !important;}
.nlp-color {background-color: {{ colors.nlp }} !important;} .nlp-color {background-color: {{ COLORS.nlp }} !important;}
.nlp-color-text {color: {{ colors.nlp }} !important;} .nlp-color-text {color: {{ COLORS.nlp }} !important;}
.nlp-color.darken {background-color: {{ colors.nlp_darken }} !important;} .nlp-color.darken {background-color: {{ COLORS.nlp_darken }} !important;}
.nlp-color-text.text-darken {color: {{ colors.nlp_darken }} !important;} .nlp-color-text.text-darken {color: {{ COLORS.nlp_darken }} !important;}
.nlp-color.lighten {background-color: {{ colors.nlp_lighten }} !important;} .nlp-color.lighten {background-color: {{ COLORS.nlp_lighten }} !important;}
.nlp-color-text.text-lighten {color: {{ colors.nlp_lighten }} !important;} .nlp-color-text.text-lighten {color: {{ COLORS.nlp_lighten }} !important;}
.pagination li.active {background-color: {{ colors.primary }};} {% if scheme_color is not defined %}
.table-of-contents a.active {border-color: {{ colors.primary }};} {% set scheme_color = COLORS.primary %}
.tabs .tab a {color: inherit; /* Custom Text Color */} {% endif %}
.tabs .tab a:hover {color: {{ colors.primary }}; /* Custom Color On Hover */} main button, main .btn, main .btn-floating {background-color: {{ scheme_color }};}
.tabs .tab a.active, .tabs .tab a:focus.active { main .pagination li.active {background-color: {{ scheme_color }};}
color: {{ colors.primary }}; /* Custom Text Color While Active */ main .table-of-contents a.active {border-color: {{ scheme_color }};}
background-color: {{ colors.primary }}28; /* Custom Background Color While Active */ main .tabs .tab a {color: inherit;}
main .tabs .tab a:hover {color: {{ scheme_color }};}
main .tabs .tab a.active, .tabs .tab a:focus.active {
color: {{ scheme_color }};
background-color: {{ scheme_color }}28;
} }
.tabs .indicator {background-color: {{ colors.primary }}; /* Custom Color Of Indicator */} main .tabs .indicator {background-color: {{ scheme_color }};}
</style> </style>
{% endblock styles %} {% endblock styles %}
{% block navbar %} {% block navbar %}
<header> <div class="navbar-fixed">
<div class="navbar-fixed">
<nav class="nav-extended"> <nav class="nav-extended">
<div class="nav-wrapper primary-color"> <div class="nav-wrapper primary-color">
{% if current_user.is_authenticated %} {% if current_user.is_authenticated %}
@ -80,12 +83,12 @@
<a href="{{ url_for('main.index') }}" class="brand-logo hide-on-large-only" style="height: 100%; overflow: hidden;"><img src="{{ url_for('static', filename='images/nopaque_-_logo.svg') }}" style="height: 128px; margin-top: -32px;"></a> <a href="{{ url_for('main.index') }}" class="brand-logo hide-on-large-only" style="height: 100%; overflow: hidden;"><img src="{{ url_for('static', filename='images/nopaque_-_logo.svg') }}" style="height: 128px; margin-top: -32px;"></a>
<ul class="right"> <ul class="right">
<li class="hide-on-med-and-down{% if request.path == url_for('main.news') %} active{% endif %}"><a href="{{ url_for('main.news') }}"><i class="material-icons left">notifications</i>News</a></li> <li class="hide-on-med-and-down{% if request.path == url_for('main.news') %} active{% endif %}"><a href="{{ url_for('main.news') }}"><i class="material-icons left">notifications</i>News</a></li>
{% if current_user.is_anonymous %} {% if current_user.is_authenticated %}
<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>
{% else %}
<li class="hide-on-med-and-down{% if request.path == url_for('main.dashboard') %} active{% endif %}"><a href="{{ url_for('main.dashboard') }}"><i class="material-icons left">dashboard</i>Dashboard</a></li> <li class="hide-on-med-and-down{% if request.path == url_for('main.dashboard') %} active{% endif %}"><a href="{{ url_for('main.dashboard') }}"><i class="material-icons left">dashboard</i>Dashboard</a></li>
<li class="hide-on-med-and-down"><a class="dropdown-trigger no-autoinit" data-target="nav-more-dropdown" href="#!" id="nav-more-dropdown-trigger"><i class="material-icons">more_vert</i></a></li> <li class="hide-on-med-and-down"><a class="dropdown-trigger no-autoinit" data-target="nav-more-dropdown" href="#!" id="nav-more-dropdown-trigger"><i class="material-icons">more_vert</i></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>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
@ -93,20 +96,19 @@
{% block nav_content %}{% endblock nav_content %} {% block nav_content %}{% endblock nav_content %}
</div> </div>
</nav> </nav>
</div> </div>
{% if current_user.is_authenticated %} {% if current_user.is_authenticated %}
<ul class="dropdown-content" id="nav-more-dropdown"> <ul class="dropdown-content" id="nav-more-dropdown">
<li><a href="{{ url_for('settings.index') }}"><i class="material-icons left">settings</i>Settings</a></li> <li><a href="{{ url_for('settings.index') }}"><i class="material-icons left">settings</i>Settings</a></li>
<li class="divider" tabindex="-1"></li> <li class="divider" tabindex="-1"></li>
<li><a href="{{ url_for('auth.logout') }}">Log out</a></li> <li><a href="{{ url_for('auth.logout') }}">Log out</a></li>
</ul> </ul>
{% endif %} {% endif %}
</header>
{% endblock navbar %} {% endblock navbar %}
{% block sidenav %} {% block sidenav %}
<ul class="sidenav sidenav-fixed{% if not current_user.is_authenticated %} hide{% endif %}" id="sidenav"> <ul class="sidenav sidenav-fixed{% if not current_user.is_authenticated %} hide{% endif %}">
{% if current_user.is_authenticated %} {% if current_user.is_authenticated %}
<li> <li>
<div class="user-view"> <div class="user-view">
@ -121,10 +123,10 @@
<li><a href="{{ url_for('main.dashboard', _anchor='jobs') }}" style="padding-left: 47px;"><i class="material-icons">work</i>My Jobs</a></li> <li><a href="{{ url_for('main.dashboard', _anchor='jobs') }}" style="padding-left: 47px;"><i class="material-icons">work</i>My Jobs</a></li>
<li><div class="divider"></div></li> <li><div class="divider"></div></li>
<li><a class="subheader">Processes & Services</a></li> <li><a class="subheader">Processes & Services</a></li>
<li style="background-color: {{ colors.file_setup }}; border-left: 10px solid {{ colors.file_setup_darken }};"><a href="{{ url_for('services.service', service='file-setup') }}"><i class="material-icons">burst_mode</i>File setup</a></li> <li style="background-color: {{ COLORS.file_setup }}; border-left: 10px solid {{ COLORS.file_setup_darken }};"><a href="{{ url_for('services.service', service='file-setup') }}"><i class="material-icons">burst_mode</i>File setup</a></li>
<li style="background-color: {{ colors.ocr }}; border-left: 10px solid {{ colors.ocr_darken }}; margin-top: 5px;"><a href="{{ url_for('services.service', service='ocr') }}"><i class="material-icons">find_in_page</i>OCR</a></li> <li style="background-color: {{ COLORS.ocr }}; border-left: 10px solid {{ COLORS.ocr_darken }}; margin-top: 5px;"><a href="{{ url_for('services.service', service='ocr') }}"><i class="material-icons">find_in_page</i>OCR</a></li>
<li style="background-color: {{ colors.nlp }}; border-left: 10px solid {{ colors.nlp_darken }}; margin-top: 5px;"><a href="{{ url_for('services.service', service='nlp') }}"><i class="material-icons">format_textdirection_l_to_r</i>NLP</a></li> <li style="background-color: {{ COLORS.nlp }}; border-left: 10px solid {{ COLORS.nlp_darken }}; margin-top: 5px;"><a href="{{ url_for('services.service', service='nlp') }}"><i class="material-icons">format_textdirection_l_to_r</i>NLP</a></li>
<li style="background-color: {{ colors.corpus_analysis }}; border-left: 10px solid {{ colors.corpus_analysis_darken }}; margin-top: 5px;"><a href="{{ url_for('services.service', service='corpus_analysis') }}"><i class="material-icons">search</i>Corpus analysis</a></li> <li style="background-color: {{ COLORS.corpus_analysis }}; border-left: 10px solid {{ COLORS.corpus_analysis_darken }}; margin-top: 5px;"><a href="{{ url_for('services.service', service='corpus_analysis') }}"><i class="material-icons">search</i>Corpus analysis</a></li>
<li><div class="divider"></div></li> <li><div class="divider"></div></li>
<li><a class="subheader">Account</a></li> <li><a class="subheader">Account</a></li>
<li><a href="{{ url_for('settings.index') }}"><i class="material-icons">settings</i>Settings</a></li> <li><a href="{{ url_for('settings.index') }}"><i class="material-icons">settings</i>Settings</a></li>
@ -141,13 +143,14 @@
</ul> </ul>
{% endblock sidenav %} {% endblock sidenav %}
{% block content %} {% block main %}
<main>
{% block page_content %}{% endblock page_content %} {% block page_content %}{% endblock page_content %}
</main> {% endblock main %}
<footer class="page-footer secondary-color"> {% block footer_attribs %} class="page-footer secondary-color"{% endblock footer_attribs %}
<div class="container">
{% block footer %}
<div class="container">
<div class="row"> <div class="row">
<div class="col s6 m3"> <div class="col s6 m3">
<a href="https://www.dfg.de/"> <a href="https://www.dfg.de/">
@ -169,8 +172,8 @@
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
<div class="footer-copyright primary-color"> <div class="footer-copyright primary-color">
<div class="container"> <div class="container">
<div class="row" style="margin-bottom: 0;"> <div class="row" style="margin-bottom: 0;">
<div class="col s12 m3"> <div class="col s12 m3">
@ -186,9 +189,8 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</footer> {% endblock footer %}
{% endblock content %}
{% block scripts %} {% block scripts %}
{{ super() }} {{ super() }}