Changeset - fa4e94ad3dd6
Parent rev.
Child rev.
[Not reviewed]
default
0 4 0
domruf - 8 years ago 2017-06-28 22:30:24
dominikruf@gmail.com
templates: use span elements instead of left floating div

<span> have a more natural (inline) flow, i.e. they already have proper spacing
between the elements without additional styling.

On files browser page, since the form element does not flow inline, it needs to
include every element that should be in the first line.
4 files changed with 28 insertions and 28 deletions:
kallithea/templates/files/files_browser.html
11
11
kallithea/templates/files/files_edit.html
8
8
kallithea/templates/files/files_history_box.html
1
1
kallithea/templates/files/files_source.html
8
8
0 comments (0 inline, 0 general)
kallithea/templates/files/files_browser.html
➞
Show inline comments
 
@@ -5,68 +5,68 @@
 
        <%return "submodule-dir"%>
 
    %else:
 
        <%return "browser-dir"%>
 
    %endif
 
</%def>
 
<%def name="file_url(node, c)">
 
    %if node.is_submodule():
 
        <%return node.url or '#'%>
 
    %else:
 
        <%return h.url('files_home', repo_name=c.repo_name, revision=c.changeset.raw_id, f_path=h.safe_unicode(node.path))%>
 
    %endif
 
</%def>
 
<%def name="file_name(node)">
 
    <%
 
        c = "icon-folder-open"
 
        if node.is_file():
 
            c = "icon-doc"
 
        elif node.is_submodule():
 
            c = "icon-file-submodule"
 
    %>
 
    <%return h.literal('<i class="%s"></i><span>%s</span>' % (c, h.escape(node.name)))%>
 
</%def>
 
<div id="body" class="panel panel-default">
 
    <div class="panel-heading clearfix">
 
        <div class="browser-nav form-inline pull-left">
 
            ${h.form(h.url.current())}
 
            <div class="info_box">
 
        ${h.form(h.url.current())}
 
        <span class="browser-nav form-inline">
 
            <span class="info_box">
 
              <span class="info_box_elem rev">${_('Revision')}</span>
 
              <span class="info_box_elem"><a class="btn btn-default btn-xs ypjax-link" href="${c.url_prev}" title="${_('Previous revision')}"><i class="icon-left-open"></i></a></span>
 
              <span class="info_box_elem">${h.text('at_rev',value=c.changeset.revision,size=5,class_='form-control input-sm')}</span>
 
              <span class="info_box_elem"><a class="btn btn-default btn-xs ypjax-link" href="${c.url_next}" title="${_('Next revision')}"><i class="icon-right-open"></i></a></span>
 
            </div>
 
            ${h.end_form()}
 
        </div>
 
        <div class="browser-branch form-inline pull-left">
 
            </span>
 
        </span>
 
        <span class="browser-branch form-inline">
 
            <label>
 
                ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch,class_="form-control")}
 
                ${_('Follow current branch')}
 
            </label>
 
        </div>
 
        <div id="search_activate_id" class="search_activate pull-left">
 
        </span>
 
        <span id="search_activate_id" class="search_activate">
 
            <a class="btn btn-default btn-xs" id="filter_activate" href="#">${_('Search File List')}</a>
 
        </div>
 
        <div class="browser-search form-inline pull-left">
 
        </span>
 
        ${h.end_form()}
 
        <div class="browser-search form-inline">
 
            <div>
 
                <div id="node_filter_box_loading" style="display:none">${_('Loading file list...')}</div>
 
                <div id="node_filter_box" style="display:none">
 
                ${h.files_breadcrumbs(c.repo_name,c.changeset.raw_id,c.file.path)}/<input class="init form-control" type="text" value="type to search..." name="filter" size="25" id="node_filter">
 
                </div>
 
            </div>
 
        </div>
 
    </div>
 

			




	
	
	
		
 
    <div class="panel-body">

			




	
	
	
		
 
        <table class="table code-browser">

			




	
	
	
		
 
            <thead>

			




	
	
	
		
 
                <tr>

			




	
	
	
		
 
                    <th>${_('Name')}</th>

			




	
	
	
		
 
                    <th>${_('Size')}</th>

			




	
	
	
		
 
                    <th>${_('Last Revision')}</th>

			




	
	
	
		
 
                    <th>${_('Last Modified')}</th>

			




	
	
	
		
 
                    <th>${_('Last Committer')}</th>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            </thead>

			




	
	
	
		
 

			




	
	
	
		
 
            <tbody id="tbody">

			




	
	
	
		
 
                %if c.file.parent:

			




	
	
	
		
 
                <tr class="parity0">

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -19,65 +19,65 @@

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Edit file')} @ ${h.show_id(c.cs)}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('files')}

			




	
	
	
		
 
<div class="panel panel-primary">

			




	
	
	
		
 
    <div class="panel-heading clearfix">

			




	
	
	
		
 
        <div class="pull-left">

			




	
	
	
		
 
            ${self.breadcrumbs()}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="pull-right">

			




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

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="panel-body" id="edit">

			




	
	
	
		
 
        <div id="files_data">

			




	
	
	
		
 
            ${h.form(h.url.current(),method='post',id='eform',class_='form-inline')}

			




	
	
	
		
 
            <h3 class="files_location">

			




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

			




	
	
	
		
 
            </h3>

			




	
	
	
		
 
            <div id="body" class="panel panel-default">

			




	
	
	
		
 
              <div class="panel-heading clearfix">

			




	
	
	
		
 
                    <div class="pull-left">

			




	
	
	
		
 
                        <div class="pull-left"><i class="icon-doc-inv"></i></div>

			




	
	
	
		
 
                        <div class="pull-left">${h.link_to(h.show_id(c.file.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</div>

			




	
	
	
		
 
                        <div class="pull-left">${h.format_byte_size(c.file.size,binary=True)}</div>

			




	
	
	
		
 
                        <div class="pull-left">${c.file.mimetype}</div>

			




	
	
	
		
 
                    <span>

			




	
	
	
		
 
                        <span><i class="icon-doc-inv"></i></span>

			




	
	
	
		
 
                        <span>${h.link_to(h.show_id(c.file.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</span>

			




	
	
	
		
 
                        <span>${h.format_byte_size(c.file.size,binary=True)}</span>

			




	
	
	
		
 
                        <span>${c.file.mimetype}</span>

			




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

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                    <div class="pull-right buttons">

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                    <span class="pull-right buttons">

			




	
	
	
		
 
                      ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
                      ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
                      ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
                      % if h.HasRepoPermissionLevel('write')(c.repo_name):

			




	
	
	
		
 
                       % if not c.file.is_binary:

			




	
	
	
		
 
                        ${h.link_to(_('Source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
                       % endif

			




	
	
	
		
 
                      % endif

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="panel-body no-padding">

			




	
	
	
		
 
                <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div>

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
                  <div>${_('Commit Message')}</div>

			




	
	
	
		
 
                  <textarea class="form-control commit-message" id="commit" name="message" placeholder="${c.default_message}"></textarea>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="buttons">

			




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

			




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

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            ${h.end_form()}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 
    $(document).ready(function(){

			




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

			




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

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_history_box.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<div class="form-group">

			




	
	
	
		
 
    <div class="item">${h.literal(ungettext(u'%s author',u'%s authors',len(c.authors)) % ('<b>%s</b>' % len(c.authors))) }</div>

			




	
	
	
		
 
    <span>${h.literal(ungettext(u'%s author',u'%s authors',len(c.authors)) % ('<b>%s</b>' % len(c.authors))) }</span>

			




	
	
	
		
 
    %for email, user in c.authors:

			




	
	
	
		
 
      <span data-toggle="tooltip" title="${user}">

			




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

			




	
	
	
		
 
      </span>

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
</div>

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_source.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
    <div class="form-group">

			




	
	
	
		
 
        ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}

			




	
	
	
		
 
        ${h.hidden('diff2',c.changeset.raw_id)}

			




	
	
	
		
 
        ${h.hidden('diff1')}

			




	
	
	
		
 
        ${h.submit('diff',_('Diff to Revision'),class_="btn btn-default btn-sm")}

			




	
	
	
		
 
        ${h.submit('show_rev',_('Show at Revision'),class_="btn btn-default btn-sm")}

			




	
	
	
		
 
        ${h.hidden('annotate', c.annotate)}

			




	
	
	
		
 
        ${h.link_to(_('Show Full History'),h.url('changelog_file_home',repo_name=c.repo_name, revision=c.changeset.raw_id, f_path=c.f_path),class_="btn btn-default btn-sm")}

			




	
	
	
		
 
        ${h.link_to(_('Show Authors'),'#',class_="btn btn-default btn-sm" ,id="show_authors")}

			




	
	
	
		
 
        ${h.end_form()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div id="file_authors" class="file_author" style="display: none"></div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<div id="body" class="panel panel-default">

			




	
	
	
		
 
    <div class="panel-heading clearfix">

			




	
	
	
		
 
        <div class="pull-left">

			




	
	
	
		
 
            <div class="pull-left img"><i class="icon-doc-inv"></i></div>

			




	
	
	
		
 
            <div class="pull-left"><pre data-toggle="tooltip" title="${h.fmt_date(c.changeset.date)}">${h.link_to(h.show_id(c.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</pre></div>

			




	
	
	
		
 
            <div class="pull-left"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div>

			




	
	
	
		
 
            <div class="pull-left"><pre>${c.file.mimetype}</pre></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="pull-right buttons">

			




	
	
	
		
 
        <span>

			




	
	
	
		
 
            <span class="img"><i class="icon-doc-inv"></i></span>

			




	
	
	
		
 
            <span><pre data-toggle="tooltip" title="${h.fmt_date(c.changeset.date)}">${h.link_to(h.show_id(c.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</pre></span>

			




	
	
	
		
 
            <span><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></span>

			




	
	
	
		
 
            <span><pre>${c.file.mimetype}</pre></span>

			




	
	
	
		
 
        </span>

			




	
	
	
		
 
        <span class="pull-right buttons">

			




	
	
	
		
 
              %if c.annotate:

			




	
	
	
		
 
                ${h.link_to(_('Show Source'),    h.url('files_home',         repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
              %else:

			




	
	
	
		
 
                ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
              ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
              %if h.HasRepoPermissionLevel('write')(c.repo_name):

			




	
	
	
		
 
               %if c.on_branch_head and not c.file.is_binary:

			




	
	
	
		
 
                ${h.link_to(_('Edit on Branch: %s') % c.changeset.branch, h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-default btn-xs")}

			




	
	
	
		
 
                ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-danger btn-xs")}

			




	
	
	
		
 
               %elif c.on_branch_head and c.file.is_binary:

			




	
	
	
		
 
                ${h.link_to(_('Edit'), '#', class_="btn btn-default btn-xs disabled", title=_('Editing binary files not allowed'),**{'data-toggle':'tooltip'})}

			




	
	
	
		
 
                ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-danger btn-xs")}

			




	
	
	
		
 
               %else:

			




	
	
	
		
 
                ${h.link_to(_('Edit'), '#', class_="btn btn-default btn-xs disabled", title=_('Editing files allowed only when on branch head revision'),**{'data-toggle':'tooltip'})}

			




	
	
	
		
 
                ${h.link_to(_('Delete'), '#', class_="btn btn-danger btn-xs disabled", title=_('Deleting files allowed only when on branch head revision'),**{'data-toggle':'tooltip'})}

			




	
	
	
		
 
               %endif

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        </span>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="panel-body">

			




	
	
	
		
 
      <div class="author">

			




	
	
	
		
 
            ${h.gravatar_div(h.email_or_none(c.changeset.author), size=16)}

			




	
	
	
		
 
            <div title="${c.changeset.author}" class="user">${h.person(c.changeset.author)}</div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="commit">${h.urlify_text(c.changeset.message,c.repo_name)}</div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="panel-body no-padding">

			




	
	
	
		
 
      %if c.file.is_browser_compatible_image():

			




	
	
	
		
 
        <img src="${h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path)}" class="img-preview"/>

			




	
	
	
		
 
      %elif c.file.is_binary:

			




	
	
	
		
 
        <div>

			




	
	
	
		
 
          ${_('Binary file (%s)') % c.file.mimetype}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
      %else:

			




	
	
	
		
 
        %if c.file.size < c.cut_off_limit or c.fulldiff:

			




	
	
	
		
 
            %if c.annotate:

			




	
	
	
		
 
              ${h.pygmentize_annotation(c.repo_name,c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}

			




	
	
	
		
 
            %else:

			




	
	
	
		
 
              ${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        %else:

			




	
	
	
		
 
          <h4>

			




        

    



    


    



    



      

      





    
    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.