Mercurial > kallithea

changeset 6297:0b51254050a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style: use span for reviewers instead of div Based on Bootstrap work by Dominik Ruf.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 08 Nov 2016 23:29:12 +0100
parents a810db90098e
children 0d4dfe2122fe
files kallithea/public/js/base.js kallithea/templates/pullrequests/pullrequest_show.html
diffstat 2 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/js/base.js	Tue Nov 08 23:29:12 2016 +0100
+++ b/kallithea/public/js/base.js	Tue Nov 08 23:29:12 2016 +0100
@@ -1312,19 +1312,19 @@
     // If you change something here it should be reflected in the template too.
     var element = (
         '     <li id="reviewer_{2}">\n'+
-        '       <div class="reviewers_member">\n'+
-        '         <div class="reviewer_status" data-toggle="tooltip" title="not_reviewed">\n'+
+        '       <span class="reviewers_member">\n'+
+        '         <span class="reviewer_status" data-toggle="tooltip" title="not_reviewed">\n'+
         '             <i class="icon-circle changeset-status-not_reviewed"></i>\n'+
-        '         </div>\n'+
+        '         </span>\n'+
         (gravatarelm ?
-        '         <div class="reviewer_gravatar gravatar">{0}</div>\n' :
+        '         {0}\n' :
         '')+
-        '         <div style="float:left;">{1}</div>\n'+
+        '         <span>{1}</span>\n'+
         '         <input type="hidden" value="{2}" name="review_members" />\n'+
         '         <a href="#" class="reviewer_member_remove" onclick="removeReviewMember({2})">\n'+
         '             <i class="icon-minus-circled"></i>\n'+
         '         </a> (add not saved)\n'+
-        '       </div>\n'+
+        '       </span>\n'+
         '     </li>\n'
         ).format(gravatarelm, displayname, id);
     // check if we don't have this ID already in
--- a/kallithea/templates/pullrequests/pullrequest_show.html	Tue Nov 08 23:29:12 2016 +0100
+++ b/kallithea/templates/pullrequests/pullrequest_show.html	Tue Nov 08 23:29:12 2016 +0100
@@ -212,24 +212,24 @@
               ## kallithea/public/js/base.js
               ## If you change something here it should be reflected in the template too.
               <li id="reviewer_${member.user_id}">
-                <div class="reviewers_member">
-                  <div class="reviewer_status" data-toggle="tooltip" title="${h.changeset_status_lbl(status)}">
+                <span class="reviewers_member">
+                  <span class="reviewer_status" data-toggle="tooltip" title="${h.changeset_status_lbl(status)}">
                       <i class="icon-circle changeset-status-${status}"></i>
-                  </div>
-                  ${h.gravatar_div(member.email, size=14, div_class="reviewer_gravatar gravatar")}
-                  <div style="float:left;">
+                  </span>
+                  ${h.gravatar(member.email, size=14)}
+                  <span>
                     ${member.full_name_and_username}
                     %if c.pull_request.owner_id == member.user_id:
                       (${_('Owner')})
                     %endif
-                  </div>
+                  </span>
                   <input type="hidden" value="${member.user_id}" name="review_members" />
                   %if editable:
                   <a href="#" class="reviewer_member_remove" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">
                       <i class="icon-minus-circled"></i>
                   </a>
                   %endif
-                </div>
+                </span>
               </li>
             %endfor
             </ul>