Changeset - a3a2dc51f0d6
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
domruf - 9 years ago 2016-10-19 23:36:01
dominikruf@gmail.com
Grafted from: e4160a1fd1d9
pullrequest: avoid unnecessary text

Less text is easier/fast to read.
2 files changed with 4 insertions and 4 deletions:
kallithea/templates/changeset/changeset_file_comment.html
2
2
kallithea/templates/pullrequests/pullrequest_show.html
2
2
0 comments (0 inline, 0 general)
kallithea/templates/changeset/changeset_file_comment.html
➞
Show inline comments
 
@@ -61,50 +61,50 @@
 
          </span>
 

			




	
	
	
		
 
          <span class="comment-submission-status">

			




	
	
	
		
 
              ${_('Submitting ...')}

			




	
	
	
		
 
          </span>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="panel-body">

			




	
	
	
		
 
           <div class="automatic-comment" style="display: none;">

			




	
	
	
		
 
             <p>

			




	
	
	
		
 
               ${_("Status change")}: <span class="comment-status-label"></span>

			




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

			




	
	
	
		
 
             </p>

			




	
	
	
		
 
           </div>

			




	
	
	
		
 
           <div class="comment-text">

			




	
	
	
		
 
             <div class="formatted-fixed">

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
           </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
  <div class="ac">

			




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

			




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

			




	
	
	
		
 
      <div class="well well-sm clearfix">

			




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

			




	
	
	
		
 
          <span class="text-muted">${_('Comments are in plain text. Use @username inside this text to notify another user.')|n}</span>

			




	
	
	
		
 
        <div class="comment-help">

			




	
	
	
		
 
          <span class="text-muted">${_('Comments are in plain text. Use @username to notify another user.')|n}</span>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <textarea name="text" class="form-control comment-block-ta yui-ac-input"></textarea>

			




	
	
	
		
 

			




	
	
	
		
 
        <div id="status_block_container" class="status-block general-only hidden">

			




	
	
	
		
 
                %if c.pull_request is None:

			




	
	
	
		
 
                  ${_('Set changeset status')}:

			




	
	
	
		
 
                %else:

			




	
	
	
		
 
                  ${_('Vote for pull request status')}:

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                <span class="general-only cs-only">

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
                <label class="radio-inline">

			




	
	
	
		
 
                    <input type="radio" class="status_change_radio" name="changeset_status" id="changeset_status_unchanged" value="" checked="checked" />

			




	
	
	
		
 
                    ${_('No change')}

			




	
	
	
		
 
                </label>

			




	
	
	
		
 
                %for status, lbl in c.changeset_statuses:

			




	
	
	
		
 
                    <label class="radio-inline">

			




	
	
	
		
 
                        <input type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">

			




	
	
	
		
 
                        ${lbl}<i class="icon-circle changeset-status-${status}"></i>

			




	
	
	
		
 
                    </label>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 

			




	
	
	
		
 
                %if c.pull_request is not None and ( \

			




	
	
	
		
 
                    h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionLevel('admin')(c.repo_name) \

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -42,49 +42,49 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            <div>

			




	
	
	
		
 
              <div class="formatted-fixed">${h.urlify_text(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        %if editable:

			




	
	
	
		
 
        <div class="pr-do-edit form-group" style="display:none">

			




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

			




	
	
	
		
 
              <div>

			




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

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="pr-do-edit form-group" style="display:none">

			




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

			




	
	
	
		
 
              <div>

			




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

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="form-group">

			




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

			




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

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
            %if c.current_voting_result:

			




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

			




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

			




	
	
	
		
 
                %if c.pull_request.is_closed():

			




	
	
	
		
 
                    ${_('Closed')},

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                ${h.changeset_status_lbl(c.current_voting_result)}

			




	
	
	
		
 
              </span>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="form-group">

			




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

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
            <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="form-group">

			




	
	
		
 
@@ -172,49 +172,49 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                  %endfor

			




	
	
	
		
 
                </table>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="alert alert-info">${_("Pull request iterations do not change content once created. Select a revision to create a new iteration.")}</div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              %if c.update_msg_other:

			




	
	
	
		
 
                <div class="alert alert-info">${c.update_msg_other}</div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        %if editable:

			




	
	
	
		
 
        <div class="form-group">

			




	
	
	
		
 
          <div class="buttons">

			




	
	
	
		
 
            ${h.submit('pr-form-save',_('Save Changes'),class_="btn btn-default btn-sm")}

			




	
	
	
		
 
            ${h.submit('pr-form-clone',_('Create New Iteration with Changes'),class_="btn btn-default btn-sm",disabled='disabled')}

			




	
	
	
		
 
            ${h.reset('pr-form-reset',_('Cancel Changes'),class_="btn btn-default btn-sm")}

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    ## REVIEWERS

			




	
	
	
		
 
    <div class="pull-left">

			




	
	
	
		
 
        <h4 class="pr-details-title">${_('Pull Request Reviewers')}</h4>

			




	
	
	
		
 
        <h4 class="pr-details-title">${_('Reviewers')}</h4>

			




	
	
	
		
 
        <div id="reviewers">

			




	
	
	
		
 
          ## members goes here !

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
            %for member,status in c.pull_request_reviewers:

			




	
	
	
		
 
              <input type="hidden" value="${member.user_id}" name="org_review_members" />

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            <ul id="review_members" class="list-unstyled">

			




	
	
	
		
 
            %for member,status in c.pull_request_reviewers:

			




	
	
	
		
 
              ## WARNING: the HTML below is duplicate with

			




	
	
	
		
 
              ## kallithea/public/js/base.js

			




	
	
	
		
 
              ## If you change something here it should be reflected in the template too.

			




	
	
	
		
 
              <li id="reviewer_${member.user_id}">

			




	
	
	
		
 
                <span class="reviewers_member">

			




	
	
	
		
 
                  <input type="hidden" value="${member.user_id}" name="review_members" />

			




	
	
	
		
 
                  <span class="reviewer_status" data-toggle="tooltip" title="${h.changeset_status_lbl(status)}">

			




	
	
	
		
 
                      <i class="icon-circle changeset-status-${status}"></i>

			




	
	
	
		
 
                  </span>

			




	
	
	
		
 
                  ${h.gravatar(member.email, size=14)}

			




	
	
	
		
 
                  <span>

			




	
	
	
		
 
                    ${member.full_name_and_username}

			




	
	
	
		
 
                    %if c.pull_request.owner_id == member.user_id:

			




	
	
	
		
 
                      (${_('Owner')})

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                  </span>

			




        

    



    


    



    



      

      





    
    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.