kallithea Changeset - fd4ea41c2dc1

Changeset - fd4ea41c2dc1

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 12 years ago 2013-06-12 02:13:05
madski@unity3d.com

Grafted from: fb679d015656

pull requests: make the difference between changeset comments with status and PR comments with votes more obvious

3 files changed with 11 insertions and 6 deletions:

rhodecode/templates/changeset/changeset_file_comment.html

rhodecode/templates/changeset/changeset_range.html

rhodecode/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -17,13 +17,13 @@ @@
        <div style="float:left;padding:4px 0px 0px 5px">
         <span class="">
          %if co.pull_request:
             <a href="${h.url('pullrequest_show',repo_name=co.pull_request.other_repo.repo_name,pull_request_id=co.pull_request.pull_request_id)}">
             %if co.status_change:
-              ${_('Status change on pull request #%s') % co.pull_request.pull_request_id}:
+              ${_('Vote on pull request #%s') % co.pull_request.pull_request_id}:
             %else:
               ${_('Comment on pull request #%s') % co.pull_request.pull_request_id}
             %endif
             </a>
          %else:
             %if co.status_change:
@@ @@ -139,38 +139,44 @@ @@
         </div>
     %endfor
 </div>
 </%def>
 ## MAIN COMMENT FORM
-<%def name="comments(post_url, cur_status, close_btn=False, change_status=True)">
+<%def name="comments(post_url, cur_status, is_pr=False, change_status=True)">
 <div class="comments">
     %if c.rhodecode_user.username != 'default':
     <div class="comment-form ac">
         ${h.form(post_url)}
         <div id="edit-container" 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}
               %if change_status:
                 | <a id="show_changeset_link" onClick="change_status_show();"> ${_('Change status')}</a>
                 | <a id="show_changeset_link" onClick="change_status_show();">
                   %if is_pr:
                     ${_('Vote for pull request status')}
                   %else:
                     ${_('Change changeset status')}
                   %endif
                   </a>
                   <input id="show_changeset_status_box" type="checkbox" name="change_changeset_status" style="display: none;" />
               %endif
               <div id="preview-btn" class="preview-btn ui-btn small">${_('Preview')}</div>
             </div>
             %if change_status:
             <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" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">
                         <label for="${status}">${lbl}</label>
                     </div>
                 %endfor
-                %if close_btn and change_status:
+                %if is_pr and change_status:
                 <input id="save_close" type="checkbox" name="save_close" disabled="${'1' if cur_status in ['not_reviewed','under_review'] else ''}">
                 <label id="save_close_label" for="save_close" class="${'disabled' if cur_status in ['not_reviewed','under_review'] else ''}">${_("Close (when approved or rejected)")}</label>
                 %endif
             </div>
             %endif
             <div class="mentions-container" id="mentions_container"></div>

rhodecode/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -98,13 +98,12 @@ ${self.repo_context_bar('changelog')} @@
                 </span>
                 %endif
               </span>
             </div>
            </div>
           ${diff_block.diff_block(c.changes[cs.raw_id])}
           ##${comment.comments(cs)}
      %endfor
      <script type="text/javascript">
       YUE.onDOMReady(function(){

rhodecode/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -210,13 +210,13 @@ ${self.repo_context_bar('showpullrequest @@
     % if not c.pull_request.is_closed():
       ## main comment 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,
-                                close_btn=True, change_status=c.allowed_to_change_status)}
+                         is_pr=True, change_status=c.allowed_to_change_status)}
     %endif
     <script type="text/javascript">
       YUE.onDOMReady(function(){
           PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);

0 comments (0 inline, 0 general)