diff --git a/app/__init__.py b/app/__init__.py index 076b006a7c15520c67ef58d38f0e390616f82541..bf465cbbf5f0bd26ea55f1d10523eb3115b00ba9 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -92,7 +92,7 @@ def create_app(config: Config = Config) -> Flask: app.register_blueprint(services_blueprint, url_prefix='/services') from .users import bp as users_blueprint - default_breadcrumb_root(users_blueprint, '.users') + default_breadcrumb_root(users_blueprint, '.social_area.users') app.register_blueprint(users_blueprint, url_prefix='/users') return app diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 index 5ee6795421c38b8cb9ff3d673aa4af1f8f5653c9..e05783a48b3eb2c669eaba264692a548a95dcc34 100644 --- a/app/templates/_sidenav.html.j2 +++ b/app/templates/_sidenav.html.j2 @@ -19,14 +19,18 @@ </div> </div> </li> + {# <li class="primary-color"> + <div style="overflow: hidden;height: 64px; width: 250px;"> + <img class="hide-on-small-only" src="{{ url_for('static', filename='images/nopaque_-_logo_name_slogan.svg') }}" style="height: 128px; margin-top: -32px; margin-left: ;"> + </div> + </li> #} {# <li><a href="{{ url_for('main.index') }}">nopaque</a></li> #} <li><a href="{{ url_for('main.news') }}"><i class="material-icons left">email</i>News</a></li> <li><a href="{{ url_for('main.user_manual') }}"><i class="material-icons">help</i>Manual</a></li> - <li><a href="{{ url_for('main.dashboard') }}"><i class="material-icons">dashboard</i>Dashboard</a></li> - <li><a href="{{ url_for('main.dashboard', _anchor='corpora') }}" style="padding-left: 47px;"><i class="nopaque-icons">I</i>My Corpora</a></li> - <li><a href="{{ url_for('main.dashboard', _anchor='jobs') }}" style="padding-left: 47px;"><i class="nopaque-icons">J</i>My Jobs</a></li> - <li><a href="{{ url_for('main.dashboard', _anchor='contributions') }}" style="padding-left: 47px;"><i class="material-icons">new_label</i>My Contributions</a></li> - <li class="social-area-color-base social-area-color-border-darken" style="border-left: 10px solid; margin-top: 5px;"><a href="{{ url_for('main.social_area') }}"><i class="material-icons">group</i>Social Area</a></li> + <li><a href="{{ url_for('main.dashboard') }}" class="subheader">Dashboard</a></li> + <li><a href="{{ url_for('main.dashboard', _anchor='corpora') }}"><i class="nopaque-icons">I</i>My Corpora</a></li> + <li><a href="{{ url_for('main.dashboard', _anchor='jobs') }}"><i class="nopaque-icons">J</i>My Jobs</a></li> + <li><a href="{{ url_for('main.dashboard', _anchor='contributions') }}"><i class="material-icons">new_label</i>My Contributions</a></li> <li><div class="divider"></div></li> <li><a class="subheader">Processes & Services</a></li> <li class="service-color service-color-border border-darken" data-service="file-setup-pipeline" style="border-left: 10px solid; margin-top: 5px;"><a href="{{ url_for('services.file_setup_pipeline') }}"><i class="nopaque-icons service-icons" data-service="file-setup-pipeline"></i>File setup</a></li> @@ -37,6 +41,9 @@ <li class="service-color service-color-border border-darken" data-service="spacy-nlp-pipeline" style="border-left: 10px solid; margin-top: 5px;"><a href="{{ url_for('services.spacy_nlp_pipeline') }}"><i class="nopaque-icons service-icons" data-service="spacy-nlp-pipeline"></i>NLP</a></li> <li class="service-color service-color-border border-darken" data-service="corpus-analysis" style="border-left: 10px solid; margin-top: 5px;"><a href="{{ url_for('services.corpus_analysis') }}"><i class="nopaque-icons service-icons" data-service="corpus-analysis"></i>Corpus Analysis</a></li> <li><div class="divider"></div></li> + <li><a class="subheader">Social Area</a></li> + <li class="social-area-color-base social-area-color-border-darken" style="border-left: 10px solid; margin-top: 5px;"><a href="{{ url_for('main.social_area') }}"><i class="material-icons">group</i>Social Area</a></li> + <li><div class="divider"></div></li> <li><a class="subheader">Account</a></li> <li><a href="{{ url_for('users.edit_profile', user_id=current_user.id) }}"><i class="material-icons left">settings</i>User Settings</a></li> <li><a href="{{ url_for('auth.logout') }}">Log out</a></li> diff --git a/app/users/routes.py b/app/users/routes.py index 5431dfd0a96dff17209baeada3c4732f23439aa9..bb1e25c67339f60f6eae9e6620dc6d2b9b9a67fd 100644 --- a/app/users/routes.py +++ b/app/users/routes.py @@ -26,7 +26,7 @@ from .utils import ( @bp.route('') -@register_breadcrumb(bp, '.', '<i class="material-icons left">group</i>Social Area') +@register_breadcrumb(bp, '.', '<i class="material-icons left">group</i>Users') @login_required def users(): return redirect(url_for('main.social_area', _anchor='users'))