Changeset - 293066605a43
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
Mads Kiilerich - 11 years ago 2015-05-07 16:26:40
madski@unity3d.com
comment: replace floating status with span

Simpler ...

Similar clean-ups could be done in a lot of places - this is just something I
"needed" for the next change.
5 files changed with 11 insertions and 16 deletions:
kallithea/public/css/style.css
1
5
kallithea/templates/changelog/changelog_summary_data.html
2
2
kallithea/templates/changeset/changeset.html
2
2
kallithea/templates/changeset/changeset_file_comment.html
2
2
kallithea/templates/pullrequests/pullrequest_show.html
4
5
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -2645,105 +2645,101 @@ BIN_FILENODE = 6
 
}
 

			




	
	
	
		
 
#graph_content .logtags .booktag,

			




	
	
	
		
 
#graph_content .logtags .tagtag {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    line-height: 1em;

			




	
	
	
		
 
    margin-bottom: 1px;

			




	
	
	
		
 
    margin-right: 1px;

			




	
	
	
		
 
    padding: 1px 3px;

			




	
	
	
		
 
    font-size: 10px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .mid .message a:hover {

			




	
	
	
		
 
    text-decoration: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#compare_branches + .table .revision-link,

			




	
	
	
		
 
#compare_tags + .table .revision-link,

			




	
	
	
		
 
#compare_bookmarks + .table .revision-link,

			




	
	
	
		
 
.table #files_data .revision-link,

			




	
	
	
		
 
#repos_list_wrap .revision-link,

			




	
	
	
		
 
#shortlog_data .revision-link {

			




	
	
	
		
 
    font-weight: normal !important;

			




	
	
	
		
 
    font-family: monospace;

			




	
	
	
		
 
    font-size: 12px;

			




	
	
	
		
 
    color: #577632;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.revision-link {

			




	
	
	
		
 
    color: #3F6F9F;

			




	
	
	
		
 
    font-weight: bold !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.issue-tracker-link {

			




	
	
	
		
 
    color: #3F6F9F;

			




	
	
	
		
 
    font-weight: bold !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.changeset-status-container {

			




	
	
	
		
 
    padding-right: 5px;

			




	
	
	
		
 
    margin-top: 1px;

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    height: 14px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.code-header .changeset-status-container {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    padding: 2px 0px 0px 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.changeset-status-container .changeset-status-lbl {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    padding: 3px 4px 0px 0px

			




	
	
	
		
 
}

			




	
	
	
		
 
.code-header .changeset-status-container .changeset-status-lbl {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    padding: 0px 4px 0px 0px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.changeset-status-container .changeset-status-ico {

			




	
	
	
		
 
.changeset-status-container div.changeset-status-ico {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
}

			




	
	
	
		
 
.code-header .changeset-status-container .changeset-status-ico,

			




	
	
	
		
 
.container .changeset-status-ico {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* changeset statuses (must be the same name as the status) */

			




	
	
	
		
 
.changeset-status-not_reviewed {

			




	
	
	
		
 
    color: #bababa;

			




	
	
	
		
 
}

			




	
	
	
		
 
.changeset-status-approved {

			




	
	
	
		
 
    color: #81ba51;

			




	
	
	
		
 
}

			




	
	
	
		
 
.changeset-status-rejected {

			




	
	
	
		
 
    color: #cc392e;

			




	
	
	
		
 
}

			




	
	
	
		
 
.changeset-status-under_review {

			




	
	
	
		
 
    color: #ffc71e;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .comments-cnt {

			




	
	
	
		
 
    color: rgb(136, 136, 136);

			




	
	
	
		
 
    padding: 5px 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#shortlog_data .comments-cnt {

			




	
	
	
		
 
    color: rgb(136, 136, 136);

			




	
	
	
		
 
    padding: 3px 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .changes {

			




	
	
	
		
 
    clear: both;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .changes .changed_total {

			




	
	
	
		
 
    display: block;

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    text-align: center;

			




	
	
	
		
 
    min-width: 45px;

			




	
	
	
		
 
    cursor: pointer;

			




	
	
	
		
 
    color: #444444;

			




	
	
	
		
 
    background: #FEA;

			




	
	
	
		
 
    -webkit-border-radius: 0px 0px 0px 6px;

			




	
	
	
		
 
    border-radius: 0px 0px 0px 6px;

			




	
	
	
		
 
    padding: 1px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog_summary_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
%if c.repo_changesets:

			




	
	
	
		
 
<table>

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <th class="left"></th>

			




	
	
	
		
 
        <th class="left"></th>

			




	
	
	
		
 
        <th class="left">${_('Revision')}</th>

			




	
	
	
		
 
        <th class="left">${_('Commit Message')}</th>

			




	
	
	
		
 
        <th class="left">${_('Age')}</th>

			




	
	
	
		
 
        <th class="left">${_('Author')}</th>

			




	
	
	
		
 
        <th class="left">${_('Refs')}</th>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
%for cnt,cs in enumerate(c.repo_changesets):

			




	
	
	
		
 
    <tr class="parity${cnt%2}">

			




	
	
	
		
 
        <td class="compact">

			




	
	
	
		
 
            <div class="changeset-status-container">

			




	
	
	
		
 
              %if c.statuses.get(cs.raw_id):

			




	
	
	
		
 
                <div class="changeset-status-ico shortlog">

			




	
	
	
		
 
                <span class="changeset-status-ico shortlog">

			




	
	
	
		
 
                %if c.statuses.get(cs.raw_id)[2]:

			




	
	
	
		
 
                  <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">

			




	
	
	
		
 
                    <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                %else:

			




	
	
	
		
 
                  <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td class="compact">

			




	
	
	
		
 
              %if c.comments.get(cs.raw_id,[]):

			




	
	
	
		
 
               <div class="comments-container">

			




	
	
	
		
 
                   <div title="${('comments')}">

			




	
	
	
		
 
                       <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">

			




	
	
	
		
 
                          <i class="icon-comment"></i>${len(c.comments[cs.raw_id])}

			




	
	
	
		
 
                       </a>

			




	
	
	
		
 
                   </div>

			




	
	
	
		
 
               </div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}" class="revision-link">${h.show_id(cs)}</a>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            ${h.urlify_commit(h.chop_at(cs.message,'\n'),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td><span class="tooltip" title="${h.tooltip(h.fmt_date(cs.date))}">

			




	
	
	
		
 
                      ${h.age(cs.date)}</span>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td title="${cs.author}">${h.person(cs.author)}</td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            %if h.is_hg(c.db_repo_scm_instance):

			




	
	
	
		
 
                %for book in cs.bookmarks:

			




	
	
	
		
 
                    <div class="booktag" title="${_('Bookmark %s') % book}">

			




	
	
	
		
 
                        ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            %for tag in cs.tags:

			




	
	
	
		
 
             <div class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                 ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            %if cs.branch:

			




	
	
	
		
 
             <div class="branchtag" title="${_('Branch %s' % cs.branch)}">

			




	
	
	
		
 
                 ${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
%endfor

			




	
	
	
		
 

			




	
	
	
		
 
</table>

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 

			




	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="title">

			




	
	
	
		
 
    ${_('%s Changeset') % c.repo_name} - ${h.show_id(c.changeset)}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Changeset')} - <span class='hash'>${h.show_id(c.changeset)}</span>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="header_menu">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('changelog', c.changeset.raw_id)}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <script>

			




	
	
	
		
 
    var _USERS_AC_DATA = ${c.users_array|n};

			




	
	
	
		
 
    var _GROUPS_AC_DATA = ${c.user_groups_array|n};

			




	
	
	
		
 
    AJAX_COMMENT_URL = "${url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id)}";

			




	
	
	
		
 
    AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";

			




	
	
	
		
 
    </script>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <div class="diffblock">

			




	
	
	
		
 
            <div class="parents">

			




	
	
	
		
 
                <div id="parent_link" class="changeset_hash">

			




	
	
	
		
 
                    <i style="color:#036185" class="icon-left-open"></i> <a href="#">${_('parent rev.')}</a>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="children">

			




	
	
	
		
 
                <div id="child_link" class="changeset_hash">

			




	
	
	
		
 
                    <a href="#">${_('child rev.')}</a> <i style="color:#036185" class="icon-right-open"></i>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="code-header banner">

			




	
	
	
		
 
                <div class="changeset-status-container">

			




	
	
	
		
 
                    %if c.statuses:

			




	
	
	
		
 
                        <div class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[0]}"></i></div>

			




	
	
	
		
 
                        <div title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</div>

			




	
	
	
		
 
                        <span class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[0]}"></i></span>

			




	
	
	
		
 
                        <span title="${_('Changeset status')}" class="changeset-status-lbl">[${h.changeset_status_lbl(c.statuses[0])}]</span>

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="diff-actions">

			




	
	
	
		
 
                  <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}"  class="tooltip" title="${h.tooltip(_('Raw diff'))}">

			




	
	
	
		
 
                      <i class="icon-diff"></i>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                  <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}"  class="tooltip" title="${h.tooltip(_('Patch diff'))}">

			




	
	
	
		
 
                      <i class="icon-file-powerpoint"></i>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                  <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}">

			




	
	
	
		
 
                      <i class="icon-floppy"></i>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                  ${c.ignorews_url(request.GET)}

			




	
	
	
		
 
                  ${c.context_url(request.GET)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="comments-number" style="float:right;padding-right:5px">

			




	
	
	
		
 
                    ${comment.comment_count(c.inline_cnt, len(c.comments))}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="changeset_content">

			




	
	
	
		
 
            <div class="container">

			




	
	
	
		
 

			




	
	
	
		
 
                <div class="right">

			




	
	
	
		
 
                    <div class="changes">

			




	
	
	
		
 
                        % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff:

			




	
	
	
		
 
                         <span class="removed" title="${_('Removed')}">${len(c.changeset.removed)}</span>

			




	
	
	
		
 
                         <span class="changed" title="${_('Changed')}">${len(c.changeset.changed)}</span>

			




	
	
	
		
 
                         <span class="added" title="${_('Added')}">${len(c.changeset.added)}</span>

			




	
	
	
		
 
                        % else:

			




	
	
	
		
 
                         <span class="removed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                         <span class="changed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                         <span class="added"   title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                        % endif

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 

			




	
	
	
		
 
                    <span class="logtags">

			




	
	
	
		
 
                        %if len(c.changeset.parents)>1:

			




	
	
	
		
 
                        <span class="merge">${_('merge')}</span>

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 

			




	
	
	
		
 
                        %if h.is_hg(c.db_repo_scm_instance):

			




	
	
	
		
 
                          %for book in c.changeset.bookmarks:

			




	
	
	
		
 
                          <span class="booktag" title="${_('Bookmark %s') % book}">

			




	
	
	
		
 
                             ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}

			




	
	
	
		
 
                          </span>

			




	
	
	
		
 
                          %endfor

			




	
	
	
		
 
                        %endif

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_file_comment.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
## usage:

			




	
	
	
		
 
## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
## ${comment.comment_block(co)}

			




	
	
	
		
 
##

			




	
	
	
		
 
<%def name="comment_block(co)">

			




	
	
	
		
 
  <div class="comment" id="comment-${co.comment_id}" line="${co.line_no}">

			




	
	
	
		
 
    <div class="comment-wrapp">

			




	
	
	
		
 
      <div class="meta">

			




	
	
	
		
 
          <div style="float:left">

			




	
	
	
		
 
               ${h.gravatar(co.author.email, size=20)}

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="user">

			




	
	
	
		
 
              ${co.author.username_and_name}

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="date">

			




	
	
	
		
 
              ${h.age(co.modified_at)}

			




	
	
	
		
 
          </div>

			




	
	
	
		
 

			




	
	
	
		
 
       <div style="float:left;padding:4px 0px 0px 5px">

			




	
	
	
		
 
        <span class="">

			




	
	
	
		
 
         %if co.pull_request:

			




	
	
	
		
 
            %if co.status_change:

			




	
	
	
		
 
              ${_('Status change from pull request')}

			




	
	
	
		
 
              <a href="${co.pull_request.url()}">"${co.pull_request.title or _("No title")}"</a>:

			




	
	
	
		
 
            %else:

			




	
	
	
		
 
              ${_('Comment from pull request')}

			




	
	
	
		
 
              <a href="${co.pull_request.url()}">"${co.pull_request.title or _("No title")}"</a>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
         %else:

			




	
	
	
		
 
            %if co.status_change:

			




	
	
	
		
 
              ${_('Status change on changeset')}:

			




	
	
	
		
 
            %else:

			




	
	
	
		
 
              ${_('Comment on changeset')}

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
         %endif

			




	
	
	
		
 
        </span>

			




	
	
	
		
 
       </div>

			




	
	
	
		
 

			




	
	
	
		
 
        %if co.status_change:

			




	
	
	
		
 
           <div  style="float:left" class="changeset-status-container">

			




	
	
	
		
 
             <div style="float:left;padding:10px 2px 0px 2px"></div>

			




	
	
	
		
 
             <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change[0].status_lbl}</div>

			




	
	
	
		
 
             <div class="changeset-status-ico"><i class="icon-circle changeset-status-${co.status_change[0].status}"></i></div>

			




	
	
	
		
 
             <span title="${_('Changeset status')}" class="changeset-status-lbl">${_("Status change")}: ${co.status_change[0].status_lbl}</span>

			




	
	
	
		
 
             <span class="changeset-status-ico"><i class="icon-circle changeset-status-${co.status_change[0].status}"></i></span>

			




	
	
	
		
 
           </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 

			




	
	
	
		
 
      <a class="permalink" href="#comment-${co.comment_id}">&para;</a>

			




	
	
	
		
 
      %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or co.author.user_id == c.authuser.user_id:

			




	
	
	
		
 
          <div onClick="confirm('${_("Delete comment?")}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-mini">${_('Delete')}</div>

			




	
	
	
		
 
      %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="text">

			




	
	
	
		
 
        %if co.text:

			




	
	
	
		
 
          ${h.rst_w_mentions(co.text)|n}

			




	
	
	
		
 
        %else:

			




	
	
	
		
 
          <div class="rst-block automatic-comment">

			




	
	
	
		
 
            <p>${_('No comments.')}</p>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="comment_inline_form()">

			




	
	
	
		
 
<div id='comment-inline-form-template' style="display:none">

			




	
	
	
		
 
  <div class="comment-inline-form ac">

			




	
	
	
		
 
  %if c.authuser.username != 'default':

			




	
	
	
		
 
    ${h.form('#', class_='inline-form')}

			




	
	
	
		
 
      <div id="edit-container_{1}" class="clearfix">

			




	
	
	
		
 
        <div class="comment-help">${_('Commenting on line {1}.')}

			




	
	
	
		
 
          ${(_('Comments parsed using %s syntax with %s support.') % (

			




	
	
	
		
 
                 ('<a href="%s">RST</a>' % h.url('rst_help')),

			




	
	
	
		
 
                   ('<span style="color:#577632" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to notify another user'))

			




	
	
	
		
 
               )

			




	
	
	
		
 
            )|n

			




	
	
	
		
 
           }

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="mentions-container" id="mentions_container_{1}"></div>

			




	
	
	
		
 
        <textarea id="text_{1}" name="text" class="comment-block-ta yui-ac-input"></textarea>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div id="preview-container_{1}" class="clearfix" style="display:none">

			




	
	
	
		
 
        <div class="comment-help">

			




	
	
	
		
 
            ${_('Comment preview')}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="preview-box_{1}" class="preview-box"></div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="comment-button">

			




	
	
	
		
 
        <div class="submitting-overlay">${_('Submitting ...')}</div>

			




	
	
	
		
 
        <input type="hidden" name="f_path" value="{0}">

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -31,105 +31,104 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
              (${_('Closed')})

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div id="pr-summary" class="fields">

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="field pr-not-edit" style="min-height:37px">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
            <label>${_('Description')}:</label>

			




	
	
	
		
 
            %if editable:

			




	
	
	
		
 
            <div style="margin: 5px">

			




	
	
	
		
 
              <a class="btn btn-small" onclick="YUD.setStyle('pr-edit-form','display','');YUD.setStyle(YUD.getElementsByClassName('pr-not-edit'),'display','none')">${_("Edit")}</a>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
            <div style="white-space:pre-wrap; line-height: 14px">${h.urlify_commit(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        %if editable:

			




	
	
	
		
 
        <div id="pr-edit-form" style="display:none">

			




	
	
	
		
 
          <div class="field">

			




	
	
	
		
 
              <div class="label-summary">

			




	
	
	
		
 
                  <label for="pullrequest_title">${_('Title')}:</label>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="input">

			




	
	
	
		
 
                  ${h.text('pullrequest_title',class_="large",value=c.pull_request.title,placeholder=_('Summarize the changes'))}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 

			




	
	
	
		
 
          <div class="field">

			




	
	
	
		
 
              <div class="label-summary label-textarea">

			




	
	
	
		
 
                  <label for="pullrequest_desc">${_('Description')}:</label>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="textarea text-area editor">

			




	
	
	
		
 
                  ${h.textarea('pullrequest_desc',size=30,content=c.pull_request.description,placeholder=_('Write a short description on this pull request'))}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Reviewer voting result')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
            <div class="changeset-status-container" style="float:none;clear:both">

			




	
	
	
		
 
            %if c.current_voting_result:

			




	
	
	
		
 
              <div class="changeset-status-ico" style="padding:0px 4px 0px 0px">

			




	
	
	
		
 
                  <i class="icon-circle changeset-status-${c.current_voting_result}" title="${_('Pull request status calculated from votes')}"></i></div>

			




	
	
	
		
 
              <div class="changeset-status-lbl tooltip" title="${_('Pull request status calculated from votes')}">

			




	
	
	
		
 
              <span class="changeset-status-ico" style="padding:0px 4px 0px 0px">

			




	
	
	
		
 
                  <i class="icon-circle changeset-status-${c.current_voting_result}" title="${_('Pull request status calculated from votes')}"></i></span>

			




	
	
	
		
 
              <span 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_voting_result)}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 

			




	
	
	
		
 
              </span>

			




	
	
	
		
 
            %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>

			




	
	
	
		
 
            % elif len(c.pull_request_reviewers) > 0:

			




	
	
	
		
 
                <div>${_('Pull request was reviewed by all reviewers')}</div>

			




	
	
	
		
 
            %else:

			




	
	
	
		
 
                <div>${_('There are no reviewers')}</div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Origin')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
            <div>

			




	
	
	
		
 
              ${h.link_to_ref(c.pull_request.org_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)}

			




	
	
	
		
 
              %if c.cs_ref_type != 'branch':

			




	
	
	
		
 
                ${_('on')} ${h.link_to_ref(c.pull_request.org_repo.repo_name, 'branch', c.cs_branch_name)}

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Target')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
              ${h.link_to_ref(c.pull_request.other_repo.repo_name, c.a_ref_type, c.a_ref_name)}

			




	
	
	
		
 
              ## we don't know other rev - c.a_rev is ancestor and not necessarily on other_name_branch branch

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="field">

			




	
	
	
		
 
          <div class="label-summary">

			




	
	
	
		
 
              <label>${_('Pull changes')}:</label>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
              <div>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.