svn commit: r1462083 - /bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html

[gjm]

Author: gjm
Date: Thu Mar 28 13:19:42 2013
New Revision: 1462083

URL: http://svn.apache.org/r1462083
Log:
add attachment description to attachment events and making user and time 
information show on mouse over - towards #471

Modified:
    bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html

Modified: 
bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html
URL: 
http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html?rev=1462083&r1=1462082&r2=1462083&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html 
(original)
+++ bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html 
Thu Mar 28 13:19:42 2013
@@ -50,34 +50,7 @@ Arguments:
     <a href="#comment:$cnum" title="$prefix$cnum" class="$cls" 
style="margin-left:5px;">&#x260D;</a>
   </py:def>
   <div class="row visible-desktop-hover" py:if="change.comment">
-    <div class="comment-box" id="${'comment:' + str(cnum) if cnum else ''}">
-      <div style="display:none;">
-        <h6 style="margin-left: 0px; margin-top:10px;">
-          <py:choose>
-            <py:when test="'date' in change">
-              ${pretty_dateinfo(change.date)}
-            </py:when>
-            <py:otherwise>(Unknown)</py:otherwise>
-          </py:choose>
-        </h6>
-        <div class="threading"
-              py:with="change_replies = replies.get(str(cnum), []) if 'cnum' 
in change else []">
-          <p py:if="'replyto' in change">
-            In reply to: ${commentref('&uarr;&nbsp;', change.replyto)}
-          </p>
-          <p py:if="change_replies">
-            <i18n:choose numeral="len(change_replies)">
-              <span i18n:singular="">Follow-up:</span>
-              <i18n:plural>
-                <span>Follow-ups:</span><br/>
-              </i18n:plural>
-            </i18n:choose>
-            <py:for each="reply in change_replies">
-              ${commentref('&darr;&nbsp;', reply, 'follow-up')}
-            </py:for>
-          </p>
-        </div>
-      </div>
+    <div py:if="cnum" class="comment-box" id="${'comment:' + str(cnum) if cnum 
else ''}">
       <div>
         <h4 class="change">
         <div class="pull-right">
@@ -201,29 +174,36 @@ Arguments:
     </h4>
   </div >
   </py:if>
-  <ul py:if="change.fields" class="changes">
+  <ul py:if="change.fields" class="changes ">
     <li py:for="field_name, field in sorted(change.fields.iteritems(), 
key=lambda item: item[1].label.lower())"
-        class="trac-field-${field_name}${'trac-conflict' if preview and 
field_name in conflicts else None}">
+        class="trac-field-${field_name}${'trac-conflict' if preview and 
field_name in conflicts else None} visible-desktop-hover">
       <strong class="trac-field-${field_name}">${field.label}</strong>
-      <py:choose>
-        <py:when test="field_name == 'attachment'"><i18n:msg params="name">
-          <a href="${href.attachment('ticket', ticket.id, 
field.new)}"><em>${field.new
-            }</em></a><a href="${href('raw-attachment', 'ticket', ticket.id, 
field.new)}"
-                         title="Download" class="trac-rawlink">&#8203;</a>
-          added
-        </i18n:msg></py:when>
-        <py:when test="'rendered' in field">${field.rendered}</py:when>
-        <py:when test="field.old and field.new"><i18n:msg params="old, new">
-          changed from <em>${field.old}</em> to <em>${field.new}</em>
-        </i18n:msg></py:when>
-        <py:when test="not field.old and field.new"><i18n:msg params="value">
-          set to <em>${field.new}</em>
-        </i18n:msg></py:when>
-        <py:otherwise><i18n:msg params="value">
-          <em>${field.old}</em> deleted
-        </i18n:msg></py:otherwise>
-      </py:choose>
-      - by ${authorinfo(change.author)} ${pretty_dateinfo(change.date)}
+      <span>
+        <py:choose>
+          <py:when test="field_name == 'attachment'"><i18n:msg params="name">
+            <a href="${href.attachment('ticket', ticket.id, 
field.new)}"><em>${field.new
+              }</em></a><a href="${href('raw-attachment', 'ticket', ticket.id, 
field.new)}"
+                           title="Download" class="trac-rawlink">&#8203;</a>
+            added
+          </i18n:msg></py:when>
+          <py:when test="'rendered' in field">${field.rendered}</py:when>
+          <py:when test="field.old and field.new"><i18n:msg params="old, new">
+            changed from <em>${field.old}</em> to <em>${field.new}</em>
+          </i18n:msg></py:when>
+          <py:when test="not field.old and field.new"><i18n:msg params="value">
+            set to <em>${field.new}</em>
+          </i18n:msg></py:when>
+          <py:otherwise><i18n:msg params="value">
+            <em>${field.old}</em> deleted
+          </i18n:msg></py:otherwise>
+        </py:choose>
+        <span class="hidden-desktop">
+        - by ${authorinfo(change.author)}, ${pretty_dateinfo(change.date)}
+        </span>
+        <span py:if="field_name == 'attachment' and change.comment" 
class="attachment-desc searchable" xml:space="preserve">
+          ${wiki_to_html(context, change.comment, 
escape_newlines=preserve_newlines)}
+        </span>
+      </span>
     </li>
   </ul>
 </html>