Mercurial > kallithea

changeset 5106:293066605a43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Mads Kiilerich <madski@unity3d.com>
date Thu, 07 May 2015 16:26:40 +0200
parents 14d75d4b03cd
children 5153c491a964
files 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
diffstat 5 files changed, 11 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/style.css	Thu May 07 16:26:40 2015 +0200
+++ b/kallithea/public/css/style.css	Thu May 07 16:26:40 2015 +0200
@@ -2690,15 +2690,11 @@
     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,
--- a/kallithea/templates/changelog/changelog_summary_data.html	Thu May 07 16:26:40 2015 +0200
+++ b/kallithea/templates/changelog/changelog_summary_data.html	Thu May 07 16:26:40 2015 +0200
@@ -15,7 +15,7 @@
         <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>
@@ -23,7 +23,7 @@
                 %else:
                   <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
                 %endif
-                </div>
+                </span>
               %endif
             </div>
         </td>
--- a/kallithea/templates/changeset/changeset.html	Thu May 07 16:26:40 2015 +0200
+++ b/kallithea/templates/changeset/changeset.html	Thu May 07 16:26:40 2015 +0200
@@ -46,8 +46,8 @@
             <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/kallithea/templates/changeset/changeset_file_comment.html	Thu May 07 16:26:40 2015 +0200
+++ b/kallithea/templates/changeset/changeset_file_comment.html	Thu May 07 16:26:40 2015 +0200
@@ -40,8 +40,8 @@
         %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/kallithea/templates/pullrequests/pullrequest_show.html	Thu May 07 16:26:40 2015 +0200
+++ b/kallithea/templates/pullrequests/pullrequest_show.html	Thu May 07 16:26:40 2015 +0200
@@ -76,15 +76,14 @@
           <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>