kallithea Changeset - 0b51254050a2

Changeset - 0b51254050a2

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 9 years ago 2016-11-08 23:29:12
madski@unity3d.com

style: use span for reviewers instead of div

Based on Bootstrap work by Dominik Ruf.

2 files changed with 13 insertions and 13 deletions:

kallithea/public/js/base.js

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1309,25 +1309,25 @@ var addReviewMember = function(id,fname, @@
     var gravatarelm = gravatar(gravatar_link, gravatar_size, "");
     // WARNING: the HTML below is duplicate with
     // kallithea/templates/pullrequests/pullrequest_show.html
     // 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
     var ids = [];
     $('#review_members').find('li').each(function() {
             ids.push(this.id);

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -209,30 +209,30 @@ ${self.repo_context_bar('showpullrequest @@
             <ul id="review_members">
             %for member,status in c.pull_request_reviewers:
               ## WARNING: the HTML below is duplicate with
               ## 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>
           </div>
           %if editable:
           <div class='ac'>

0 comments (0 inline, 0 general)