Changeset - 8854ddd51b48
Parent rev.
Child rev.
[Not reviewed]
beta
0 1 0
Mads Kiilerich - 13 years ago 2013-04-08 23:34:02
madski@unity3d.com
pullrequests: reorganize PR creation page - make it more like the view page
1 file changed with 53 insertions and 33 deletions:
rhodecode/templates/pullrequests/pullrequest.html
53
33
0 comments (0 inline, 0 general)
rhodecode/templates/pullrequests/pullrequest.html
➞
Show inline comments
 
@@ -19,8 +19,39 @@ ${self.context_bar('showpullrequest')}
 
    <div class="title">
 
        ${self.breadcrumbs()}
 
    </div>
 

			




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

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    <h3>${_('Create new pull request')}</h3>

			




	
	
	
		
 

			




	
	
	
		
 
    <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',size=30)}

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="label label-textarea">

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
        ##ORG

			




	
	
	
		
 
        <div style="float:left">

			




	
	
	
		
 
            <div>

			




	
	
		
 
@@ -29,7 +60,6 @@ ${self.context_bar('showpullrequest')}

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
                 <div style="padding:5px 3px 3px 20px;">${c.rhodecode_db_repo.description}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="clear:both;padding-top: 10px"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
          <div style="float:left;font-size:24px;padding:0px 20px">

			




	
	
	
		
 
          <img height=32 width=32 src="${h.url('/images/arrow_right_64.png')}"/>

			




	
	
		
 
@@ -43,15 +73,21 @@ ${self.context_bar('showpullrequest')}

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
                 <div id="other_repo_desc" style="padding:5px 3px 3px 20px;"></div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="clear:both;padding-top: 10px"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
       <div style="clear:both;padding-top: 10px"></div>

			




	
	
	
		
 
       ## overview pulled by ajax

			




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

			




	
	
	
		
 
       <div style="float:left;clear:both;padding:10px 10px 10px 0px;display:none">

			




	
	
	
		
 
            <a id="pull_request_overview_url" href="#">${_('Detailed compare view')}</a>

			




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

			




	
	
	
		
 
       </div>

			




	
	
	
		
 
     </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="buttons">

			




	
	
	
		
 
                    ${h.submit('save',_('Send pull request'),class_="ui-btn large")}

			




	
	
	
		
 
                    ${h.reset('reset',_('Reset'),class_="ui-btn large")}

			




	
	
	
		
 
               </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        ## Reviewers

			




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

			




	
	
	
		
 
        <h4>${_('Pull request reviewers')}</h4>

			




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

			




	
	
		
 
@@ -80,37 +116,21 @@ ${self.context_bar('showpullrequest')}

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <h3>${_('Create new pull request')}</h3>

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="form">

			




	
	
	
		
 
        <!-- fields -->

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="fields">

			




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

			




	
	
	
		
 

			




	
	
	
		
 
             <div class="field">

			




	
	
	
		
 
                <div class="label">

			




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

			




	
	
	
		
 
        <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 style="float:left;clear:both;padding:10px 10px 10px 0px;display:none">

			




	
	
	
		
 
                <a id="pull_request_overview_url" href="#">${_('Detailed compare view')}</a>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input">

			




	
	
	
		
 
                    ${h.text('pullrequest_title',size=30)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
        <div style="clear:both;"></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)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="buttons">

			




	
	
	
		
 
                ${h.submit('save',_('Send pull request'),class_="ui-btn large")}

			




	
	
	
		
 
                ${h.reset('reset',_('Reset'),class_="ui-btn large")}

			




	
	
	
		
 
           </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    ${h.end_form()}

			




	
	
	
		
 

			




	
	
	
		
 
</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.