From 7856e97402082464ff58de50bbb8edbc6241c26a Mon Sep 17 00:00:00 2001
From: Inga Kirschnick <inga.kirschnick@uni-bielefeld.de>
Date: Wed, 7 Dec 2022 14:02:33 +0100
Subject: [PATCH] Social area update
---
app/templates/_navbar.html.j2 | 3 ++-
app/templates/_sidenav.html.j2 | 3 ++-
app/templates/main/dashboard.html.j2 | 19 +++++++++++++++++++
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/app/templates/_navbar.html.j2 b/app/templates/_navbar.html.j2
index e2d4db64..d90118b8 100644
--- a/app/templates/_navbar.html.j2
+++ b/app/templates/_navbar.html.j2
@@ -29,7 +29,8 @@
<ul class="dropdown-content" id="nav-more-dropdown">
<li><a href="{{ url_for('main.user_manual') }}"><i class="material-icons left">help</i>Manual</a></li>
{% if current_user.is_authenticated %}
- <li><a href="{{ url_for('settings.settings') }}"><i class="material-icons left">settings</i>Settings</a></li>
+ <li><a href="{{ url_for('settings.settings') }}"><i class="material-icons left">settings</i>General settings</a></li>
+ <li><a href="{{ url_for('profile.edit_profile', user_id=current_user.id) }}"><i class="material-icons left">contact_page</i>Profile settings</a></li>
<li class="divider" tabindex="-1"></li>
<li><a href="{{ url_for('auth.logout') }}">Log out</a></li>
{% else %}
diff --git a/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2
index cd86fe6c..1aff7f89 100644
--- a/app/templates/_sidenav.html.j2
+++ b/app/templates/_sidenav.html.j2
@@ -14,12 +14,13 @@
</div>
</div>
</li>
- <li><a href="{{ url_for('main.index') }}">nopaque</a></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='social') }}" style="padding-left: 47px;"><i class="material-icons">groups</i>Social</a></li>
<li><a href="{{ url_for('contributions.contributions') }}"><i class="material-icons">new_label</i>Contribute</a></li>
<li><div class="divider"></div></li>
<li><a class="subheader">Processes & Services</a></li>
diff --git a/app/templates/main/dashboard.html.j2 b/app/templates/main/dashboard.html.j2
index ec03609d..e0354ea6 100644
--- a/app/templates/main/dashboard.html.j2
+++ b/app/templates/main/dashboard.html.j2
@@ -42,6 +42,25 @@
</div>
</div>
</div>
+ <div class="col s12" id="social">
+ <h3>Social</h3>
+ <div class="col s6">
+ <div class="card">
+ <div class="card-content">
+ <span class="card-title">Other users and groups</span>
+ <p>Find other users and follow them to see their corpora and groups.</p>
+ </div>
+ </div>
+ </div>
+ <div class="col s6">
+ <div class="card">
+ <div class="card-content">
+ <span class="card-title">Public corpora</span>
+ <p>Find public corpora</p>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
{% endblock page_content %}
--
GitLab