Changeset - f460139aa6d6
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
domruf - 8 years ago 2018-03-11 12:20:29
dominikruf@gmail.com
Grafted from: 5b98427cfd66
pullrequests: fix position of edit button

The edit button belongs to the label, so lets put it there.
We then do't need the #pr-edit-btn style any more.
2 files changed with 2 insertions and 5 deletions:
kallithea/public/less/style.less
4
kallithea/templates/pullrequests/pullrequest_show.html
2
1
0 comments (0 inline, 0 general)
kallithea/public/less/style.less
➞
Show inline comments
 
@@ -568,196 +568,192 @@ div.form div.buttons {
 
.comments-number {
 
  padding: 10px 0;
 
  color: #666;
 
}
 
.automatic-comment {
 
  font-style: italic;
 
}
 
/** comment form **/
 
.status-block {
 
  margin: 5px;
 
  clear: both;
 
}
 
.panel-heading .pull-left input[type=checkbox],
 
.panel-heading .pull-right input[type=checkbox] {
 
  position: relative;
 
  top: 4px;
 
  margin: -10px 2px 0;
 
}
 
/** comment inline form **/
 
.comment-inlines textarea {
 
  font-family: @font-family-monospace;
 
}
 
/** comment inline **/
 
.inline-comments {
 
  padding: 5px;
 
}
 
.inline-comments .comments-number {
 
  padding: 0px 0px 10px 0px;
 
}
 
input.status_change_checkbox,
 
input.status_change_radio {
 
  margin: 0 0 5px 15px;
 
}
 
@keyframes animated-comment-background {
 
  0% {
 
    background-position: 0 0;
 
  }
 
  100% {
 
    background-position: 20px 0;
 
  }
 
}
 
.comment-preview.failed .user,
 
.comment-preview.failed .panel-body {
 
  color: #666;
 
}
 
.comment-preview .comment-submission-status {
 
  float: right;
 
}
 
.comment-preview .comment-submission-status .btn-group {
 
  margin-left: 10px;
 
}
 
.comment-preview.submitting .panel-body {
 
  background-image: linear-gradient(-45deg, #FAFAFA, #FAFAFA 25%, #FFF 25%, #FFF 50%, #FAFAFA 50%, #FAFAFA 75%, #FFF 75%, #FFF 100%);
 
  background-size: 20px 20px;
 
  animation: animated-comment-background 0.4s linear infinite;
 
}
 
/****
 
PULL REQUESTS
 
*****/
 
div.pr-details-title.closed {
 
  color: #555;
 
  background: #eee;
 
}
 
div.pr {
 
  margin: 0px 15px;
 
  padding: 4px 4px;
 
}
 
tr.pr-closed td {
 
  background-color: #eee !important;
 
  color: #555 !important;
 
}
 
span.pr-closed-tag {
 
  margin-bottom: 1px;
 
  margin-right: 1px;
 
  padding: 1px 3px;
 
  font-size: 10px;
 
  color: @kallithea-theme-main-color;
 
  white-space: nowrap;
 
  border-radius: 4px;
 
  border: 1px solid #d9e8f8;
 
  line-height: 1.5em;
 
}
 
.panel-body .pr-box {
 
  max-width: 978px;
 
  margin-right: 15px;
 
}
 
#s2id_org_ref,
 
#s2id_other_ref,
 
#s2id_org_repo,
 
#s2id_other_repo {
 
  min-width: 150px;
 
  margin: 5px;
 
}
 
#pr-summary > .pr-not-edit {
 
  min-height: 50px !important;
 
}
 
#pr-edit-btn {
 
  margin: 20px 0 0 !important;
 
  position: absolute;
 
}
 
/* make 'next iteration' changeset table smaller and scrollable */
 
#pr-summary #updaterevs {
 
  max-height: 200px;
 
  overflow-y: auto;
 
  overflow-x: hidden;
 
}
 

			




	
	
	
		
 
/****

			




	
	
	
		
 
  PERMS

			




	
	
	
		
 
*****/

			




	
	
	
		
 
.perm-gravatar-ac {

			




	
	
	
		
 
  vertical-align: middle;

			




	
	
	
		
 
  padding: 2px;

			




	
	
	
		
 
  width: 14px;

			




	
	
	
		
 
  height: 14px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* avoid gaps between the navbar and browser */

			




	
	
	
		
 
.navbar.mainmenu {

			




	
	
	
		
 
  border-top-left-radius: 0;

			




	
	
	
		
 
  border-top-right-radius: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 
.navbar.footer {

			




	
	
	
		
 
  border-bottom-left-radius: 0;

			




	
	
	
		
 
  border-bottom-right-radius: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* show some context of link targets - but only works when the link target

			




	
	
	
		
 
   can be extended with any visual difference */

			




	
	
	
		
 
div.comment:target:before {

			




	
	
	
		
 
  display: block;

			




	
	
	
		
 
  height: 100px;

			




	
	
	
		
 
  margin: -100px 0 0;

			




	
	
	
		
 
  content: "";

			




	
	
	
		
 
}

			




	
	
	
		
 
div.comment:target > .panel {

			




	
	
	
		
 
  border: solid 2px #ee0 !important;

			




	
	
	
		
 
}

			




	
	
	
		
 
.lineno:target a {

			




	
	
	
		
 
  border: solid 2px #ee0 !important;

			




	
	
	
		
 
  margin: -2px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.btn-image-diff-show,

			




	
	
	
		
 
.btn-image-diff-swap {

			




	
	
	
		
 
  margin: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.img-diff {

			




	
	
	
		
 
  max-width: 45%;

			




	
	
	
		
 
  height: auto;

			




	
	
	
		
 
  margin: 5px;

			




	
	
	
		
 
  /* http://lea.verou.me/demos/css3-patterns.html */

			




	
	
	
		
 
  background-image: linear-gradient(45deg, #888 25%, transparent 25%, transparent), linear-gradient(-45deg, #888 25%, transparent 25%, transparent), linear-gradient(45deg, transparent 75%, #888 75%), linear-gradient(-45deg, transparent 75%, #888 75%);

			




	
	
	
		
 
  background-size: 10px 10px;

			




	
	
	
		
 
  background-color: #999;

			




	
	
	
		
 
}

			




	
	
	
		
 
.img-preview {

			




	
	
	
		
 
  max-width: 100%;

			




	
	
	
		
 
  height: auto;

			




	
	
	
		
 
  margin: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.comment-prev-next-links div.prev-comment,

			




	
	
	
		
 
div.comment-prev-next-links div.next-comment {

			




	
	
	
		
 
  display: inline-block;

			




	
	
	
		
 
  min-width: 150px;

			




	
	
	
		
 
  margin: 3px 6px;

			




	
	
	
		
 
}

			




	
	
	
		
 
#comments-general-comments div.comment-prev-next-links div.prev-comment,

			




	
	
	
		
 
#comments-general-comments div.comment-prev-next-links div.next-comment {

			




	
	
	
		
 
  margin-left: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* changelog graph */

			




	
	
	
		
 
#graph_nodes,

			




	
	
	
		
 
#updaterevs-graph {

			




	
	
	
		
 
  .make-xs-column(1);

			




	
	
	
		
 
}

			




	
	
	
		
 
#graph_content,

			




	
	
	
		
 
#graph_content_pr,

			




	
	
	
		
 
#updaterevs-table {

			




	
	
	
		
 
  .make-xs-column(11);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/* repo table icons */

			




	
	
	
		
 
#repos_list_wrap_wrapper {

			




	
	
	
		
 
  /* make icon-folder and repotag the same width */

			




	
	
	
		
 
  .icon-folder:before {

			




	
	
	
		
 
    margin: 0; // default margin would otherwise add to the total width

			




	
	
	
		
 
    width: 24px;

			




	
	
	
		
 
    text-align: left;

			




	
	
	
		
 
  }

			




	
	
	
		
 
  .label-repo {

			




	
	
	
		
 
    display: inline-block;

			




	
	
	
		
 
    width: 24px;

			




	
	
	
		
 
  }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="title">

			




	
	
	
		
 
    ${_('%s Pull Request %s') % (c.repo_name, c.pull_request.nice_id())}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Pull request %s from %s#%s') % (c.pull_request.nice_id(), c.pull_request.org_repo.repo_name, c.cs_branch_name)}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="header_menu">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<% editable = not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionLevel('admin')(c.repo_name) or c.pull_request.owner_id == request.authuser.user_id) %>

			




	
	
	
		
 
${self.repo_context_bar('showpullrequest')}

			




	
	
	
		
 
<div class="panel panel-primary">

			




	
	
	
		
 
  <div class="panel-heading clearfix">

			




	
	
	
		
 
    ${self.breadcrumbs()}

			




	
	
	
		
 
  </div>

			




	
	
	
		
 

			




	
	
	
		
 
  ${h.form(url('pullrequest_post', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), method='post', id='pull_request_form',class_='panel-body')}

			




	
	
	
		
 
    <div class="form pr-box pull-left">

			




	
	
	
		
 
      <div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}">

			




	
	
	
		
 
        <h3>

			




	
	
	
		
 
          ${_('Title')}: ${c.pull_request.title}

			




	
	
	
		
 
          %if c.pull_request.is_closed():

			




	
	
	
		
 
              (${_('Closed')})

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </h3>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div id="pr-summary">

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="pr-not-edit form-group">

			




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

			




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

			




	
	
	
		
 
            %if editable:

			




	
	
	
		
 
            <div id="pr-edit-btn">

			




	
	
	
		
 
              <a class="btn btn-default btn-xs" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            </label>

			




	
	
	
		
 
            <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>${_('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">

			




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

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
            %if c.is_range:

			




	
	
	
		
 
              ${_("This is just a range of changesets and doesn't have a target or a real merge ancestor.")}

			




	
	
	
		
 
            %else:

			




	
	
	
		
 
              ${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

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="form-group">

			




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

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
            %if c.cs_ranges:

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
               ## TODO: use cs_ranges[-1] or org_ref_parts[1] in both cases?

			




	
	
	
		
 
               %if h.is_hg(c.pull_request.org_repo):

			




	
	
	
		
 
                 <span>hg pull ${c.pull_request.org_repo.clone_url()} -r ${h.short_id(c.cs_ranges[-1].raw_id)}</span>

			




	
	
	
		
 
               %elif h.is_git(c.pull_request.org_repo):

			




	
	
	
		
 
                 <span>git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]}</span>

			




	
	
	
		
 
               %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="form-group">

			




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

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
              <div>${h.fmt_date(c.pull_request.created_on)}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="form-group">

			




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

			




	
	
	
		
 
          <div class="pr-not-edit">

			




	
	
	
		
 
                  ${h.gravatar_div(c.pull_request.owner.email, size=20)}

			




	
	
	
		
 
                  <span>${c.pull_request.owner.full_name_and_username}</span><br/>

			




	
	
	
		
 
                  <span><a href="mailto:${c.pull_request.owner.email}">${c.pull_request.owner.email}</a></span><br/>

			




	
	
	
		
 
          </div>

			




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

			




	
	
	
		
 
               ${h.text('owner', class_='form-control', value=c.pull_request.owner.username, placeholder=_('Type name of user'))}

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="form-group">

			




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

			




	
	
	
		
 
            <div>

			




	
	
	
		
 
              <p>${c.update_msg}</p>

			




	
	
	
		
 
              %if c.avail_revs:

			




	
	
	
		
 
              <div id="updaterevs" class="clearfix">

			




        

    



    


    



    



      

      





    
    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.