List warings in profiles. #37

static/cranefly/css/cranefly.css

@@ -987,6 +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 .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}
 .forum-subforums-list .forum{border-bottom:1px solid #d5d5d5;height:21px;overflow:visible;padding:14.75px 9.9px}.forum-subforums-list .forum.last{border-bottom:none}
 .forum-subforums-list .forum .forum-icon{float:left;position:relative;bottom:1px;width:36px;color:#d5d5d5;font-size:24px;text-align:center}.forum-subforums-list .forum .forum-icon.forum-icon-new{color:#cf402e}

static/cranefly/css/cranefly/profiles.less

@@ -215,7 +215,42 @@
     }
 
     &.user-warnings {
+      .media {
+        margin-bottom: -6px;
 
+        .warning-icon {
+          width: 60px;
+
+          font-size: @fontSizeLarge * 2;
+          text-align: center;
+
+          .warning-active {
+            margin-bottom: -3px;
+            position: relative;
+            top: 3px;
+
+            color: @red;
+          }
+
+          .warning-canceled {
+            margin-bottom: 0px;
+            position: relative;
+            bottom: 5px;
+
+            color: @grayLight;
+            font-size: @fontSizeLarge * 2.5;
+          }
+        }
+
+        .media-body {
+          .warning-reason {
+            &>:last-child {
+              margin-bottom: 0px;
+              padding-bottom: 0px;
+            }
+          }
+        }
+      }
     }
   }
 }

templates/cranefly/profiles/warnings.html

@@ -40,17 +40,36 @@
 <div class="content-list user-warnings">
   {% for item in items %}
   <div class="media">
-    <a href="{{ url('user', user=profile.pk, username=profile.username_slug) }}" class="pull-left">
-      <img class="media-object" src="{{ profile.get_avatar(52) }}">
-    </a>
+    <div class="pull-left">
+      <div class="warning-icon ">
+        {% if item.canceled %}
+        <i class="icon-remove warning-canceled tooltip-top" title="{% trans %}This warning has been canceled.{% endtrans %}"></i>
+        {% else %}
+        <i class="icon-warning-sign warning-active"></i>
+        {% endif %}
+      </div>
+    </div>
     <div class="media-body">
       {% if item.reason %}
-      {{ item.reason_preparsed|safe }}
+      <div class="warning-reason">
+        {{ item.reason_preparsed|safe }}
+      </div>
       {% else %}
       <em>{% trans %}No warning reason was provided by warning giver.{% endtrans %}</em>
       {% endif %}
       <div class="media-footer">
-        {% trans user=warning_giver(item), date=item.gived_on|reltimesince|low %}Given by {{ user }} {{ date }}{% endtrans %}
+        {% if acl.users.can_see_users_trails() %}
+        {% trans user=warning_giver(item), date=item.given_on|reltimesince|low, ip=item.giver_ip %}Given by {{ user }} {{ date }} from ip {{ ip }}.{% endtrans %}
+        {% else %}
+        {% trans user=warning_giver(item), date=item.given_on|reltimesince|low %}Given by {{ user }} {{ date }}.{% endtrans %}
+        {% endif %}
+        {% if item.canceled %}
+          {% if acl.users.can_see_users_trails() %}
+          {% trans user=warning_canceler(item), date=item.canceled_on|reltimesince|low, ip=item.canceler_ip %}Canceled by {{ user }} {{ date }} from ip {{ ip }}.{% endtrans %}
+          {% else %}
+          {% trans user=warning_canceler(item), date=item.canceled_on|reltimesince|low %}Canceled by {{ user }} {{ date }}.{% endtrans %}
+          {% endif %}
+        {% endif %}
       </div>
     </div>
   </div>
@@ -74,6 +93,14 @@
 {% endif %}
 {%- endmacro %}
 
+{% macro warning_canceler(item) -%}
+{% if item.canceler_id %}
+<a href="{{ url('user', user=item.canceler_id, username=item.canceler_slug) }}">{{ item.canceler_username }}</a>
+{% else %}
+<strong>{{ item.canceler_username }}</strong>
+{% endif %}
+{%- endmacro %}
+
 {% macro pager() -%}
 {% if pagination['total'] > 1 %}
 <div class="pagination">