Mercurial > kallithea
changeset 6703:a181d4bd4c3d
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.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Mon, 19 Jun 2017 01:34:31 +0200 |
| parents | 80ae9f5e9b32 |
| children | 361122e9ee47 |
| files | 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 |
| diffstat | 8 files changed, 10 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Sun Jun 18 01:09:18 2017 +0200 +++ b/kallithea/public/css/style.css Mon Jun 19 01:34:31 2017 +0200 @@ -679,7 +679,8 @@ } #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 @@ 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;
--- a/kallithea/templates/changelog/changelog.html Sun Jun 18 01:09:18 2017 +0200 +++ b/kallithea/templates/changelog/changelog.html Mon Jun 19 01:34:31 2017 +0200 @@ -82,7 +82,6 @@ </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 @@ <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i> </a> %endif - </div> %endif </td> <td class="author">
--- a/kallithea/templates/changelog/changelog_summary_data.html Sun Jun 18 01:09:18 2017 +0200 +++ b/kallithea/templates/changelog/changelog_summary_data.html Mon Jun 19 01:34:31 2017 +0200 @@ -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,[]):
--- a/kallithea/templates/changeset/changeset.html Sun Jun 18 01:09:18 2017 +0200 +++ b/kallithea/templates/changeset/changeset.html Mon Jun 19 01:34:31 2017 +0200 @@ -44,10 +44,10 @@ </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">
--- a/kallithea/templates/changeset/changeset_file_comment.html Sun Jun 18 01:09:18 2017 +0200 +++ b/kallithea/templates/changeset/changeset_file_comment.html Mon Jun 19 01:34:31 2017 +0200 @@ -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
--- a/kallithea/templates/changeset/changeset_range.html Sun Jun 18 01:09:18 2017 +0200 +++ b/kallithea/templates/changeset/changeset_range.html Mon Jun 19 01:34:31 2017 +0200 @@ -40,7 +40,7 @@ <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>
--- a/kallithea/templates/compare/compare_cs.html Sun Jun 18 01:09:18 2017 +0200 +++ b/kallithea/templates/compare/compare_cs.html Mon Jun 19 01:34:31 2017 +0200 @@ -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">
--- a/kallithea/templates/pullrequests/pullrequest_show.html Sun Jun 18 01:09:18 2017 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Mon Jun 19 01:34:31 2017 +0200 @@ -65,10 +65,8 @@ <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 @@ ${h.changeset_status_lbl(c.current_voting_result)} </span> %endif - </div> </div> </div> <div class="form-group">