kallithea Changeset - 95ec841bfe1f

Changeset - 95ec841bfe1f

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 12 years ago 2013-06-27 23:20:08
marcin@python-works.com

pull requests: remove redundant status icon from pr title.

- add tooltip to show the status calculation

2 files changed with 11 insertions and 6 deletions:

rhodecode/public/css/style.css

rhodecode/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -4648,34 +4648,39 @@ form.comment-inline-form { @@
     margin: 34px 2px 2px 8px
+}
 /****
 PULL REQUESTS
 *****/
 .pullrequests_section_head {
     padding: 10px 10px 10px 0px;
     font-size: 16px;
     font-weight: bold;
+}
-h3.closed,
+div.pr-details-title.closed,
 #pullrequests_container li.closed a
+ {
     color: #555;
     background: #eee;
+}
 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;
     margin: 0px 20px;
     padding: 10px 4px;
+}
 div.pr-desc {
     margin: 0px 20px;
+}
 div.pr-closed {
     background-color: #eee;
+}

rhodecode/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -11,48 +11,48 @@ @@
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
 ${self.repo_context_bar('showpullrequest')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${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">
          <div class="field">
           <div class="label-summary">
               <label>${_('Review status')}:</label>
           </div>
           <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>
          </div>
          <div class="field">
           <div class="label-summary">
               <label>${_('Still not reviewed by')}:</label>
           </div>
           <div class="input">
             % if len(c.pull_request_pending_reviewers) > 0:
                 <div class="tooltip" title="${h.tooltip(', '.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div>
             %else:

0 comments (0 inline, 0 general)