incubator-bloodhound-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g..@apache.org
Subject svn commit: r1394017 - /incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html
Date Thu, 04 Oct 2012 12:47:03 GMT
Author: gjm
Date: Thu Oct  4 12:47:02 2012
New Revision: 1394017

URL: http://svn.apache.org/viewvc?rev=1394017&view=rev
Log:
moving comment number and threading indicators to the left of the associated comment, beneath
the time - fixes #177

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

Modified: incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html
URL: http://svn.apache.org/viewvc/incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html?rev=1394017&r1=1394016&r2=1394017&view=diff
==============================================================================
--- incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html (original)
+++ incubator/bloodhound/trunk/bloodhound_theme/bhtheme/templates/bh_ticket_change.html Thu
Oct  4 12:47:02 2012
@@ -51,7 +51,7 @@ Arguments:
   </py:def>
   <div class="row">
     <div class="span2">
-      <h6>
+      <h6 style="margin-left: 0px; margin-top:10px;">
         <py:choose>
           <py:when test="'date' in change">
             ${pretty_dateinfo(change.date)}
@@ -59,11 +59,29 @@ Arguments:
           <py:otherwise>(Unknown)</py:otherwise>
         </py:choose>
       </h6>
+      <p style="margin: 0">
+        <span py:if="'cnum' in change" id="comment:$cnum" class="cnum">${commentref('comment:',
cnum)}</span>&nbsp;
+      </p>
+      <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 class="offset2">
       <h4 class="change">
-        <span class="threading pull-right"
-              py:with="change_replies = replies.get(str(cnum), []) if 'cnum' in change else
[]">
       <div py:if="show_buttons" class="pull-right bh-ticket-buttons">
         <form py:if="'cnum' in change and can_edit_comment" method="get"
             style="display:inline" action="#comment:${cnum}">
@@ -82,21 +100,6 @@ Arguments:
           </div>
         </form>
       </div>
-          <span py:if="'cnum' in change" id="comment:$cnum" class="cnum">${commentref('comment:',
cnum)}</span>
-          <py:if test="'replyto' in change">
-            in reply to: ${commentref('&uarr;&nbsp;', change.replyto)}
-            <py:if test="change_replies">; </py:if>
-          </py:if>
-          <py:if test="change_replies">
-            <i18n:choose numeral="len(change_replies)">
-              <span i18n:singular="">follow-up:</span>
-              <span i18n:plural="">follow-ups:</span>
-            </i18n:choose>
-            <py:for each="reply in change_replies">
-              ${commentref('&darr;&nbsp;', reply, 'follow-up')}
-            </py:for>
-          </py:if>
-        </span>
         ${authorinfo(change.author)}
         <span py:if="preview or show_editor" class="trac-loading"/>
       </h4>



Mime
View raw message