apps/userdashboard: add settings dropdown and profile and dashboard l…

…inks and style logos
liqd · Jan 14, 2021 · 77db291 · 77db291
1 parent 5c90d94
commit 77db291
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 21 deletions.
diff --git a/adhocracy-plus/assets/scss/components/_userdashboard.scss b/adhocracy-plus/assets/scss/components/_userdashboard.scss
@@ -5,7 +5,7 @@
 .userdashboard-profile__user {
     border: 1px solid #dadada;
     text-align: center;
-    padding: 2*$padding;
+    padding-bottom: 2*$padding;
 }
 
 .userdashboard-profile__avatar {

diff --git a/adhocracy-plus/assets/scss/icons/style.css b/adhocracy-plus/assets/scss/icons/style.css
@@ -71,3 +71,7 @@
 .fa-eye {
   font-size: 1.05rem;
 }
+
+.font--lg {
+    font-size: 2rem !important;
+}
diff --git a/adhocracy-plus/config/settings/base.py b/adhocracy-plus/config/settings/base.py
@@ -245,7 +245,8 @@
         'idea_thumbnail': {'size': (240, 240), 'crop': 'smart'},
         'avatar': {'size': (200, 200), 'crop': 'smart'},
         'item_image': {'size': (330, 0), 'crop': 'scale'},
-        'map_thumbnail': {'size': (200, 200), 'crop': 'smart'}
+        'map_thumbnail': {'size': (200, 200), 'crop': 'smart'},
+        'tiny_thumbnail': {'size': (50, 50), 'crop': 'smart'}
     }
 }
 

diff --git a/apps/userdashboard/templates/a4_candy_userdashboard/base_userdashboard.html b/apps/userdashboard/templates/a4_candy_userdashboard/base_userdashboard.html
@@ -31,35 +31,71 @@
                     role="tabpanel"
                     aria-labelledby="userdashboard-{{ user.pk }}-tile"
                     aria-expanded="false">
+
                     <div class="userdashboard-profile__user">
+                        <div class="dropdown text-right">
+                            <button
+                                title="{% trans 'Settings' %}"
+                                type="button"
+                                class="dropdown-toggle btn btn--none btn--small"
+                                data-toggle="dropdown"
+                                data-flip="false"
+                                aria-haspopup="true"
+                                aria-expanded="false"
+                                id="account-settings"
+                            >
+                                <i class="fa fa-ellipsis-v" aria-label="{% trans 'Settings' %}"></i>
+                            </button>
+                            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="account-settings">
+                                <a class="dropdown-item" href="{% url 'account' %}">{% trans 'Account Settings' %}</a>
+                            </div>
+                        </div>
+
                         <a href="{% url 'profile' user.username %}">
                             {% if user.avatar %}
                                 <img class="userdashboard-profile__avatar mb-2" src="{% thumbnail user.avatar '170x170' crop %}" alt="" />
                             {% else %}
                                 <img class="userdashboard-profile__avatar mb-2" src="{{ user.avatar_fallback }}" width="170" height="170" alt="" />
                             {% endif %}
+                            <h3 class="mt-0 u-word-break-all">
+                            {{ user.username }}
+                            </h3>
                         </a>
-
-                        <h3 class="mt-0 u-word-break-all">
-                        {{ user.username }}
-                        </h3>
                         <div>
                             {% trans 'Since' %} {{ request.user.date_joined|date:"d M Y" }}
                         </div>
                     </div>
+
+                    {% if request.user.organisations %}
                     <div>
-                      <h3>{% trans 'Organisations' %}</h3>
-                      {% for organisation in view.organisations %}
-                      <a class="btn btn--link text-decoration-none text-muted" href="{% url 'a4dashboard:project-list' organisation_slug=organisation.slug %}">
-                        {% if organisation.logo %}
-                              <img src="{% thumbnail organisation.logo '0x160' %}" height="80" alt="{{ orgnaisation.name }}" class="dashboard-nav__logo" />
-                        {% else %}
-                              <i class="fas fa-home pt-2" aria-label="{{ orgnaisation.name }} {% trans 'Home' %}"></i>
-                        {% endif %}
-                              &nbsp {{ organisation.name }}
+                      <h3>{% trans 'Initiator Organisations' %}</h3>
+                      {% for organisation in request.user.organisations %}
+                      <div>
+                          <a class="btn btn--link text-decoration-none text-muted" href="{% url 'a4dashboard:project-list' organisation_slug=organisation.slug %}">
+                            {% if organisation.logo %}
+                              <img src="{% thumbnail organisation.logo '0x40' %}" alt="{{ orgnaisation.name }}" />
+                            {% else %}
+                              <i class="fas fa-edit font--lg pt-1" aria-label="{{ orgnaisation.name }} {% trans 'Home' %}"></i>
+                            {% endif %}
+                            &nbsp{{ organisation.name }}
                           </a>
+                      </div>
                       {% endfor %}
+                    </div>
+                    {% endif %}
 
+                    <div>
+                        <h3>{% trans 'Organisations' %}</h3>
+                        {% for organisation in view.organisations %}
+                        <a class="btn btn--link text-decoration-none text-muted" href="{% url 'organisation' organisation_slug=organisation.slug %}">
+                          {% if organisation.logo %}
+                            <img src="{% thumbnail organisation.logo '0x40' %}" alt="{{ orgnaisation.name }}" />
+                          {% else %}
+                            <i class="fas fa-home fa--lg pt-1" aria-label="{{ orgnaisation.name }} {% trans 'Home' %}"></i>
+                          {% endif %}
+                            &nbsp {{ organisation.name }}
+                        </a>
+                        {% endfor %}
                     </div>
                 </div>
             </div>

diff --git a/apps/userdashboard/views.py b/apps/userdashboard/views.py
@@ -1,10 +1,8 @@
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.db.models import Q
 from django.views import generic
 
-from adhocracy4.rules import mixins as rules_mixins
-from adhocracy4.projects.enums import Access
 from adhocracy4.projects.models import Project
+from adhocracy4.rules import mixins as rules_mixins
 from apps.organisations.models import Organisation
 from apps.users.models import User
 
@@ -32,9 +30,8 @@ def organisations(self):
 
     @property
     def projects(self):
-        return Project.objects \
-            .filter(follow__creator=self.request.user, follow__enabled=True) \
-            .filter(Q(access=Access.PUBLIC) | Q(access=Access.SEMIPUBLIC))
+        return Project.objects.filter(follow__creator=self.request.user,
+                                      follow__enabled=True)
 
 
 class UserDashboardModerationView(LoginRequiredMixin,
@@ -51,3 +48,10 @@ class UserDashboardModerationView(LoginRequiredMixin,
     def get(self, request):
         response = self.render_to_response(self.get_context_data())
         return response
+
+    @property
+    def organisations(self):
+        return Organisation.objects.filter(
+            project__follow__creator=self.request.user,
+            project__follow__enabled=True
+        ).distinct()