kallithea Changeset - a181d4bd4c3d

Changeset - a181d4bd4c3d

Parent rev.

Child rev.

[Not reviewed]

default

0 8 0

Mads Kiilerich - 8 years ago 2017-06-19 01:34:31
mads@kiilerich.com

style: rework review status icon handling

The styling had a reference to a '.container .changeset-status-ico' which might
collide with use of the Bootstrap 'container' class.

Investigation of that lead to complete removal of all changeset-status-ico and
changeset-status-container, plus related simplification of templates.

8 files changed with 10 insertions and 41 deletions:

kallithea/public/css/style.css

kallithea/templates/changelog/changelog.html

kallithea/templates/changelog/changelog_summary_data.html

kallithea/templates/changeset/changeset.html

kallithea/templates/changeset/changeset_file_comment.html

kallithea/templates/changeset/changeset_range.html

kallithea/templates/compare/compare_cs.html

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -679,7 +679,8 @@ div.panel.panel-default div.panel-headin @@
+}
 #content div.panel table td.compact {
     padding: 0;
     padding-left: 0;
     padding-right: 0;
+}
 #content div.panel table tr.selected td {
@@ @@ -1686,27 +1687,6 @@ div.panel-body #files_data .revision-lin @@
     font-weight: bold !important;
+}
 .changeset-status-container {
     padding-right: 5px;
     margin-top: 1px;
     height: 14px;
+}
 .code-header .changeset-status-container {
     float: left;
     padding: 2px 0px 0px 2px;
+}
 .code-header .changeset-status-container .changeset-status-lbl {
     float: left;
     padding: 0px 4px 0px 0px;
+}
 .changeset-status-container div.changeset-status-ico {
     float: left;
+}
 .code-header .changeset-status-container .changeset-status-ico,
 .container .changeset-status-ico {
     float: left;
+}
 /* changeset statuses (must be the same name as the status) */
 .changeset-status-not_reviewed {
     color: #bababa;

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -82,7 +82,6 @@ ${self.repo_context_bar('changelog', c.f @@
                         </td>
                         <td class="status">
                           %if c.statuses.get(cs.raw_id):
                             <div class="changeset-status-ico">
                             %if c.statuses.get(cs.raw_id)[2]:
                               <a data-toggle="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username, 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>
@@ @@ -93,7 +92,6 @@ ${self.repo_context_bar('changelog', c.f @@
                                   <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
                               </a>
                             %endif
                             </div>
                           %endif
                         </td>
                         <td class="author">

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

@@ @@ -13,9 +13,7 @@ @@
 %for cnt,cs in enumerate(c.repo_changesets):
     <tr class="parity${cnt%2} ${'mergerow' if len(cs.parents) > 1 else ''}">
         <td class="compact">
             <div class="changeset-status-container">
               %if c.statuses.get(cs.raw_id):
                 <span class="changeset-status-ico shortlog">
                 %if c.statuses.get(cs.raw_id)[2]:
                   <a data-toggle="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username, 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>
@@ @@ -26,9 +24,7 @@ @@
                     <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>
                   </a>
                 %endif
                 </span>
               %endif
             </div>
         </td>
         <td class="compact">
               %if c.comments.get(cs.raw_id,[]):

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -44,10 +44,10 @@ ${self.repo_context_bar('changelog', c.c @@
             </div>
             <div class="pull-left">
                 <div class="pull-left">
+                <div class="pull-left" title="${_('Changeset status')}">
                     %if c.statuses:
                         <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>
                         <i class="icon-circle changeset-status-${c.statuses[0]}"></i>
                         [${h.changeset_status_lbl(c.statuses[0])}]
                     %endif
                 </div>
                 <div class="diff-actions pull-left">

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -34,8 +34,8 @@ @@
         %if co.status_change:
            <div class="automatic-comment">
              <p>
                <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>
                ${_("Status change")}: ${co.status_change[0].status_lbl}
                <i class="icon-circle changeset-status-${co.status_change[0].status}"></i>
              </p>
            </div>
         %endif

kallithea/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -40,7 +40,7 @@ ${self.repo_context_bar('changelog')} @@
                     <td><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
                     <td>
                       %if c.statuses:
-                        <div title="${_('Changeset status')}" class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[cnt]}"></i></div>
+                        <i class="icon-circle changeset-status-${c.statuses[cnt]}" title="${_('Changeset status: %s') % h.changeset_status_lbl(c.statuses[cnt])}"></i>
                       %endif
                     </td>
                     <td><div class="message">${h.urlify_text(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

@@ @@ -34,9 +34,7 @@ @@
       <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}">
         <td>
           %if cs.raw_id in c.statuses:
             <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico">
                 <i class="icon-circle changeset-status-${c.statuses[cs.raw_id][0]}"></i>
             </div>
               <i class="icon-circle changeset-status-${c.statuses[cs.raw_id][0]}" title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}"></i>
           %endif
           %if c.cs_comments.get(cs.raw_id):
               <div class="comments-container">

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -65,10 +65,8 @@ ${self.repo_context_bar('showpullrequest @@
         <div class="form-group">
           <label>${_('Reviewer voting result')}:</label>
           <div>
             <div class="changeset-status-container">
             %if c.current_voting_result:
               <span class="changeset-status-ico">
                   <i class="icon-circle changeset-status-${c.current_voting_result}" title="${_('Pull request status calculated from votes')}"></i></span>
               <i class="icon-circle changeset-status-${c.current_voting_result}" title="${_('Pull request status calculated from votes')}"></i>
               <span class="changeset-status-lbl" data-toggle="tooltip" title="${_('Pull request status calculated from votes')}">
                 %if c.pull_request.is_closed():
                     ${_('Closed')},
@@ @@ -76,7 +74,6 @@ ${self.repo_context_bar('showpullrequest @@
                 ${h.changeset_status_lbl(c.current_voting_result)}
               </span>
             %endif
             </div>
           </div>
         </div>
         <div class="form-group">

0 comments (0 inline, 0 general)