##// END OF EJS Templates
small UI changes for pull-request view
marcink -
r2482:1fd3c043 beta
parent child Browse files
Show More
@@ -115,9 +115,8 b''
115 ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')),
115 ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')),
116 '<span style="color:#003367" class="tooltip" title="%s">@mention</span>' %
116 '<span style="color:#003367" class="tooltip" title="%s">@mention</span>' %
117 _('Use @username inside this text to send notification to this RhodeCode user')))|n}
117 _('Use @username inside this text to send notification to this RhodeCode user')))|n}
118 | <span class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')}
118 | <label for="show_changeset_status_box" class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')}</label>
119 <input style="vertical-align: bottom;margin-bottom:-2px" id="show_changeset_status_box" type="checkbox" name="change_changeset_status" />
119 <input style="vertical-align: bottom;margin-bottom:-2px" id="show_changeset_status_box" type="checkbox" name="change_changeset_status" />
120 </span>
121 </div>
120 </div>
122 <div id="status_block_container" class="status-block" style="display:none">
121 <div id="status_block_container" class="status-block" style="display:none">
123 %for status,lbl in c.changeset_statuses:
122 %for status,lbl in c.changeset_statuses:
@@ -20,15 +20,17 b''
20 ${self.breadcrumbs()}
20 ${self.breadcrumbs()}
21 </div>
21 </div>
22
22
23 <h3>${_('Title')}: ${c.pull_request.title}</h3>
23 <h3>${_('Title')}: ${c.pull_request.title}
24 <div class="changeset-status-container" style="float:left;padding:0px 20px 0px 20px">
24 <div class="changeset-status-container" style="float:none">
25 %if c.current_changeset_status:
25 %if c.current_changeset_status:
26 <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div>
26 <div title="${_('Pull request status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.current_changeset_status)}]</div>
27 <div class="changeset-status-ico"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
27 <div class="changeset-status-ico" style="padding:4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
28 %endif
28 %endif
29 </div>
29 </div>
30 <div style="padding:4px 4px 10px 4px">
30 </h3>
31 <div>${h.fmt_date(c.pull_request.created_on)}</div>
31 <div style="white-space:pre-wrap;padding:3px 3px 5px 20px">${h.literal(c.pull_request.description)}</div>
32 <div style="padding:4px 4px 10px 20px">
33 <div>${_('Created on')}: ${h.fmt_date(c.pull_request.created_on)}</div>
32 </div>
34 </div>
33
35
34 ## REVIEWERS
36 ## REVIEWERS
@@ -43,7 +45,7 b''
43 %for user,status in c.pull_request_reviewers:
45 %for user,status in c.pull_request_reviewers:
44 <li>
46 <li>
45 <div class="group_member">
47 <div class="group_member">
46 <div style="float:left;padding:3px">
48 <div style="float:left;padding:3px" class="tooltip" title="${h.tooltip(h.changeset_status_lbl(status[0][1].status if status else 'not_reviewed'))}">
47 <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status[0][1].status if status else 'not_reviewed')))}"/>
49 <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status[0][1].status if status else 'not_reviewed')))}"/>
48 </div>
50 </div>
49 <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,20)}"/> </div>
51 <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,20)}"/> </div>
@@ -58,7 +60,7 b''
58 ##DIFF
60 ##DIFF
59 <div class="table" style="float:left;width:46%;clear:none">
61 <div class="table" style="float:left;width:46%;clear:none">
60 <div id="body" class="diffblock">
62 <div id="body" class="diffblock">
61 <div style="white-space:pre-wrap;padding:5px">${h.literal(c.pull_request.description)}</div>
63 <div style="white-space:pre-wrap;padding:5px">${_('Compare view')}</div>
62 </div>
64 </div>
63 <div id="changeset_compare_view_content">
65 <div id="changeset_compare_view_content">
64 ##CS
66 ##CS
@@ -99,9 +101,4 b''
99
101
100 </div>
102 </div>
101
103
102 <script type="text/javascript">
103
104
105 </script>
106
107 </%def>
104 </%def>
General Comments 0
You need to be logged in to leave comments. Login now