Changeset - 25c91454b60d
Parent rev.
Child rev.
[Not reviewed]
default
1 5 0
Sean Farley - 11 years ago 2014-10-27 16:59:21
sean.michael.farley@gmail.com
cog.png: use new icon-gear font

A quick search revealed that some old css code was never used, so it was
removed.
6 files changed with 6 insertions and 12 deletions:
kallithea/public/css/contextbar.css
1
kallithea/public/css/style.css
5
kallithea/public/images/icons/cog.png
bin+del
kallithea/templates/admin/settings/settings.html
1
1
kallithea/templates/base/base.html
4
4
kallithea/templates/data_table/_dt_elements.html
1
1
0 comments (0 inline, 0 general)
kallithea/public/css/contextbar.css
➞
Show inline comments
 
/**
 
 * Stylesheets for the context bar
 
 */
 

			




	
	
	
		
 
i.icon-archive { background-image: url("../images/icons/database_edit.png"); }

			




	
	
	
		
 
i.icon-arrow-right { background-image: url('../images/icons/arrow_right.png');}

			




	
	
	
		
 
i.icon-ban-circle { background-image: url("../images/icons/cancel.png"); }

			




	
	
	
		
 
i.icon-bar-chart { background-image: url("../images/icons/chart_bar.png"); }

			




	
	
	
		
 
i.icon-bookmark { background-image: url("../images/icons/tag_green.png"); }

			




	
	
	
		
 
i.icon-code-fork { background-image: url("../images/icons/arrow_branch.png"); }

			




	
	
	
		
 
i.icon-code-merge { background-image: url("../images/icons/arrow_merge.png"); } /* unused! */

			




	
	
	
		
 
i.icon-cog { background-image: url("../images/icons/cog_edit.png"); }

			




	
	
	
		
 
i.icon-cog { background-image: url("../images/icons/cog.png"); }

			




	
	
	
		
 
i.icon-cogs { background-image: url("../images/icons/table_gear.png"); }

			




	
	
	
		
 
i.icon-ellipsis-horizontal:after { content: ' ...';}

			




	
	
	
		
 
i.icon-eye-open { background-image: url("../images/icons/eye.png"); }

			




	
	
	
		
 
i.icon-file-2 { background-image: url("../images/icons/note.png"); }

			




	
	
	
		
 
i.icon-file-alt { background-image: url("../images/icons/note_add.png"); }

			




	
	
	
		
 
i.icon-file { background-image: url("../images/icons/file.png"); }

			




	
	
	
		
 
i.icon-file-text { background-image: url("../images/icons/clipboard_16.png"); }

			




	
	
	
		
 
i.icon-file-txt { background-image: url("../images/icons/note_error.png"); }

			




	
	
	
		
 
i.icon-folder-close { background-image: url("../images/icons/database_link.png"); }

			




	
	
	
		
 
i.icon-git { background-image: url('../images/icons/giticon.png');}

			




	
	
	
		
 
i.icon-group { background-image: url("../images/icons/group_edit.png"); }

			




	
	
	
		
 
i.icon-heart { background-image: url("../images/icons/heart_delete.png"); }

			




        

    


    
    

    

        

                

                    kallithea/public/css/style.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -541,29 +541,24 @@ div.header img {

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick li ul li a.groups,

			




	
	
	
		
 
#header #header-inner #quick li ul li a.groups:hover {

			




	
	
	
		
 
    background-image: url("../images/icons/group_edit.png");

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick li ul li a.defaults,

			




	
	
	
		
 
#header #header-inner #quick li ul li a.defaults:hover {

			




	
	
	
		
 
    background-image: url("../images/icons/wrench.png");

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick li ul li a.settings,

			




	
	
	
		
 
#header #header-inner #quick li ul li a.settings:hover {

			




	
	
	
		
 
    background-image: url("../images/icons/cog.png");

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick li ul li a.permissions,

			




	
	
	
		
 
#header #header-inner #quick li ul li a.permissions:hover {

			




	
	
	
		
 
    background-image: url("../images/icons/key.png");

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick li ul li a.ldap,

			




	
	
	
		
 
#header #header-inner #quick li ul li a.ldap:hover {

			




	
	
	
		
 
    background-image: url("../images/icons/server_key.png");

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#header #header-inner #quick li ul li a.fork,

			




	
	
	
		
 
#header #header-inner #quick li ul li a.fork:hover {

			




        

    


    
    

    

        

                

                    kallithea/public/images/icons/cog.png
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
deleted file

			




	
	
		
 
binary diff not shown

			




              
Show images

              

              

        

    


    
    

    

        

                

                    kallithea/templates/admin/settings/settings.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -21,25 +21,25 @@

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box" style="overflow:auto">

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ##main

			




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

			




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

			




	
	
	
		
 
          <li>

			




	
	
	
		
 
           <div class="gravatar_box" style="height: 26px">

			




	
	
	
		
 
               <div class="gravatar" style="float: left">

			




	
	
	
		
 
                <i class="icon-cog" style="font-size: 26px"></i>

			




	
	
	
		
 
                <i class="icon-gear" style="font-size: 26px"></i>

			




	
	
	
		
 
               </div>

			




	
	
	
		
 
               <div style="margin:10px 0px 10px 0px; color:#5f5f5f; float:left">

			




	
	
	
		
 
                <strong>${_('Settings')}</strong>

			




	
	
	
		
 
               </div>

			




	
	
	
		
 
           </div>

			




	
	
	
		
 
          </li>

			




	
	
	
		
 
          <li class="${'active' if c.active=='vcs' else ''}"><a href="${h.url('admin_settings')}">${_('VCS')}</a></li>

			




	
	
	
		
 
          <li class="${'active' if c.active=='mapping' else ''}"><a href="${h.url('admin_settings_mapping')}">${_('Remap and Rescan')}</a></li>

			




	
	
	
		
 
          <li class="${'active' if c.active=='global' else ''}"><a href="${h.url('admin_settings_global')}">${_('Global')}</a></li>

			




	
	
	
		
 
          <li class="${'active' if c.active=='visual' else ''}"><a href="${h.url('admin_settings_visual')}">${_('Visual')}</a></li>

			




	
	
	
		
 
          <li class="${'active' if c.active=='email' else ''}"><a href="${h.url('admin_settings_email')}">${_('Email')}</a></li>

			




	
	
	
		
 
          <li class="${'active' if c.active=='hooks' else ''}"><a href="${h.url('admin_settings_hooks')}">${_('Hooks')}</a></li>

			




        

    


    
    

    

        

                

                    kallithea/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -70,25 +70,25 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="admin_menu()">

			




	
	
	
		
 
  <ul class="admin_menu">

			




	
	
	
		
 
      <li><a href="${h.url('admin_home')}"><i class="icon-book"></i> ${_('Admin Journal')}</a></li>

			




	
	
	
		
 
      <li><a href="${h.url('repos')}"><i class="icon-archive"></i> ${_('Repositories')}</a></li>

			




	
	
	
		
 
      <li><a href="${h.url('repos_groups')}"><i class="icon-folder-close"></i> ${_('Repository Groups')}</a></li>

			




	
	
	
		
 
      <li><a href="${h.url('users')}"><i class="icon-user"></i> ${_('Users')}</a></li>

			




	
	
	
		
 
      <li><a href="${h.url('users_groups')}"><i class="icon-group"></i> ${_('User Groups')}</a></li>

			




	
	
	
		
 
      <li><a href="${h.url('admin_permissions')}"><i class="icon-ban-circle"></i> ${_('Permissions')}</a></li>

			




	
	
	
		
 
      <li><a href="${h.url('auth_home')}"><i class="icon-key"></i> ${_('Authentication')}</a></li>

			




	
	
	
		
 
      <li><a href="${h.url('defaults')}"><i class="icon-wrench"></i> ${_('Defaults')}</a></li>

			




	
	
	
		
 
      <li class="last"><a href="${h.url('admin_settings')}"><i class="icon-cog"></i> ${_('Settings')}</a></li>

			




	
	
	
		
 
      <li class="last"><a href="${h.url('admin_settings')}"><i class="icon-gear"></i> ${_('Settings')}</a></li>

			




	
	
	
		
 
  </ul>

			




	
	
	
		
 

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
## admin menu used for people that have some admin resources

			




	
	
	
		
 
<%def name="admin_menu_simple(repositories=None, repository_groups=None, user_groups=None)">

			




	
	
	
		
 
  <ul>

			




	
	
	
		
 
   %if repositories:

			




	
	
	
		
 
      <li><a href="${h.url('repos')}"><i class="icon-archive"></i> ${_('Repositories')}</a></li>

			




	
	
	
		
 
   %endif

			




	
	
	
		
 
   %if repository_groups:

			




	
	
		
 
@@ -157,25 +157,25 @@

			




	
	
	
		
 
          <ul id="switch_to_list_2" class="switch_to submenu">

			




	
	
	
		
 
            <li><a href="#">${_('Loading...')}</a></li>

			




	
	
	
		
 
          </ul>

			




	
	
	
		
 
        </li>

			




	
	
	
		
 
        <li ${is_current('options')}>

			




	
	
	
		
 
             %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):

			




	
	
	
		
 
               <a href="${h.url('edit_repo',repo_name=c.repo_name)}" class="dropdown"><i class="icon-cogs"></i> ${_('Options')}</a>

			




	
	
	
		
 
             %else:

			




	
	
	
		
 
               <a href="#" class="dropdown"><i class="icon-cogs"></i> ${_('Options')}</a>

			




	
	
	
		
 
             %endif

			




	
	
	
		
 
          <ul>

			




	
	
	
		
 
             %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):

			




	
	
	
		
 
                   <li><a href="${h.url('edit_repo',repo_name=c.repo_name)}"><i class="icon-cog"></i> ${_('Settings')}</a></li>

			




	
	
	
		
 
                   <li><a href="${h.url('edit_repo',repo_name=c.repo_name)}"><i class="icon-gear"></i> ${_('Settings')}</a></li>

			




	
	
	
		
 
             %endif

			




	
	
	
		
 
              %if c.db_repo.fork:

			




	
	
	
		
 
               <li><a href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1], other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}">

			




	
	
	
		
 
                   <i class="icon-loop"></i> ${_('Compare Fork')}</a></li>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-loop"></i> ${_('Compare')}</a></li>

			




	
	
	
		
 

			




	
	
	
		
 
              <li><a href="${h.url('search_repo',repo_name=c.repo_name)}"><i class="icon-search"></i> ${_('Search')}</a></li>

			




	
	
	
		
 

			




	
	
	
		
 
              %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.db_repo.enable_locking:

			




	
	
	
		
 
                %if c.db_repo.locked[0]:

			




	
	
	
		
 
                  <li>${h.link_to(_('Unlock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_del')}</li>

			




	
	
		
 
@@ -259,32 +259,32 @@

			




	
	
	
		
 
              <li><a href="${h.url('gists', private=1)}"><i class="icon-file-text"></i> ${_('My Private Gists')}</a></li>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </ul>

			




	
	
	
		
 
      </li>

			




	
	
	
		
 
    <li ${is_current('search')}>

			




	
	
	
		
 
        <a class="menu_link" title="${_('Search in repositories')}"  href="${h.url('search')}">

			




	
	
	
		
 
          <i class="icon-search"></i> ${_('Search')}

			




	
	
	
		
 
        </a>

			




	
	
	
		
 
    </li>

			




	
	
	
		
 
    % if h.HasPermissionAll('hg.admin')('access admin main page'):

			




	
	
	
		
 
      <li ${is_current('admin')}>

			




	
	
	
		
 
        <a class="menu_link childs" title="${_('Admin')}" href="${h.url('admin_home')}">

			




	
	
	
		
 
          <i class="icon-cog"></i> ${_('Admin')}

			




	
	
	
		
 
          <i class="icon-gear"></i> ${_('Admin')}

			




	
	
	
		
 
        </a>

			




	
	
	
		
 
        ${admin_menu()}

			




	
	
	
		
 
      </li>

			




	
	
	
		
 
    % elif c.authuser.repositories_admin or c.authuser.repository_groups_admin or c.authuser.user_groups_admin:

			




	
	
	
		
 
    <li ${is_current('admin')}>

			




	
	
	
		
 
        <a class="menu_link childs" title="${_('Admin')}">

			




	
	
	
		
 
          <i class="icon-cog"></i> ${_('Admin')}

			




	
	
	
		
 
          <i class="icon-gear"></i> ${_('Admin')}

			




	
	
	
		
 
        </a>

			




	
	
	
		
 
        ${admin_menu_simple(c.authuser.repositories_admin,

			




	
	
	
		
 
                            c.authuser.repository_groups_admin,

			




	
	
	
		
 
                            c.authuser.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')())}

			




	
	
	
		
 
    </li>

			




	
	
	
		
 
    % endif

			




	
	
	
		
 

			




	
	
	
		
 
    <li ${is_current('my_pullrequests')}>

			




	
	
	
		
 
      <a class="menu_link" title="${_('My Pull Requests')}" href="${h.url('my_pullrequests')}">

			




	
	
	
		
 
        <i class="icon-code-fork"></i> ${_('My Pull Requests')}

			




	
	
	
		
 
        %if c.my_pr_count != 0:

			




	
	
	
		
 
          <span class="menu_link_notifications">${c.my_pr_count}</span>

			




        

    


    
    

    

        

                

                    kallithea/templates/data_table/_dt_elements.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -33,25 +33,25 @@

			




	
	
	
		
 
    </li>

			




	
	
	
		
 
    <li>

			




	
	
	
		
 
       <a title="${_('Fork')}" href="${h.url('repo_fork_home',repo_name=repo_name)}">

			




	
	
	
		
 
       <span class="icon">

			




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

			




	
	
	
		
 
       </span>

			




	
	
	
		
 
       <span>${_('Fork')}</span>

			




	
	
	
		
 
       </a>

			




	
	
	
		
 
    </li>

			




	
	
	
		
 
    <li>

			




	
	
	
		
 
       <a title="${_('Settings')}" href="${h.url('edit_repo',repo_name=repo_name)}">

			




	
	
	
		
 
       <span class="icon">

			




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

			




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

			




	
	
	
		
 
       </span>

			




	
	
	
		
 
       <span>${_('Settings')}</span>

			




	
	
	
		
 
       </a>

			




	
	
	
		
 
    </li>

			




	
	
	
		
 
  </ul>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_name(name,rtype,rstate,private,fork_of,short_name=False,admin=False)">

			




	
	
	
		
 
    <%

			




	
	
	
		
 
    def get_name(name,short_name=short_name):

			




	
	
	
		
 
      if short_name:

			




	
	
	
		
 
        return name.split('/')[-1]

			




        

    



    


    



    



      

      





    
    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.