Changeset - 486cd40776c2
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 11 years ago 2014-07-18 18:44:54
madski@unity3d.com
pull requests: use html placeholders for hints in input fields
3 files changed with 5 insertions and 8 deletions:
kallithea/public/css/style.css
1
1
kallithea/templates/pullrequests/pullrequest.html
3
5
kallithea/templates/pullrequests/pullrequest_show.html
1
2
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -1381,49 +1381,49 @@ input.disabled {
 
    border-right: 1px solid #404040;
 
    border-bottom: 1px solid #404040;
 
    color: #000;
 
    margin: 0;
 
    padding: 4px 8px;
 
}
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.textarea {

			




	
	
	
		
 
    border-top: 1px solid #b3b3b3;

			




	
	
	
		
 
    border-left: 1px solid #b3b3b3;

			




	
	
	
		
 
    border-right: 1px solid #eaeaea;

			




	
	
	
		
 
    border-bottom: 1px solid #eaeaea;

			




	
	
	
		
 
    margin: 0 0 0 200px;

			




	
	
	
		
 
    padding: 7px 7px 6px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.textarea-editor {

			




	
	
	
		
 
    border: 1px solid #ddd;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.textarea textarea {

			




	
	
	
		
 
    width: 100%;

			




	
	
	
		
 
    height: 220px;

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
    overflow-y: auto;

			




	
	
	
		
 
    background: #FFF;

			




	
	
	
		
 
    color: #000;

			




	
	
	
		
 
    font-size: 12px;

			




	
	
	
		
 
    outline: none;

			




	
	
	
		
 
    border-width: 0;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box-left div.form div.fields div.field div.textarea textarea, #content div.box-right div.form div.fields div.field div.textarea textarea {

			




	
	
	
		
 
    width: 100%;

			




	
	
	
		
 
    height: 100px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.textarea table {

			




	
	
	
		
 
    width: 100%;

			




	
	
	
		
 
    border: none;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.textarea table td {

			




	
	
	
		
 
    background: #DDD;

			




	
	
	
		
 
    border: none;

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -10,59 +10,58 @@

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('showpullrequest')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}

			




	
	
	
		
 
    <div class="form">

			




	
	
	
		
 
        <!-- fields -->

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="fields" style="float:left;width:50%;padding-right:30px;">

			




	
	
	
		
 

			




	
	
	
		
 
             <div class="field">

			




	
	
	
		
 
                <div class="label">

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
                    ${h.text('pullrequest_title', class_="large")}

			




	
	
	
		
 
                    ${h.text('pullrequest_title',class_="large",placeholder=_('Summarize the changes - or leave empty'))}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
             </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="label label-textarea">

			




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

			




	
	
	
		
 
                </div>

			




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

			




	
	
	
		
 
                    ${h.textarea('pullrequest_desc',size=30, style="height:100px")}

			




	
	
	
		
 
                    <span class="help-block">${_('Write a short description on this pull request')}</span>

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="label label-textarea">

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
                    ##ORG

			




	
	
	
		
 
                    <div>

			




	
	
	
		
 
                        <div>

			




	
	
	
		
 
                            <div style="padding:5px 3px 3px 3px;">

			




	
	
	
		
 
                            <b>${_('Origin repository')}:</b> ${c.db_repo.description}

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                            <div>

			




	
	
	
		
 
                            ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')}

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                            <div style="padding:5px 3px 3px 3px;">

			




	
	
	
		
 
                            <b>${_('Revision')}:</b> <span id="org_rev_span">-</span>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 

			




	
	
	
		
 
                    ##OTHER, most Probably the PARENT OF THIS FORK

			




	
	
		
 
@@ -95,50 +94,49 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
        ## Reviewers

			




	
	
	
		
 
        <div style="float:left; border-left:1px dashed #eee">

			




	
	
	
		
 
            <div class="pr-details-title">${_('Pull request reviewers')}</div>

			




	
	
	
		
 
            <div id="reviewers" style="padding:0px 0px 0px 15px">

			




	
	
	
		
 
              ## members goes here !

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
                <ul id="review_members" class="group_members">

			




	
	
	
		
 
                %for member in [c.default_other_repo_info['user']]:

			




	
	
	
		
 
                  <li id="reviewer_${member['user_id']}">

			




	
	
	
		
 
                    <div class="reviewers_member">

			




	
	
	
		
 
                      <div class="gravatar"><img alt="gravatar" src="${member['gravatar_link']}"/> </div>

			




	
	
	
		
 
                      <div style="float:left">${member['firstname']} ${member['lastname']} (${_('owner')})</div>

			




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

			




	
	
	
		
 
                      <span class="action_button" style="padding: 3px" onclick="removeReviewMember(${member['user_id']})" title="${_('Remove reviewer')}>

			




	
	
	
		
 
                          <i class="icon-remove-sign" style="color: #FF4444;"></i>

			




	
	
	
		
 
                      </span>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                  </li>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </ul>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 

			




	
	
	
		
 
              <div class='ac'>

			




	
	
	
		
 
                <div class="reviewer_ac">

			




	
	
	
		
 
                   ${h.text('user', class_='yui-ac-input')}

			




	
	
	
		
 
                   <span class="help-block">${_('Add reviewer to this pull request.')}</span>

			




	
	
	
		
 
                   ${h.text('user', class_='yui-ac-input',placeholder=_('Type name of reviewer to add'))}

			




	
	
	
		
 
                   <div id="reviewers_container"></div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div style="clear:both;padding: 0 0 30px 0;"></div>

			




	
	
	
		
 

			




	
	
	
		
 
        <h4>${_('Changesets')}</h4>

			




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

			




	
	
	
		
 
           ## overview pulled by ajax

			




	
	
	
		
 
           <div style="float:left" id="pull_request_overview"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div style="clear:both;"></div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<script type="text/javascript">

			




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

			




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

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
            <ul id="review_members" class="group_members">

			




	
	
	
		
 
            %for member,status in c.pull_request_reviewers:

			




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

			




	
	
	
		
 
                <div class="reviewers_member">

			




	
	
	
		
 
                    <div class="reviewer_status 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="reviewer_gravatar gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>

			




	
	
	
		
 
                  <div style="float:left;">${member.full_name} (${_('owner') if c.pull_request.user_id == member.user_id else _('reviewer')})</div>

			




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

			




	
	
	
		
 
                  %if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.user_id == c.authuser.user_id):

			




	
	
	
		
 
                  <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">

			




	
	
	
		
 
                      <i class="icon-remove-sign" style="color: #FF4444;"></i>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
              </li>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </ul>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          %if not c.pull_request.is_closed():

			




	
	
	
		
 
          <div class='ac'>

			




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

			




	
	
	
		
 
            <div class="reviewer_ac">

			




	
	
	
		
 
               ${h.text('user', class_='yui-ac-input')}

			




	
	
	
		
 
               <span class="help-block">${_('Add or remove reviewer to this pull request.')}</span>

			




	
	
	
		
 
               ${h.text('user', class_='yui-ac-input',placeholder=_('Type name of reviewer to add'))}

			




	
	
	
		
 
               <div id="reviewers_container"></div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="padding:0px 10px">

			




	
	
	
		
 
             <span id="update_pull_request" class="btn btn-mini">${_('Save Changes')}</span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
       </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div style="overflow: auto; clear: both">

			




	
	
	
		
 
      ##DIFF

			




	
	
	
		
 
      <div class="table" style="float:left;clear:none">

			




	
	
	
		
 
          <div class="diffblock">

			




	
	
	
		
 
              <div style="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">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>

			




	
	
	
		
 
              <%include file="/compare/compare_cs.html" />

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    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.