kallithea Changeset - 1fd3c043c025

Changeset - 1fd3c043c025

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-06-19 19:48:57
marcin@python-works.com

small UI changes for pull-request view

2 files changed with 11 insertions and 15 deletions:

rhodecode/templates/changeset/changeset_file_comment.html

rhodecode/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -112,15 +112,14 @@ @@
         <strong>${_('Leave a comment')}</strong>
         <div class="clearfix">
             <div class="comment-help">
                 ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')),
           		'<span style="color:#003367" class="tooltip" title="%s">@mention</span>' %
           		_('Use @username inside this text to send notification to this RhodeCode user')))|n}
-                | <span class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')}
+                | <label for="show_changeset_status_box" class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')}</label>
                   <input style="vertical-align: bottom;margin-bottom:-2px" id="show_changeset_status_box" type="checkbox" name="change_changeset_status" />
                   </span>
             </div>
             <div id="status_block_container" class="status-block" style="display:none">
                 %for status,lbl in c.changeset_statuses:
                     <div class="">
                         <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" name="changeset_status" value="${status}"> <label>${lbl}</label>
                     </div>

rhodecode/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -17,21 +17,23 @@ @@
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <h3>${_('Title')}: ${c.pull_request.title}</h3>
     <div class="changeset-status-container" style="float:left;padding:0px 20px 0px 20px">
     <h3>${_('Title')}: ${c.pull_request.title}
         <div class="changeset-status-container" style="float:none">
         %if c.current_changeset_status:
           <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div>
           <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
           <div title="${_('Pull request status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div>
           <div class="changeset-status-ico" style="padding:4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
         %endif
     </div>
     <div style="padding:4px 4px 10px 4px">
       <div>${h.fmt_date(c.pull_request.created_on)}</div>
     </h3>
     <div style="white-space:pre-wrap;padding:3px 3px 5px 20px">${h.literal(c.pull_request.description)}</div>
     <div style="padding:4px 4px 10px 20px">
       <div>${_('Created on')}: ${h.fmt_date(c.pull_request.created_on)}</div>
     </div>
     ## REVIEWERS
     <div>
       <div class="table" style="float:right;width:46%;clear:none">
           <div id="body" class="diffblock">
@@ @@ -40,13 +42,13 @@ @@
           <div style="border: 1px solid #CCC">
             <div class="group_members_wrap">
               <ul class="group_members">
               %for user,status in c.pull_request_reviewers:
                 <li>
                   <div class="group_member">
                     <div style="float:left;padding:3px">
+                    <div style="float:left;padding:3px" class="tooltip" title="${h.tooltip(h.changeset_status_lbl(status[0][1].status if status else 'not_reviewed'))}">
                       <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status[0][1].status if status else 'not_reviewed')))}"/>
                     </div>
                     <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,20)}"/> </div>
                     <div style="float:left">${user.username}</div>
                   </div>
                 </li>
@@ @@ -55,13 +57,13 @@ @@
             </div>
           </div>
       </div>
       ##DIFF
       <div class="table" style="float:left;width:46%;clear:none">
           <div id="body" class="diffblock">
-              <div style="white-space:pre-wrap;padding:5px">${h.literal(c.pull_request.description)}</div>
+              <div style="white-space:pre-wrap;padding:5px">${_('Compare view')}</div>
           </div>
           <div id="changeset_compare_view_content">
               ##CS
               <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Incoming changesets')}</div>
               <%include file="/compare/compare_cs.html" />
@@ @@ -96,12 +98,7 @@ @@
     ## render comments main comments form and it status
     ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id),
                        c.current_changeset_status)}
 </div>
 <script type="text/javascript">
 </script>
 </%def>

0 comments (0 inline, 0 general)