Merge pull request #10 from pierre-24/add_some_CSS

"There is nothing that a bit of CSS cannot fix" !
zestedesavoir · Apr 4, 2017 · 472ba3d · 472ba3d
2 parents 6281072 + d5b6509
commit 472ba3d
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 7 deletions.
diff --git a/assets/scss/components/_mobile-menu.scss b/assets/scss/components/_mobile-menu.scss
@@ -298,4 +298,9 @@
             }
         }
     }
-}
+
+
+    .mobile-menu-link .validations-count {
+        display: none;
+    }
+}
diff --git a/assets/scss/layout/_header.scss b/assets/scss/layout/_header.scss
@@ -270,6 +270,7 @@
         height: 60px;
         width: 60px;
         float: right;
+        position: relative;
 
         .username {
             display: none;
@@ -481,11 +482,26 @@
             right: 2.5%;
         }
     }
+
+    .my-account {
+        .validations-count {
+                display: block !important;
+                position: absolute;
+                z-index: 1;
+                top: 50%;
+                right: 50%;
+                margin: -20px -22px 0 0;
+                padding: 0 5px;
+                height: 16px;
+                line-height: 14px;
+                background: #c0392b; //@TODO: Color
+                border-radius: 16px;
+        }
+    }
 }
 
 @media only screen and #{$media-extra-wide} {
     .header-container header .header-menu {
         margin-left: 5%;
     }
 }
-
diff --git a/templates/base.html b/templates/base.html
@@ -483,6 +483,13 @@
                                            data-active="open-my-account"
                                        {% endif %}
                                     >
+                                        {% if perms.forum.change_post %}
+                                            {% with waiting_all_count=""|waiting_count  %}
+                                                {% if waiting_all_count > 0 %}
+                                                    <span class="validations-count">{{ waiting_all_count }}</span>
+                                                {% endif %}
+                                            {% endwith %}
+                                        {% endif %}
                                         <img src="{{ profile.get_avatar_url|remove_url_protocole }}" alt="" class="avatar">
                                         <span class="username label">{{ user.username }}</span>
                                     </a>

diff --git a/zds/utils/templatetags/interventions.py b/zds/utils/templatetags/interventions.py
@@ -200,9 +200,15 @@ def alerts_list(user):
 
 @register.filter(name='waiting_count')
 def waiting_count(content_type):
-    if content_type not in TYPE_CHOICES_DICT:
-        raise template.TemplateSyntaxError("'content_type' must be in 'zds.tutorialv2.models.TYPE_CHOICES_DICT'")
-    return Validation.objects.filter(
+
+    queryset = Validation.objects.filter(
         validator__isnull=True,
-        status='PENDING',
-        content__type=content_type).count()
+        status='PENDING')
+
+    if content_type:
+        if content_type not in TYPE_CHOICES_DICT:
+            raise template.TemplateSyntaxError("'content_type' must be in 'zds.tutorialv2.models.TYPE_CHOICES_DICT'")
+        else:
+            queryset = queryset.filter(content__type=content_type)
+
+    return queryset.count()