Changeset - 785a9770e8e0
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 9 years ago 2017-01-06 01:43:50
mads@kiilerich.com
templates: textarea doesn't have a size attribute - drop it!

We could use the rows attribute ... but so far it has worked without ...
3 files changed with 3 insertions and 3 deletions:
kallithea/templates/files/files_add.html
1
1
kallithea/templates/pullrequests/pullrequest.html
1
1
kallithea/templates/pullrequests/pullrequest_show.html
1
1
0 comments (0 inline, 0 general)
kallithea/templates/files/files_add.html
➞
Show inline comments
 
<%inherit file="/base/base.html"/>
 

			




	
	
	
		
 
<%block name="title">

			




	
	
	
		
 
    ${_('%s Files Add') % c.repo_name}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="js_extra">

			




	
	
	
		
 
  <script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>

			




	
	
	
		
 
  <script type="text/javascript" src="${h.url('/js/codemirror_loadmode.js')}"></script>

			




	
	
	
		
 
  <script type="text/javascript" src="${h.url('/codemirror/mode/meta.js')}"></script>

			




	
	
	
		
 
</%block>

			




	
	
	
		
 
<%block name="css_extra">

			




	
	
	
		
 
  <link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="header_menu">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Add New File')} @ ${h.show_id(c.cs)}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('files')}

			




	
	
	
		
 
<div class="panel panel-primary">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="panel-heading clearfix">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
            <li>

			




	
	
	
		
 
              <span><a href="#">${_('Branch')}: ${c.cs.branch}</a></span>

			




	
	
	
		
 
            </li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table" id="edit">

			




	
	
	
		
 
        <div id="files_data">

			




	
	
	
		
 
          ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data", class_="form-horizontal form-inline")}

			




	
	
	
		
 
          <h3 class="files_location">

			




	
	
	
		
 
            ${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.f_path)} /

			




	
	
	
		
 
              <span id="filename_container" class="file reviewer_ac">

			




	
	
	
		
 
                  <input class="form-control input-small" type="text" value="" size="30" name="filename" id="filename" placeholder="${_('Enter filename...')}">

			




	
	
	
		
 
                  <input type="hidden" value="${c.f_path}" size="30" name="location" id="location">

			




	
	
	
		
 
                  <input type="hidden" value="${c.f_path}" name="location" id="location">

			




	
	
	
		
 
                  ${_('or')} <div class="btn btn-default btn-sm" id="upload_file_enable">${_('Upload File')}</div>

			




	
	
	
		
 
              </span>

			




	
	
	
		
 
              <span id="upload_file_container" class="reviewer_ac" style="display:none">

			




	
	
	
		
 
                  <input class="form-control" type="file" size="20" name="upload_file" id="upload_file">

			




	
	
	
		
 
                  ${_('or')} <div class="btn btn-default btn-sm" id="file_enable">${_('Create New File')}</div>

			




	
	
	
		
 
              </span>

			




	
	
	
		
 
          </h3>

			




	
	
	
		
 
            <div id="body" class="codeblock">

			




	
	
	
		
 
            <div class="code-header" id="mimetype_header">

			




	
	
	
		
 
                <label class="commit">

			




	
	
	
		
 
                    ${_('New file type')}

			




	
	
	
		
 
                    <select class="form-control" id="mimetype" name="mimetype"></select>

			




	
	
	
		
 
                </label>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
                <div id="editor_container">

			




	
	
	
		
 
                    <pre id="editor_pre"></pre>

			




	
	
	
		
 
                    <textarea id="editor" name="content" style="display:none"></textarea>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div style="padding: 10px;color:#666666">${_('Commit Message')}</div>

			




	
	
	
		
 
                <textarea class="form-control" id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="text-align: left;padding-top: 5px">

			




	
	
	
		
 
            ${h.submit('commit',_('Commit Changes'),class_="btn btn-success btn-sm")}

			




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

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            ${h.end_form()}

			




	
	
	
		
 
            <script type="text/javascript">

			




	
	
	
		
 
                $(document).ready(function(){

			




	
	
	
		
 
                    var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path)}";

			




	
	
	
		
 
                    var myCodeMirror = initCodeMirror('editor', "${request.script_name}", reset_url);

			




	
	
	
		
 

			




	
	
	
		
 
                    //inject new modes, based on codeMirrors modeInfo object

			




	
	
	
		
 
                    var $mimetype_select = $('#mimetype');

			




	
	
	
		
 
                    $mimetype_select.each(function(){

			




	
	
	
		
 
                        var modes_select = this;

			




	
	
	
		
 
                        var index = 1;

			




	
	
	
		
 
                        for(var i=0;i<CodeMirror.modeInfo.length;i++){

			




	
	
	
		
 
                            var m = CodeMirror.modeInfo[i];

			




	
	
	
		
 
                            var opt = new Option(m.name, m.mime);

			




	
	
	
		
 
                            $(opt).attr('mode', m.mode);

			




	
	
	
		
 
                            if (m.mime == 'text/plain') {

			




	
	
	
		
 
                                // default plain text

			




	
	
	
		
 
                                $(opt).prop('selected', true);

			




	
	
	
		
 
                                modes_select.options[0] = opt;

			




	
	
	
		
 
                            } else {

			




	
	
	
		
 
                                modes_select.options[index++] = opt;

			




	
	
	
		
 
                            }

			




	
	
	
		
 
                        }

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="title">

			




	
	
	
		
 
    ${c.repo_name} ${_('New Pull Request')}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('New Pull Request')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="header_menu">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('showpullrequest')}

			




	
	
	
		
 
<div class="panel panel-primary">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="panel-heading clearfix">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




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

			




	
	
	
		
 
    <div class="form">

			




	
	
	
		
 
        <!-- fields -->

			




	
	
	
		
 

			




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

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="form-group">

			




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

			




	
	
	
		
 
                <div>

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="form-group">

			




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

			




	
	
	
		
 
                <div>

			




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

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label">${_('Changeset flow')}:</label>

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ##ORG

			




	
	
	
		
 
                    <div>

			




	
	
	
		
 
                        <div>

			




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

			




	
	
	
		
 
                            <b>${_('Origin repository')}:</b> <span id="org_repo_desc">${c.db_repo.description.split('\n')[0]}</span>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                            <div>

			




	
	
	
		
 
                            ${h.select('org_repo','',c.cs_repos,class_='refs')}:${h.select('org_ref',c.default_cs_ref,c.cs_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

			




	
	
	
		
 
                    <div style="border-top: 1px solid #EEE; margin: 5px 0px 0px 0px">

			




	
	
	
		
 
                        <div>

			




	
	
	
		
 
                            ## filled with JS

			




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

			




	
	
	
		
 
                            <b>${_('Destination repository')}:</b> <span id="other_repo_desc">${c.a_repo.description.split('\n')[0]}</span>

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                            <div>

			




	
	
	
		
 
                            ${h.select('other_repo',c.a_repo.repo_name,c.a_repos,class_='refs')}:${h.select('other_ref',c.default_a_ref,c.a_refs,class_='refs')}

			




	
	
	
		
 
                            </div>

			




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

			




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

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                    </div>

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <div class="buttons">

			




	
	
	
		
 
                    ${h.submit('save',_('Create Pull Request'),class_="btn btn-default")}

			




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

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
        </div>

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -11,97 +11,97 @@

			




	
	
	
		
 
</%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.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.owner_id == c.authuser.user_id) %>

			




	
	
	
		
 
${self.repo_context_bar('showpullrequest')}

			




	
	
	
		
 
<div class="panel panel-primary">

			




	
	
	
		
 
  <!-- box / title -->

			




	
	
	
		
 
  <div class="panel-heading">

			




	
	
	
		
 
    ${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')}

			




	
	
	
		
 
    <div class="form pr-box" style="float: left">

			




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

			




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

			




	
	
	
		
 
          %if c.pull_request.is_closed():

			




	
	
	
		
 
              (${_('Closed')})

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div id="pr-summary" class="form-horizontal">

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="pr-not-edit form-group" style="min-height:47px">

			




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

			




	
	
	
		
 
            %if editable:

			




	
	
	
		
 
            <div style="margin: 20px 0; position: absolute">

			




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

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            <div>

			




	
	
	
		
 
              <div class="form-control 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',size=30,content=c.pull_request.description,placeholder=_('Write a short description on this pull request'),class_='form-control')}

			




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

			




	
	
	
		
 
          <div>

			




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

			




	
	
	
		
 
            %if c.current_voting_result:

			




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

			




	
	
	
		
 
        <div class="form-group">

			




	
	
	
		
 
          <label>${_('Still not reviewed by')}:</label>

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
            % if len(c.pull_request_pending_reviewers) > 0:

			




	
	
	
		
 
                <div data-toggle="tooltip" title="${', '.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="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:

			




        

    



    


    



    



      

      





    
    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.