Changeset - 9930f77b6a79
Parent rev.
Child rev.
[Not reviewed]
default
1 6 0
Sean Farley - 11 years ago 2014-07-15 06:34:15
sean.michael.farley@gmail.com
group_edit.png: replace icon-group with icon-users

A quick search revealed that some old css code was never used, so it was
removed.
7 files changed with 5 insertions and 11 deletions:
kallithea/public/css/contextbar.css
1
kallithea/public/css/style.css
5
kallithea/public/images/icons/group_edit.png
bin+del
kallithea/templates/admin/repos/repo_edit.html
1
1
kallithea/templates/admin/user_groups/user_group_edit.html
1
1
kallithea/templates/base/base.html
2
2
kallithea/templates/data_table/_dt_elements.html
1
1
0 comments (0 inline, 0 general)
kallithea/public/css/contextbar.css
➞
Show inline comments
 
@@ -4,25 +4,24 @@
 

			




	
	
	
		
 
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-merge { background-image: url("../images/icons/arrow_merge.png"); } /* unused! */

			




	
	
	
		
 
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 { background-image: url("../images/icons/file.png"); }

			




	
	
	
		
 
i.icon-file-txt { background-image: url("../images/icons/note_error.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"); }

			




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

			




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

			




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

			




	
	
	
		
 
i.icon-lock-alt { background-image: url('../images/icons/private_repo.png');}

			




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

			




	
	
	
		
 
i.icon-loop-2 { background-image: url('../images/icons/arrow_inout.png');}

			




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

			




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

			




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

			




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

			




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

			




        

    


    
    

    

        

                

                    kallithea/public/css/style.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




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

			




	
	
	
		
 
    padding-left: 42px;

			




	
	
	
		
 
    background-position: 20px 9px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




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

			




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

			




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

			




	
	
	
		
 
    padding-left: 42px;

			




	
	
	
		
 
    background-position: 20px 9px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#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.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.fork,

			




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

			




        

    


    
    

    

        

                

                    kallithea/public/images/icons/group_edit.png
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
deleted file

			




	
	
		
 
binary diff not shown

			




              
Show images

              

              

        

    


    
    

    

        

                

                    kallithea/templates/admin/repos/repo_edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,25 +23,25 @@

			




	
	
	
		
 
${self.repo_context_bar('options')}

			




	
	
	
		
 
<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-group" style="font-size: 26px"></i>-->

			




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

			




	
	
	
		
 
             <!--</div>-->

			




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

			




	
	
	
		
 
                <!--<strong>${'repo-info'}</strong>-->

			




	
	
	
		
 
               <!--</div>-->

			




	
	
	
		
 
           <!--</div>-->

			




	
	
	
		
 
          <!--</li>-->

			




	
	
	
		
 
          <li class="${'active' if c.active=='settings' else ''}">

			




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

			




	
	
	
		
 
          </li>

			




	
	
	
		
 
          <li class="${'active' if c.active=='permissions' else ''}">

			




	
	
	
		
 
              <a href="${h.url('edit_repo_perms', repo_name=c.repo_name)}">${_('Permissions')}</a>

			




	
	
	
		
 
          </li>

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/user_groups/user_group_edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,25 +23,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-group" style="font-size: 26px"></i>

			




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

			




	
	
	
		
 
             </div>

			




	
	
	
		
 
               <div class="truncate" style="margin:7px 0px 10px 0px; color:#5f5f5f; float:left; width: 100px">

			




	
	
	
		
 
                <strong>${c.user_group.users_group_name}</strong>

			




	
	
	
		
 
               </div>

			




	
	
	
		
 
           </div>

			




	
	
	
		
 
          </li>

			




	
	
	
		
 
          <li class="${'active' if c.active=='settings' else ''}"><a href="${h.url('edit_users_group', id=c.user_group.users_group_id)}">${_('Settings')}</a></li>

			




	
	
	
		
 
          <li class="${'active' if c.active=='advanced' else ''}"><a href="${h.url('edit_user_group_advanced', id=c.user_group.users_group_id)}">${_('Advanced')}</a></li>

			




	
	
	
		
 
          <li class="${'active' if c.active=='default_perms' else ''}"><a href="${h.url('edit_user_group_default_perms', id=c.user_group.users_group_id)}">${_('Default permissions')}</a></li>

			




	
	
	
		
 
          <li class="${'active' if c.active=='perms' else ''}"><a href="${h.url('edit_user_group_perms', id=c.user_group.users_group_id)}">${_('Permissions')}</a></li>

			




	
	
	
		
 
          <li class="${'active' if c.active=='members' else ''}"><a href="${h.url('edit_user_group_members', id=c.user_group.users_group_id)}">${_('Members')}</a></li>

			




	
	
	
		
 
        </ul>

			




        

    


    
    

    

        

                

                    kallithea/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -66,45 +66,45 @@

			




	
	
	
		
 
<%def name="breadcrumbs()">

			




	
	
	
		
 
    <div class="breadcrumbs">

			




	
	
	
		
 
    ${self.breadcrumbs_links()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</%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-database"></i> ${_('Repositories')}</a></li>

			




	
	
	
		
 
      <li><a href="${h.url('repos_groups')}"><i class="icon-folder"></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('users_groups')}"><i class="icon-users"></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-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-database"></i> ${_('Repositories')}</a></li>

			




	
	
	
		
 
   %endif

			




	
	
	
		
 
   %if repository_groups:

			




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

			




	
	
	
		
 
   %endif

			




	
	
	
		
 
   %if user_groups:

			




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

			




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

			




	
	
	
		
 
   %endif

			




	
	
	
		
 
  </ul>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_context_bar(current=None, rev=None)">

			




	
	
	
		
 
  <% rev = None if rev == 'tip' else rev %>

			




	
	
	
		
 
  <%

			




	
	
	
		
 
      def follow_class():

			




	
	
	
		
 
          if c.repository_following:

			




	
	
	
		
 
              return h.literal('following')

			




	
	
	
		
 
          else:

			




	
	
	
		
 
              return h.literal('follow')

			




        

    


    
    

    

        

                

                    kallithea/templates/data_table/_dt_elements.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -207,21 +207,21 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_group_name(repo_group_name, children_groups)">

			




	
	
	
		
 
  <div style="white-space: nowrap">

			




	
	
	
		
 
  <a href="${h.url('repos_group_home',group_name=repo_group_name)}">

			




	
	
	
		
 
    <i class="icon-folder-close" title="${_('Repository group')}"></i> ${h.literal(' &raquo; '.join(children_groups))}</a>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="user_group_name(user_group_id, user_group_name)">

			




	
	
	
		
 
  <div style="white-space: nowrap">

			




	
	
	
		
 
  <a href="${h.url('edit_users_group', id=user_group_id)}">

			




	
	
	
		
 
    <i class="icon-group" title="${_('User group')}"></i> ${user_group_name}</a>

			




	
	
	
		
 
    <i class="icon-users" title="${_('User group')}"></i> ${user_group_name}</a>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="toggle_follow(repo_id)">

			




	
	
	
		
 
  <span id="follow_toggle_${repo_id}" class="following" title="${_('Stop following this repository')}"

			




	
	
	
		
 
        onclick="javascript:toggleFollowingRepo(this, ${repo_id},'${str(h.get_token())}')">

			




	
	
	
		
 
  </span>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    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.