Mercurial > kallithea
changeset 4054:95ec841bfe1f
pull requests: remove redundant status icon from pr title.
- add tooltip to show the status calculation
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Thu, 27 Jun 2013 23:20:08 +0200 |
parents | 3625fd19b201 |
children | 9314f2645161 |
files | rhodecode/public/css/style.css rhodecode/templates/pullrequests/pullrequest_show.html |
diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/style.css Wed Jun 12 02:13:05 2013 +0200 +++ b/rhodecode/public/css/style.css Thu Jun 27 23:20:08 2013 +0200 @@ -4657,7 +4657,7 @@ font-weight: bold; } -h3.closed, +div.pr-details-title.closed, #pullrequests_container li.closed a { color: #555; @@ -4667,6 +4667,11 @@ div.pr-title { font-size: 1.6em; } +div.pr-details-title{ + font-size: 1.6em; + margin: 0px 20px 0px 20px; + padding: 5px 0px 5px 10px; +} div.pr { border-bottom: 1px solid #DDD;
--- a/rhodecode/templates/pullrequests/pullrequest_show.html Wed Jun 12 02:13:05 2013 +0200 +++ b/rhodecode/templates/pullrequests/pullrequest_show.html Thu Jun 27 23:20:08 2013 +0200 @@ -20,13 +20,12 @@ ${self.breadcrumbs()} </div> - <h3 class="${'closed' if c.pull_request.is_closed() else ''}"> - <img src="${h.url('/images/icons/flag_status_%s.png' % str(c.pull_request.last_review_status))}" /> + <div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}"> ${_('Title')}: ${c.pull_request.title} %if c.pull_request.is_closed(): (${_('Closed')}) %endif - </h3> + </div> <div class="form"> <div id="summary" class="fields"> @@ -37,13 +36,14 @@ <div class="input"> <div class="changeset-status-container" style="float:none;clear:both"> %if c.current_changeset_status: - <div title="${_('Pull request status calculated from votes')}" class="changeset-status-lbl"> + <div class="changeset-status-ico" style="padding:0px 4px 0px 0px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" title="${_('Pull request status calculated from votes')}"/></div> + <div 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_changeset_status)} </div> - <div class="changeset-status-ico" style="padding:1px 4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" title="${_('Pull request status calculated from votes')}"/></div> + %endif </div> </div>