Merge branch 'master' of https://github.com/Cynddl/nnmon

Conflicts:
	templates/view.html

media/css/style.css

@@ -24,18 +24,20 @@ li { list-style: none; }
 #report dt {
   float: left;
   clear: left;
-  width: 160px;
+  width: 250px;
   text-align: right;
   font-weight: bold;
+  padding: 0 0 0.5em 0;
 }
 
-#report dt:after {
-  content: ":";
+#report dd {
+  float: left;
+  margin-left: 1em;
 }
 
-#report dd {
-  margin: 0 0 0 170px;
-  padding: 0 0 0.5em 0;
+#report dl:after {
+  content:''; display: block;
+  clear: both;	
 }
 
 #report dd p { margin: 0;}
@@ -387,6 +389,39 @@ div.comment {
   padding: .8em 1em;
 }
 
+#report #icons {
+	float: right;
+	margin-right: 0.5em;
+	font-weight: bold;
+	font-size: 120%;
+	width: 100%;
+	text-align: right;
+	color: #eee;
+}
+
+#report #icons span {
+	padding: 0 0 2px 20px;
+	background-clip: pading-box;
+	background-repeat: no-repeat;
+	color: #000;
+}
+
+#report #icons span#confirmations {	background-image: url(../img/plus_alt.png); }
+#report #icons span#invalidations {	background-image: url(../img/minus_alt.png); }
+#report #icons span#verified      {	background-image: url(../img/eye.png); padding-left: 28px;}
+
+#report #icons span.tooltip {
+	display: none;
+	font-weight: normal;
+}
+
+#description .description-node .attachs {
+	float: right;
+	padding: 0.5em;
+	text-align: right;
+}
+
+
 /* General inputs */
 
 input[type=submit], input[type=button], .button, input[type="text"], textarea, select {

templates/view.html

@@ -57,6 +57,14 @@ $(document).ready(function() {
 <div id='global'>
   <h2>{{v.operator}} ({{v.country}}) {{v.contract}}</h2>
 <div id="report">
+	<div id="icons">
+		<span id="verified_tooltip" class="tooltip">{% trans "This case was verified by the management team" %}</span>
+		<span id="confirmations_tooltip" class="tooltip">{%if v.confirmations == 0 %} {% trans "Nobody has yet confirmed the case. Feel free to do it" %} {%else%} {{v.confirmations}} {% trans "people confirmed this case" %} {%endif%}</span>
+		<span id="verified"></span> |
+		<span id="confirmations">{{v.confirmations}}</span> |
+		<span id="invalidations">{%if v.invalidations %} {{v.invalidations}} {%else%} 0 {%endif%}</span>
+	</div>
+
   <dl>{%if v.resource_name%}<dt>{% trans "Affected resource" %}</dt><dd>{{v.resource_name}}</dd>{%endif%}
   {%if v.type%}<dt>{% trans "Type" %}</dt><dd>{{v.type}}</dd>{%endif%}
   {%if v.media%}<dt>{% trans "Media" %}</dt><dd>{{v.media}}</dd>{%endif%}
@@ -78,11 +86,9 @@ $(document).ready(function() {
     <h3>{%trans "Description" %}</h3>
     {%for c in v.comment_set.all%}
     <div class="description-node">
-      <div class="description">{{c.comment|safe}}</div>
-      <span class="submitter">{%if c.submitter_name%}{{c.submitter_name}}{%else%}{{c.submitter_email}}{%endif%}</span> - <span class="comment_date">{{c.timestamp|date:"SHORT_DATE_FORMAT" }}</span>
-      {%if c.attachment_set.all%}
-      <div class="attachs">
-         {% trans "Attachments" %}
+	  {%if c.attachment_set.all%}
+	  <div class="attachs">
+         <h4>{% trans "Attachments" %}</h4>
         <ul>
           {%for a in c.attachment_set.all%}
           <li><a href="/attach/{{a.id}}">{{a.name}}</a></li>
@@ -90,6 +96,8 @@ $(document).ready(function() {
         </ul>
       </div>
       {%endif%}
+      <div class="description">{{c.comment|safe}}</div>
+      <span class="submitter">{%if c.submitter_name%}{{c.submitter_name}}{%else%}{{c.submitter_email}}{%endif%}</span> - <span class="comment_date">{{c.timestamp|date:"SHORT_DATE_FORMAT" }}</span>
     </div>
     {%endfor%}
 </div>