kallithea Changeset - 293066605a43

Changeset - 293066605a43

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Mads Kiilerich - 11 years ago 2015-05-07 16:26:40
madski@unity3d.com

comment: replace floating status with span

Simpler ...

Similar clean-ups could be done in a lot of places - this is just something I
"needed" for the next change.

5 files changed with 11 insertions and 16 deletions:

kallithea/public/css/style.css

kallithea/templates/changelog/changelog_summary_data.html

kallithea/templates/changeset/changeset.html

kallithea/templates/changeset/changeset_file_comment.html

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -2687,21 +2687,17 @@ BIN_FILENODE = 6 @@
     height: 14px;
+}
 .code-header .changeset-status-container {
     float: left;
     padding: 2px 0px 0px 2px;
+}
 .changeset-status-container .changeset-status-lbl {
     float: left;
     padding: 3px 4px 0px 0px
+}
 .code-header .changeset-status-container .changeset-status-lbl {
     float: left;
     padding: 0px 4px 0px 0px;
+}
 .changeset-status-container .changeset-status-ico {
+.changeset-status-container div.changeset-status-ico {
     float: left;
+}
 .code-header .changeset-status-container .changeset-status-ico,
 .container .changeset-status-ico {
     float: left;
+}

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

@@ @@ -12,21 +12,21 @@ @@
     </tr>
 %for cnt,cs in enumerate(c.repo_changesets):
     <tr class="parity${cnt%2}">
         <td class="compact">
             <div class="changeset-status-container">
               %if c.statuses.get(cs.raw_id):
-                <div class="changeset-status-ico shortlog">
+                <span class="changeset-status-ico shortlog">
                 %if c.statuses.get(cs.raw_id)[2]:
                   <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
                     <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
                   </a>
                 %else:
                   <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
                 %endif
-                </div>
+                </span>
               %endif
             </div>
         </td>
         <td class="compact">
               %if c.comments.get(cs.raw_id,[]):
                <div class="comments-container">

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -43,14 +43,14 @@ ${self.repo_context_bar('changelog', c.c @@
                 </div>
             </div>
             <div class="code-header banner">
                 <div class="changeset-status-container">
                     %if c.statuses:
                         <div class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[0]}"></i></div>
                         <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</div>
                         <span class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[0]}"></i></span>
                         <span title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</span>
                     %endif
                 </div>
                 <div class="diff-actions">
                   <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}"  class="tooltip" title="${h.tooltip(_('Raw diff'))}">
                       <i class="icon-diff"></i>
                   </a>

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -37,14 +37,14 @@ @@
         </span>
        </div>
         %if co.status_change:
            <div  style="float:left" class="changeset-status-container">
              <div style="float:left;padding:10px 2px 0px 2px"></div>
              <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change[0].status_lbl}</div>
              <div class="changeset-status-ico"><i class="icon-circle changeset-status-${co.status_change[0].status}"></i></div>
              <span title="${_('Changeset status')}" class="changeset-status-lbl">${_("Status change")}: ${co.status_change[0].status_lbl}</span>
              <span class="changeset-status-ico"><i class="icon-circle changeset-status-${co.status_change[0].status}"></i></span>
            </div>
         %endif
       <a class="permalink" href="#comment-${co.comment_id}">&para;</a>
       %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or co.author.user_id == c.authuser.user_id:
           <div onClick="confirm('${_("Delete comment?")}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-mini">${_('Delete')}</div>

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -73,21 +73,20 @@ ${self.repo_context_bar('showpullrequest @@
           <div class="label-summary">
               <label>${_('Reviewer voting result')}:</label>
           </div>
           <div class="input">
             <div class="changeset-status-container" style="float:none;clear:both">
             %if c.current_voting_result:
               <div class="changeset-status-ico" style="padding:0px 4px 0px 0px">
                   <i class="icon-circle changeset-status-${c.current_voting_result}" title="${_('Pull request status calculated from votes')}"></i></div>
               <div class="changeset-status-lbl tooltip" title="${_('Pull request status calculated from votes')}">
               <span class="changeset-status-ico" style="padding:0px 4px 0px 0px">
                   <i class="icon-circle changeset-status-${c.current_voting_result}" title="${_('Pull request status calculated from votes')}"></i></span>
               <span class="changeset-status-lbl tooltip" title="${_('Pull request status calculated from votes')}">
                 %if c.pull_request.is_closed():
                     ${_('Closed')},
                 %endif
                 ${h.changeset_status_lbl(c.current_voting_result)}
               </div>
               </span>
             %endif
             </div>
           </div>
         </div>
         <div class="field">
           <div class="label-summary">

0 comments (0 inline, 0 general)