Changeset - b172a000249d
Parent rev.
Child rev.
[Not reviewed]
default
0 7 0
Mads Kiilerich - 9 years ago 2016-12-24 17:26:48
mads@kiilerich.com
style: drop unnecessary <ul> markup

Based on work by Dominik Ruf.
7 files changed with 34 insertions and 52 deletions:
kallithea/public/css/style.css
5
1
kallithea/templates/admin/repo_groups/repo_group_edit.html
5
9
kallithea/templates/admin/repos/repo_edit_advanced.html
8
17
kallithea/templates/admin/repos/repo_edit_caches.html
3
6
kallithea/templates/admin/repos/repo_edit_statistics.html
5
3
kallithea/templates/journal/journal.html
7
15
kallithea/templates/pullrequests/pullrequest_show.html
1
1
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -563,31 +563,35 @@ div.header img {
 
    height: 1%;
 
    margin: 4px;
 
    text-decoration: none;
 
}
 

			




	
	
	
		
 
#content div.panel div.panel-heading ul.links.nav-tabs li a {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    color: #fff;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 11px 10px 11px 10px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.panel div.panel-heading ul.links.icon-only-links li a {

			




	
	
	
		
 
#content div.panel div.panel-heading .links.icon-only-links a {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    color: #fff;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 11px 10px 11px 10px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.panel div.panel-heading .links.icon-only-links {

			




	
	
	
		
 
   float: right;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.panel h1,

			




	
	
	
		
 
#content div.panel h2,

			




	
	
	
		
 
#content div.panel h3,

			




	
	
	
		
 
#content div.panel h4,

			




	
	
	
		
 
#content div.panel h5,

			




	
	
	
		
 
#content div.panel h6,

			




	
	
	
		
 
#content div.panel div.h1,

			




	
	
	
		
 
#content div.panel div.h2,

			




	
	
	
		
 
#content div.panel div.h3,

			




	
	
	
		
 
#content div.panel div.h4,

			




	
	
	
		
 
#content div.panel div.h5,

			




	
	
	
		
 
#content div.panel div.h6 {

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/repo_groups/repo_group_edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -6,41 +6,37 @@

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${h.link_to(_('Admin'),h.url('admin_home'))}

			




	
	
	
		
 
    &raquo;

			




	
	
	
		
 
    ${h.link_to(_('Repository Groups'),h.url('repos_groups'))}

			




	
	
	
		
 
    %if c.repo_group.parent_group:

			




	
	
	
		
 
        &raquo; ${h.link_to(c.repo_group.parent_group.name,h.url('repos_group_home',group_name=c.repo_group.parent_group.group_name))}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    &raquo; ${h.link_to(c.repo_group.name,h.url('repos_group_home',group_name=c.repo_group.group_name))}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_side_links()">

			




	
	
	
		
 
    <ul class="links">

			




	
	
	
		
 
      <li>

			




	
	
	
		
 
          <a href="${h.url('new_repos_group', parent_group=c.repo_group.group_id)}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add Child Group')}</a>

			




	
	
	
		
 
      </li>

			




	
	
	
		
 
    </ul>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%block name="header_menu">

			




	
	
	
		
 
    ${self.menu('admin')}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="panel panel-primary" style="overflow:auto">

			




	
	
	
		
 
    <div class="panel-heading clearfix">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        ${self.breadcrumbs_side_links()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
          <li>

			




	
	
	
		
 
            <a href="${h.url('new_repos_group', parent_group=c.repo_group.group_id)}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add Child Group')}</a>

			




	
	
	
		
 
          </li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ##main

			




	
	
	
		
 
    <div style="width: 150px; float:left">

			




	
	
	
		
 
      <ul class="nav nav-pills nav-stacked">

			




	
	
	
		
 
        <li class="${'active' if c.active=='settings' else ''}"><a href="${h.url('edit_repo_group', group_name=c.repo_group.group_name)}">${_('Settings')}</a></li>

			




	
	
	
		
 
        <li class="${'active' if c.active=='advanced' else ''}"><a href="${h.url('edit_repo_group_advanced', group_name=c.repo_group.group_name)}">${_('Advanced')}</a></li>

			




	
	
	
		
 
        <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('edit_repo_group_perms', group_name=c.repo_group.group_name)}">${_('Permissions')}</a></li>

			




	
	
	
		
 
      </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div style="width:750px; float:left; padding: 10px 0px 0px 20px;margin: 0px 0px 0px 10px; border-left: 1px solid #DDDDDD">

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/repos/repo_edit_advanced.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<h3>${_('Parent')}</h3>

			




	
	
	
		
 
${h.form(url('edit_repo_advanced_fork', repo_name=c.repo_info.repo_name))}

			




	
	
	
		
 
<div class="form">

			




	
	
	
		
 
       ${h.select('id_fork_of','',c.repos_list)}

			




	
	
	
		
 
       ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="btn btn-default btn-sm")}

			




	
	
	
		
 
       <div class="text-muted" style="border:none">

			




	
	
	
		
 
       <ul>

			




	
	
	
		
 
            <li>${_('''Manually set this repository as a fork of another from the list.''')}</li>

			




	
	
	
		
 
       </ul>

			




	
	
	
		
 
       <div class="text-muted">

			




	
	
	
		
 
       ${_('''Manually set this repository as a fork of another from the list.''')}

			




	
	
	
		
 
       </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
${h.end_form()}

			




	
	
	
		
 

			




	
	
	
		
 
<script>

			




	
	
	
		
 
    $(document).ready(function(){

			




	
	
	
		
 
        $("#id_fork_of").select2({

			




	
	
	
		
 
            'dropdownAutoWidth': true

			




	
	
	
		
 
        });

			




	
	
	
		
 
    });

			




	
	
	
		
 
</script>

			




	
	
	
		
 

			




	
	
		
 
@@ -26,75 +24,68 @@ ${h.form(url('edit_repo_advanced_journal

			




	
	
	
		
 
  %if c.in_public_journal:

			




	
	
	
		
 
    <button class="btn btn-default btn-sm" type="submit">

			




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

			




	
	
	
		
 
        ${_('Remove from public journal')}

			




	
	
	
		
 
    </button>

			




	
	
	
		
 
  %else:

			




	
	
	
		
 
    <button class="btn btn-default btn-sm" type="submit">

			




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

			




	
	
	
		
 
        ${_('Add to Public Journal')}

			




	
	
	
		
 
    </button>

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
 <div class="text-muted" style="border:none">

			




	
	
	
		
 
 <ul>

			




	
	
	
		
 
      <li>${_('All actions done in this repository will be visible to everyone in the public journal.')}</li>

			




	
	
	
		
 
 </ul>

			




	
	
	
		
 
 <div class="text-muted">

			




	
	
	
		
 
 ${_('All actions done in this repository will be visible to everyone in the public journal.')}

			




	
	
	
		
 
 </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
${h.end_form()}

			




	
	
	
		
 

			




	
	
	
		
 
<h3>${_('Change Locking')}</h3>

			




	
	
	
		
 
${h.form(url('edit_repo_advanced_locking', repo_name=c.repo_info.repo_name))}

			




	
	
	
		
 
<div class="form">

			




	
	
	
		
 
      %if c.repo_info.locked[0]:

			




	
	
	
		
 
        ${h.hidden('set_unlock', '1')}

			




	
	
	
		
 
        <button class="btn btn-default btn-sm" type="submit"

			




	
	
	
		
 
                onclick="return confirm('${_('Confirm to unlock repository.')}');">

			




	
	
	
		
 
            <i class="icon-lock-open-alt"></i>

			




	
	
	
		
 
            ${_('Unlock Repository')}

			




	
	
	
		
 
        </button>

			




	
	
	
		
 
       ${_('Locked by %s on %s') % (h.person_by_id(c.repo_info.locked[0]),h.fmt_date(h.time_to_datetime(c.repo_info.locked[1])))}

			




	
	
	
		
 
      %else:

			




	
	
	
		
 
        ${h.hidden('set_lock', '1')}

			




	
	
	
		
 
        <button class="btn btn-default btn-sm" type="submit"

			




	
	
	
		
 
                onclick="return confirm('${_('Confirm to lock repository.')}');">

			




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

			




	
	
	
		
 
            ${_('Lock Repository')}

			




	
	
	
		
 
        </button>

			




	
	
	
		
 
        ${_('Repository is not locked')}

			




	
	
	
		
 
      %endif

			




	
	
	
		
 
   <div class="text-muted" style="border:none">

			




	
	
	
		
 
   <ul>

			




	
	
	
		
 
        <li>${_('Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository.  The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push.')}

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
   </ul>

			




	
	
	
		
 
   <div class="text-muted">

			




	
	
	
		
 
   ${_('Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository.  The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push.')}

			




	
	
	
		
 
   </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
${h.end_form()}

			




	
	
	
		
 

			




	
	
	
		
 
<h3>${_('Delete')}</h3>

			




	
	
	
		
 
${h.form(url('delete_repo', repo_name=c.repo_name))}

			




	
	
	
		
 
<div class="form">

			




	
	
	
		
 
    <button class="btn btn-danger btn-sm" type="submit"

			




	
	
	
		
 
            onclick="return confirm('${_('Confirm to delete this repository: %s') % c.repo_name}');">

			




	
	
	
		
 
        <i class="icon-minus-circled"></i>

			




	
	
	
		
 
        ${_('Delete this Repository')}

			




	
	
	
		
 
    </button>

			




	
	
	
		
 
    %if c.repo_info.forks.count():

			




	
	
	
		
 
        ${ungettext('This repository has %s fork', 'This repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()}

			




	
	
	
		
 
        <label>

			




	
	
	
		
 
            <input type="radio" name="forks" value="detach_forks" checked="checked"/>

			




	
	
	
		
 
            ${_('Detach forks')}

			




	
	
	
		
 
        </label>

			




	
	
	
		
 
        <label>

			




	
	
	
		
 
            <input type="radio" name="forks" value="delete_forks" />

			




	
	
	
		
 
            ${_('Delete forks')}

			




	
	
	
		
 
        </label>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    <div class="text-muted" style="border:none">

			




	
	
	
		
 
        <ul>

			




	
	
	
		
 
        <li>${_('The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it.')}</li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
    <div class="text-muted">

			




	
	
	
		
 
        ${_('The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it.')}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
${h.end_form()}

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/repos/repo_edit_caches.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
${h.form(url('update_repo_caches', repo_name=c.repo_name))}

			




	
	
	
		
 
<div class="form">

			




	
	
	
		
 
   <div>

			




	
	
	
		
 
       ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate Repository Cache'),class_="btn btn-default btn-sm")}

			




	
	
	
		
 
      <div class="text-muted" style="border:none">

			




	
	
	
		
 
      <ul>

			




	
	
	
		
 
          <li>${_('Manually invalidate cache for this repository. On first access, the repository will be cached again.')}

			




	
	
	
		
 
          </li>

			




	
	
	
		
 
      </ul>

			




	
	
	
		
 
      <div class="text-muted">

			




	
	
	
		
 
        ${_('Manually invalidate cache for this repository. On first access, the repository will be cached again.')}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div style="border:none;">

			




	
	
	
		
 
      <div>

			




	
	
	
		
 
        <h5>${_('List of Cached Values')}</h5>

			




	
	
	
		
 
        <table class="table">

			




	
	
	
		
 
          <tr>

			




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

			




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

			




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

			




	
	
	
		
 
          </tr>

			




	
	
	
		
 
          %for cache in c.repo_info.cache_keys:

			




	
	
	
		
 
              <tr>

			




	
	
	
		
 
                <td>${cache.get_prefix() or '-'}</td>

			




	
	
	
		
 
                <td>${cache.cache_key}</td>

			




	
	
	
		
 
                <td>${h.boolicon(cache.cache_active)}</td>

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/repos/repo_edit_statistics.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
${h.form(url('edit_repo_statistics_update', repo_name=c.repo_info.repo_name))}

			




	
	
	
		
 
<div class="form">

			




	
	
	
		
 
    <div class="form-horizontal">

			




	
	
	
		
 
       <div class="text-muted" style="border:none;color:#888">

			




	
	
	
		
 
        <ul>

			




	
	
	
		
 
      <div class="form-group text-muted">

			




	
	
	
		
 
        <ul class="list-unstyled">

			




	
	
	
		
 
            <li>${_('Processed commits')}: ${c.stats_revision}/${c.repo_last_rev}</li>

			




	
	
	
		
 
            <li>${_('Processed progress')}: ${c.stats_percentage}%</li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
       </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="form-group">

			




	
	
	
		
 
        ${h.submit('reset_stats_%s' % c.repo_info.repo_name,_('Reset Statistics'),class_="btn btn-default btn-sm",onclick="return confirm('"+_('Confirm to remove current statistics.')+"');")}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
   </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
${h.end_form()}

			




        

    


    
    

    

        

                

                    kallithea/templates/journal/journal.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -13,39 +13,31 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%block name="header_menu">

			




	
	
	
		
 
    ${self.menu('journal')}

			




	
	
	
		
 
</%block>

			




	
	
	
		
 
<%block name="head_extra">

			




	
	
	
		
 
  <link href="${h.url('journal_atom', api_key=c.authuser.api_key)}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" />

			




	
	
	
		
 
  <link href="${h.url('journal_rss', api_key=c.authuser.api_key)}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
    <div class="panel panel-primary">

			




	
	
	
		
 
        <div class="panel-heading clearfix">

			




	
	
	
		
 
         ${self.breadcrumbs()}

			




	
	
	
		
 
         <ul class="links icon-only-links">

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <a href="${h.url('my_account_watched')}"><i class="icon-eye"></i> ${_('Watched Repositories')}</a>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <a href="${h.url('my_account_repos')}"><i class="icon-database"></i> ${_('My Repositories')}</a>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <span><a id="refresh" href="${h.url('journal')}"><i class="icon-arrows-cw"></i></a></span>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
           <li>

			




	
	
	
		
 
             <span><a href="${h.url('journal_atom', api_key=c.authuser.api_key)}"><i class="icon-rss-squared"></i></a></span>

			




	
	
	
		
 
           </li>

			




	
	
	
		
 
         </ul>

			




	
	
	
		
 
            ${self.breadcrumbs()}

			




	
	
	
		
 
            <div class="links icon-only-links panel-title">

			




	
	
	
		
 
                <a href="${h.url('my_account_watched')}"><i class="icon-eye"></i> ${_('Watched Repositories')}</a>

			




	
	
	
		
 
                <a href="${h.url('my_account_repos')}"><i class="icon-database"></i> ${_('My Repositories')}</a>

			




	
	
	
		
 
                <a id="refresh" href="${h.url('journal')}"><i class="icon-arrows-cw"></i></a>

			




	
	
	
		
 
                <a href="${h.url('journal_atom', api_key=c.authuser.api_key)}"><i class="icon-rss-squared"></i></a>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div id="journal">

			




	
	
	
		
 
            <%include file='journal_data.html'/>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
<script type="text/javascript">

			




	
	
	
		
 

			




	
	
	
		
 
    $('#j_filter').click(function(){

			




	
	
	
		
 
        var $jfilter = $('#j_filter');

			




	
	
	
		
 
        if($jfilter.hasClass('initial')){

			




	
	
	
		
 
            $jfilter.val('');

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -205,25 +205,25 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    ## REVIEWERS

			




	
	
	
		
 
    <div style="float:left">

			




	
	
	
		
 
        <h4 class="pr-details-title">${_('Pull Request Reviewers')}</h4>

			




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

			




	
	
	
		
 
          ## members goes here !

			




	
	
	
		
 
          <div>

			




	
	
	
		
 
            %for member,status in c.pull_request_reviewers:

			




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

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            <ul id="review_members">

			




	
	
	
		
 
            <ul id="review_members" class="list-unstyled">

			




	
	
	
		
 
            %for member,status in c.pull_request_reviewers:

			




	
	
	
		
 
              ## WARNING: the HTML below is duplicate with

			




	
	
	
		
 
              ## kallithea/public/js/base.js

			




	
	
	
		
 
              ## If you change something here it should be reflected in the template too.

			




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

			




	
	
	
		
 
                <span class="reviewers_member">

			




	
	
	
		
 
                  <span class="reviewer_status" data-toggle="tooltip" title="${h.changeset_status_lbl(status)}">

			




	
	
	
		
 
                      <i class="icon-circle changeset-status-${status}"></i>

			




	
	
	
		
 
                  </span>

			




	
	
	
		
 
                  ${h.gravatar(member.email, size=14)}

			




	
	
	
		
 
                  <span>

			




	
	
	
		
 
                    ${member.full_name_and_username}

			




        

    



    


    



    



      

      





    
    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.