Differ active and expired warnings on display. #37

misago/apps/profiles/warnings/views.py

@@ -6,6 +6,7 @@ from django.shortcuts import redirect
 from django.utils import timezone
 from misago.apps.profiles.decorators import profile_view
 from misago.apps.profiles.template import RequestContext
+from misago.apps.profiles.warnings.warningstracker import WarningsTracker
 from misago.shortcuts import render_to_response
 from misago.utils.pagination import make_pagination
 
@@ -26,6 +27,7 @@ def warnings(request, user, page=0):
                                   'tab': 'warnings',
                                   'items_total': count,
                                   'warning_level': user.get_current_warning_level(),
+                                  'warnings_tracker': WarningsTracker(user.warning_level - pagination['start']),
                                   'items': queryset.order_by('-id')[pagination['start']:pagination['stop']],
                                   'pagination': pagination,
                                   }));

static/cranefly/css/cranefly.css

@@ -987,7 +987,9 @@ a.btn-link:hover,a.btn-link:active,a.btn-link:focus{color:#333;text-decoration:n
 .user-profile .content-list .media{overflow:auto}.user-profile .content-list .media .media-object{border-radius:3px;width:52px;height:52px}
 .user-profile .content-list .media .media-body{margin-left:66px}.user-profile .content-list .media .media-body .post-preview:link,.user-profile .content-list .media .media-body .post-preview:active,.user-profile .content-list .media .media-body .post-preview:visited,.user-profile .content-list .media .media-body .post-preview:hover{display:block;margin-top:7px;color:#333;font-size:16.8px;text-decoration:none}
 .user-profile .content-list .media .media-body .media-footer{margin:0;color:#999;font-size:10.5px;font-weight:normal}.user-profile .content-list .media .media-body .media-footer a{color:#555}
-.user-profile .content-list.user-warnings .media{margin-bottom:-6px}.user-profile .content-list.user-warnings .media .warning-icon{width:60px;font-size:35px;text-align:center}.user-profile .content-list.user-warnings .media .warning-icon .warning-active{margin-bottom:-3px;position:relative;top:3px;color:#cf402e}
+.user-profile .content-list.user-warnings .media{margin-bottom:-6px}.user-profile .content-list.user-warnings .media .warning-icon{width:60px;font-size:35px;text-align:center}.user-profile .content-list.user-warnings .media .warning-icon .warning-active,.user-profile .content-list.user-warnings .media .warning-icon .warning-expired{margin-bottom:-3px;position:relative;top:3px}
+.user-profile .content-list.user-warnings .media .warning-icon .warning-active{color:#cf402e}
+.user-profile .content-list.user-warnings .media .warning-icon .warning-expired{color:#999}
 .user-profile .content-list.user-warnings .media .warning-icon .warning-canceled{margin-bottom:0;position:relative;bottom:5px;color:#999;font-size:43.75px}
 .user-profile .content-list.user-warnings .media .media-body .warning-reason>:last-child{margin-bottom:0;padding-bottom:0}
 .forum-subforums-list{background-color:#fff;border:1px solid #d5d5d5;border-radius:2px;-webkit-box-shadow:0 0 0 3px #eee;-moz-box-shadow:0 0 0 3px #eee;box-shadow:0 0 0 3px #eee;margin-bottom:20px}.forum-subforums-list .header{background-color:#fbfbfb;border:1px solid #d5d5d5;border-radius:2px 2px 0 0;margin:-1px;margin-bottom:0;padding:3.966666666666667px 9.9px}.forum-subforums-list .header h2{margin:0;padding:0;color:#333;font-size:11.9px;font-weight:bold;line-height:20px;text-align:left}.forum-subforums-list .header h2 small{margin-left:7px;color:#999;font-size:11.9px}

static/cranefly/css/cranefly/profiles.less

@@ -224,14 +224,21 @@
           font-size: @fontSizeLarge * 2;
           text-align: center;
 
-          .warning-active {
+          .warning-active, .warning-expired {
             margin-bottom: -3px;
             position: relative;
             top: 3px;
+          }
 
+          .warning-active {
             color: @red;
           }
 
+          .warning-expired {
+            color: @grayLight;
+
+          }
+
           .warning-canceled {
             margin-bottom: 0px;
             position: relative;

templates/cranefly/profiles/warnings.html

@@ -44,8 +44,10 @@
       <div class="warning-icon ">
         {% if item.canceled %}
         <i class="icon-remove warning-canceled tooltip-top" title="{% trans %}This warning has been canceled.{% endtrans %}"></i>
+        {% elif warnings_tracker.is_warning_expired(item) %}
+        <i class="icon-warning-sign warning-expired tooltip-top" title="{% trans %}This warning has expired.{% endtrans %}"></i>
         {% else %}
-        <i class="icon-warning-sign warning-active"></i>
+        <i class="icon-warning-sign warning-active tooltip-top" title="{% trans %}This warning is in effect.{% endtrans %}"></i>
         {% endif %}
       </div>
     </div>