Changeset - 9846e4d1f9cd
Parent rev.
Child rev.
[Not reviewed]
default
0 6 0
Mads Kiilerich - 8 years ago 2017-06-25 18:27:28
mads@kiilerich.com
style: drop some redundant and empty divs
6 files changed with 13 insertions and 15 deletions:
kallithea/templates/admin/repos/repo_creating.html
1
1
kallithea/templates/admin/user_groups/user_group_edit_settings.html
10
6
kallithea/templates/base/root.html
2
kallithea/templates/files/diff_2way.html
2
kallithea/templates/followers/followers_data.html
2
3
kallithea/templates/forks/forks_data.html
1
0 comments (0 inline, 0 general)
kallithea/templates/admin/repos/repo_creating.html
➞
Show inline comments
 
@@ -20,25 +20,25 @@
 
<div class="panel panel-primary">
 
    <div class="panel-heading clearfix">
 
        ${self.breadcrumbs()}
 
    </div>
 

			




	
	
	
		
 
    <div class="panel-body">

			




	
	
	
		
 
            <h4 class="text-center">

			




	
	
	
		
 
                ${_('Repository "%(repo_name)s" is being created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})}

			




	
	
	
		
 
            </h4>

			




	
	
	
		
 

			




	
	
	
		
 
        <div id="progress">

			




	
	
	
		
 
            <div class="progress progress-striped active">

			




	
	
	
		
 
                <div class="progress-bar progress-bar" role="progressbar"

			




	
	
	
		
 
                <div class="progress-bar" role="progressbar"

			




	
	
	
		
 
                    aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="progress_error" style="display: none;">

			




	
	
	
		
 
            <div class="alert alert-danger">

			




	
	
	
		
 
                ${_("We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator.")}

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/user_groups/user_group_edit_settings.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -14,36 +14,40 @@ ${h.form(url('update_users_group', id=c.

			




	
	
	
		
 
                        <span class="help-block">${_('Short, optional description for this user group.')}</span>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="form-group">

			




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

			




	
	
	
		
 
                    <div>

			




	
	
	
		
 
                        ${h.checkbox('users_group_active',value=True)}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="form-group">

			




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

			




	
	
	
		
 
                    <div>

			




	
	
	
		
 
                        <div>

			




	
	
	
		
 
                        <div class="pull-left">

			




	
	
	
		
 
                            <div class="text">${_('Chosen group members')}</div>

			




	
	
	
		
 
                            ${h.select('users_group_members',[],c.group_members,multiple=True,size=8,style="min-width:210px",class_='form-control')}

			




	
	
	
		
 
                            ${h.select('users_group_members',[],c.group_members,multiple=True,size=8,style="width:210px",class_='form-control')}

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                        <div>

			




	
	
	
		
 
                        <div class="pull-left">

			




	
	
	
		
 
                          <div class="text">&nbsp;</div>

			




	
	
	
		
 
			  <div>

			




	
	
	
		
 
                            <i id="add_element" class="icon-left-open" title="Choose selected available"></i>

			




	
	
	
		
 
                            <div></div>

			




	
	
	
		
 
                          </div>

			




	
	
	
		
 
                          <div>

			




	
	
	
		
 
                            <i id="remove_element" class="icon-right-open" title="Remove selected chosen"></i>

			




	
	
	
		
 
                          </div>

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                        <div>

			




	
	
	
		
 
                        <div class="pull-left">

			




	
	
	
		
 
                            <div class="text">${_('Available members')}</div>

			




	
	
	
		
 
                            ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px",class_='form-control')}

			




	
	
	
		
 
                            ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="width:210px",class_='form-control')}

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="form-group">

			




	
	
	
		
 
                    <div class="buttons">

			




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

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
${h.end_form()}

			




	
	
	
		
 
<script type="text/javascript">

			




        

    


    
    

    

        

                

                    kallithea/templates/base/root.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -98,40 +98,38 @@

			




	
	
	
		
 

			




	
	
	
		
 
              pyroutes.register('toggle_following', ${h.js(h.url('toggle_following'))});

			




	
	
	
		
 
              pyroutes.register('changeset_info', ${h.js(h.url('changeset_info', repo_name='%(repo_name)s', revision='%(revision)s'))}, ['repo_name', 'revision']);

			




	
	
	
		
 
              pyroutes.register('repo_size', ${h.js(h.url('repo_size', repo_name='%(repo_name)s'))}, ['repo_name']);

			




	
	
	
		
 
              pyroutes.register('repo_refs_data', ${h.js(h.url('repo_refs_data', repo_name='%(repo_name)s'))}, ['repo_name']);

			




	
	
	
		
 
             });

			




	
	
	
		
 
        </script>

			




	
	
	
		
 

			




	
	
	
		
 
        <%block name="head_extra"/>

			




	
	
	
		
 
    </head>

			




	
	
	
		
 
    <body>

			




	
	
	
		
 
      <nav class="navbar navbar-inverse">

			




	
	
	
		
 
        <div>

			




	
	
	
		
 
          <div class="navbar-header" id="logo">

			




	
	
	
		
 
            <a class="navbar-brand" href="${h.url('home')}">

			




	
	
	
		
 
                <img class="pull-left" src="${h.url('/images/kallithea-logo.svg')}" alt="Kallithea"/>

			




	
	
	
		
 
                  %if c.site_name:

			




	
	
	
		
 
                    <span class="branding">${c.site_name}</span>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
            </a>

			




	
	
	
		
 
            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false">

			




	
	
	
		
 
              <span class="sr-only">Toggle navigation</span>

			




	
	
	
		
 
              <span class="icon-bar"></span>

			




	
	
	
		
 
              <span class="icon-bar"></span>

			




	
	
	
		
 
              <span class="icon-bar"></span>

			




	
	
	
		
 
            </button>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div id="navbar" class="navbar-collapse collapse">

			




	
	
	
		
 
            <%block name="header_menu"/>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
      </nav>

			




	
	
	
		
 

			




	
	
	
		
 
      ${next.body()}

			




	
	
	
		
 

			




	
	
	
		
 
      %if c.ga_code:

			




	
	
	
		
 
      ${h.literal(c.ga_code)}

			




	
	
	
		
 
      %endif

			




	
	
	
		
 
    </body>

			




	
	
	
		
 
</html>

			




        

    


    
    

    

        

                

                    kallithea/templates/files/diff_2way.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -24,46 +24,44 @@

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('changelog')}

			




	
	
	
		
 
<div class="panel panel-primary">

			




	
	
	
		
 
    <div class="panel-heading clearfix">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




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

			




	
	
	
		
 
        <div class="panel panel-default">

			




	
	
	
		
 
            <div class="panel-heading clearfix">

			




	
	
	
		
 
                <div class="changeset_header">

			




	
	
	
		
 
                    <div class="pull-left">

			




	
	
	
		
 
                        ${h.link_to(h.safe_unicode(c.node1.path),h.url('files_home',repo_name=c.repo_name,

			




	
	
	
		
 
                        revision=c.cs2.raw_id,f_path=h.safe_unicode(c.node1.path)))}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                    <div class="pull-left diff-actions">

			




	
	
	
		
 
                      <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" data-toggle="tooltip" title="${_('Show full diff for this file')}">

			




	
	
	
		
 
                          <i class="icon-file-code"></i>

			




	
	
	
		
 
                      </a>

			




	
	
	
		
 
                      <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='diff',fulldiff=1)}" data-toggle="tooltip" title="${_('Show full side-by-side diff for this file')}">

			




	
	
	
		
 
                          <i class="icon-docs"></i>

			




	
	
	
		
 
                      </a>

			




	
	
	
		
 
                      <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='raw')}" data-toggle="tooltip" title="${_('Raw diff')}">

			




	
	
	
		
 
                          <i class="icon-diff"></i>

			




	
	
	
		
 
                      </a>

			




	
	
	
		
 
                      <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),diff2=c.cs2.raw_id,diff1=c.cs1.raw_id,diff='download')}" data-toggle="tooltip" title="${_('Download diff')}">

			




	
	
	
		
 
                          <i class="icon-floppy"></i>

			




	
	
	
		
 
                      </a>

			




	
	
	
		
 
                      ${h.checkbox('ignorews', label=_('Ignore whitespace'))}

			




	
	
	
		
 
                      ${h.checkbox('edit_mode', label=_('Edit'))}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div id="compare"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
<script>

			




	
	
	
		
 
var orig1_url = ${h.jshtml(h.url('files_raw_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node1.path),revision=c.cs1.raw_id))};

			




	
	
	
		
 
var orig2_url = ${h.jshtml(h.url('files_raw_home',repo_name=c.repo_name,f_path=h.safe_unicode(c.node2.path),revision=c.cs2.raw_id))};

			




	
	
	
		
 

			




	
	
	
		
 
$(document).ready(function () {

			




	
	
	
		
 
    $('#compare').mergely({

			




	
	
	
		
 
        width: 'auto',

			




        

    


    
    

    

        

                

                    kallithea/templates/followers/followers_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 

			




	
	
	
		
 
% for f in c.followers_pager:

			




	
	
	
		
 
    <div>

			




	
	
	
		
 
        <div class="follower_user">

			




	
	
	
		
 
            ${h.gravatar_div(f.user.email, size=24)}

			




	
	
	
		
 
            <span> <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname})</span>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div></div>

			




	
	
	
		
 
        <div class="follower_date">${_('Started following -')}

			




	
	
	
		
 
        <span data-toggle="tooltip" title="${f.follows_from}"> ${h.age(f.follows_from)}</span></div>

			




	
	
	
		
 
        <div></div>

			




	
	
	
		
 
          <span data-toggle="tooltip" title="${f.follows_from}"> ${h.age(f.follows_from)}</span>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
% endfor

			




	
	
	
		
 

			




	
	
	
		
 
<ul class="pagination">

			




	
	
	
		
 
    ${c.followers_pager.pager()}

			




	
	
	
		
 
</ul>

			




        

    


    
    

    

        

                

                    kallithea/templates/forks/forks_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2,25 +2,24 @@

			




	
	
	
		
 

			




	
	
	
		
 
% if c.forks_pager:

			




	
	
	
		
 
    % for f in c.forks_pager:

			




	
	
	
		
 
        <div>

			




	
	
	
		
 
            <div class="fork_user">

			




	
	
	
		
 
                ${h.gravatar_div(f.owner.email, size=24)}

			




	
	
	
		
 
                <span>

			




	
	
	
		
 
                 <b>${f.owner.username}</b> (${f.owner.name} ${f.owner.lastname}) /

			




	
	
	
		
 
                  ${h.link_to(f.repo_name,h.url('summary_home',repo_name=f.repo_name))}

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
                <div>${f.description}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div></div>

			




	
	
	
		
 
            <div class="follower_date">${_('Forked')} -

			




	
	
	
		
 
                <span data-toggle="tooltip" title="${h.fmt_date(f.created_on)}"> ${h.age(f.created_on)}</span>

			




	
	
	
		
 
                <a title="${_('Compare fork with %s') % c.repo_name}"

			




	
	
	
		
 
                   href="${h.url('compare_url',repo_name=c.repo_name, org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=f.repo_name,other_ref_type=c.db_repo.landing_rev[0],other_ref_name=c.db_repo.landing_rev[1], merge=1)}"

			




	
	
	
		
 
                   class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare Fork')}</a>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    % endfor

			




	
	
	
		
 
    <ul class="pagination">

			




	
	
	
		
 
        ${c.forks_pager.pager()}

			




	
	
	
		
 
    </ul>

			




	
	
	
		
 
% else:

			




        

    



    


    



    



      

      





    
    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.