Clean up Item History (bugs 647149 and 650121)

jbalogh · Apr 14, 2011 · 98d510f · 98d510f
1 parent 743f410
commit 98d510f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/apps/editors/templates/editors/includes/history.html b/apps/editors/templates/editors/includes/history.html
@@ -7,8 +7,16 @@
       {% endif %}
     </td>
 
-    <td>{{ record.created|datetime }}</td>
-    <td>{{ record.user.name }}</td>
-    <td>{{ record }}</td>
-    <td>{% if record.details %}{{ record.details.comments }}{% endif %}</td>
+    <td>
+      {{ record.user.name }}<br>
+      <span class="light">{{ record.created|datetime }}</span>
+    </td>
+    <td>
+      <strong>{{ record }}</strong>
+      {% if record.details %}
+        <div class="history_comment">
+          {{ record.details.comments|nl2br }}
+        </div>
+      {% endif %}
+    </td>
 </tr>
diff --git a/apps/editors/templates/editors/review.html b/apps/editors/templates/editors/review.html
@@ -45,22 +45,24 @@ <h3 id="approval-notes">
 
 <h3 id="file-history">{{ _('Item History') }}</h3>
 {% if history %}
-  <table id="review-files">
+<div class="results">
+  <div class="results-inner">
+    <table id="review-files" class="data-grid">
       <thead>
-          <tr>
-              <th>{{ _('Version/File') }}</th>
-              <th>{{ _('Date') }}</th>
-              <th>{{ _('Reviewer') }}</th>
-              <th>{{ _('Action') }}</th>
-              <th>{{ _('Comments') }}</th>
-          </tr>
+        <tr class="listing-header">
+          <th width="15%">{{ _('Version') }}</th>
+          <th width="20%">{{ _('Review') }}</th>
+          <th>{{ _('Comments') }}</th>
+        </tr>
       </thead>
       <tbody>
-            {% for record in history %}
-              {% include 'editors/includes/history.html' %}
-            {% endfor %}
+        {% for record in history %}
+          {% include 'editors/includes/history.html' %}
+        {% endfor %}
       </tbody>
-  </table>
+    </table>
+  </div>
+</div>
 {% else %}
 <p>
   {{ _('No previous review entries could be found.') }}