Files @ a0adf8db1416
Branch filter:

Location: kallithea/rhodecode/templates/pullrequests/pullrequest_show.html - annotation

Marcin Kuzminski
Enabled inline comments in pull-requests
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
f29469677319
8eab81115660
1fd3c043c025
1fd3c043c025
1bc579bcd67a
1fd3c043c025
1fd3c043c025
1bc579bcd67a
1fd3c043c025
1fd3c043c025
1fd3c043c025
1fd3c043c025
1fd3c043c025
1bc579bcd67a
8eab81115660
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
1fd3c043c025
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
1bc579bcd67a
4d3032431d4f
1bc579bcd67a
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
1fd3c043c025
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
4d3032431d4f
1bc579bcd67a
1bc579bcd67a
1bc579bcd67a
1bc579bcd67a
a0adf8db1416
a0adf8db1416
1bc579bcd67a
1bc579bcd67a
1bc579bcd67a
1bc579bcd67a
1bc579bcd67a
1bc579bcd67a
1bc579bcd67a
1bc579bcd67a
1bc579bcd67a
1bc579bcd67a
a0adf8db1416
1bc579bcd67a
1bc579bcd67a
fd0a822481ec
fd0a822481ec
8eab81115660
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
a0adf8db1416
f29469677319
f29469677319
f29469677319
<%inherit file="/base/base.html"/>

<%def name="title()">
    ${c.repo_name} ${_('Pull request #%s') % c.pull_request.pull_request_id}
</%def>

<%def name="breadcrumbs_links()">
    ${h.link_to(u'Home',h.url('/'))}
    &raquo;
    ${h.link_to(c.repo_name,h.url('changelog_home',repo_name=c.repo_name))}
    &raquo;
    ${_('Pull request #%s') % c.pull_request.pull_request_id}
</%def>

<%def name="main()">

<div class="box">
    <!-- box / title -->
    <div class="title">
        ${self.breadcrumbs()}
    </div>

    <h3>${_('Title')}: ${c.pull_request.title} 
        <div class="changeset-status-container" style="float:none">
        %if c.current_changeset_status:
          <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>
    </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">
              <div style="white-space:pre-wrap;padding:5px">${_('Pull request reviewers')}</div>
          </div>
          <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" 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>
              %endfor
              </ul>
            </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">${_('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" />
  
              ## FILES
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
              <div class="cs_files">
                %for fid, change, f, stat in c.files:
                    <div class="cs_${change}">
                      <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}</div>
                      <div class="changes">${h.fancy_file_stats(stat)}</div>
                    </div>
                %endfor
              </div>
          </div>
      </div>
    </div>
    <script>
    var _USERS_AC_DATA = ${c.users_array|n};
    var _GROUPS_AC_DATA = ${c.users_groups_array|n};
    AJAX_COMMENT_URL = "${url('pullrequest_comment',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id)}";
    AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";  
    </script>

    ## diff block
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>
    %for fid, change, f, stat in c.files:
      ${diff_block.diff_block_simple([c.changes[fid]])}
    %endfor

    ## template for inline comment form
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
    ${comment.comment_inline_form()}

    ## 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)}


    <script type="text/javascript">
      YUE.onDOMReady(function(){

          YUE.on(YUQ('.show-inline-comments'),'change',function(e){
              var show = 'none';
              var target = e.currentTarget;
              if(target.checked){
                  var show = ''
              }
              var boxid = YUD.getAttribute(target,'id_for');
              var comments = YUQ('#{0} .inline-comments'.format(boxid));
              for(c in comments){
                 YUD.setStyle(comments[c],'display',show);
              }
              var btns = YUQ('#{0} .inline-comments-button'.format(boxid));
              for(c in btns){
                  YUD.setStyle(btns[c],'display',show);
               }
          })

          YUE.on(YUQ('.line'),'click',function(e){
              var tr = e.currentTarget;
              injectInlineForm(tr);
          });

          // inject comments into they proper positions
          var file_comments = YUQ('.inline-comment-placeholder');
          renderInlineComments(file_comments);
      })

    </script>


</div>

</%def>