Changeset - f14497d6305e
Parent rev.
Child rev.
[Not reviewed]
default
0 4 0
Sean Farley - 11 years ago 2014-07-15 06:59:44
sean.michael.farley@gmail.com
base: change icon-code-fork menu item to use icon-fork
4 files changed with 10 insertions and 10 deletions:
kallithea/lib/helpers.py
3
3
kallithea/templates/data_table/_dt_elements.html
2
2
kallithea/templates/summary/summary.html
3
3
kallithea/templates/switch_to_list.html
2
2
0 comments (0 inline, 0 general)
kallithea/lib/helpers.py
➞
Show inline comments
 
@@ -774,25 +774,25 @@ def action_parser(user_log, feed=False,
 
    action_map = {
 
    'user_deleted_repo':           (_('[deleted] repository'),
 
                                    None, 'icon-trash'),
 
    'user_created_repo':           (_('[created] repository'),
 
                                    None, 'icon-plus icon-plus-colored'),
 
    'user_created_fork':           (_('[created] repository as fork'),
 
                                    None, 'icon-code-fork'),
 
                                    None, 'icon-fork'),
 
    'user_forked_repo':            (_('[forked] repository'),
 
                                    get_fork_name, 'icon-code-fork'),
 
                                    get_fork_name, 'icon-fork'),
 
    'user_updated_repo':           (_('[updated] repository'),
 
                                    None, 'icon-pencil icon-pencil-colored'),
 
    'user_downloaded_archive':      (_('[downloaded] archive from repository'),
 
                                    get_archive_name, 'icon-download-alt'),
 
    'admin_deleted_repo':          (_('[delete] repository'),
 
                                    None, 'icon-trash'),
 
    'admin_created_repo':          (_('[created] repository'),
 
                                    None, 'icon-plus icon-plus-colored'),
 
    'admin_forked_repo':           (_('[forked] repository'),
 
                                    None, 'icon-code-fork icon-fork-colored'),
 
                                    None, 'icon-fork icon-fork-colored'),
 
    'admin_updated_repo':          (_('[updated] repository'),
 
                                    None, 'icon-pencil icon-pencil-colored'),
 
    'admin_created_user':          (_('[created] user'),
 
                                    get_user_name, 'icon-user icon-user-colored'),
 
    'admin_updated_user':          (_('[updated] user'),
 
                                    get_user_name, 'icon-user icon-user-colored'),
kallithea/templates/data_table/_dt_elements.html
➞
Show inline comments
 
@@ -31,13 +31,13 @@
 
       <span>${_('Files')}</span>
 
       </a>
 
    </li>
 
    <li>
 
       <a title="${_('Fork')}" href="${h.url('repo_fork_home',repo_name=repo_name)}">
 
       <span class="icon">
 
           <i class="icon-code-fork"></i>
 
           <i class="icon-fork"></i>
 
       </span>
 
       <span>${_('Fork')}</span>
 
       </a>
 
    </li>
 
    <li>
 
       <a title="${_('Settings')}" href="${h.url('edit_repo',repo_name=repo_name)}">
 
@@ -81,13 +81,13 @@
 
    %else:
 
      <span style="margin: 0px 8px 0px 8px"></span>
 
    %endif
 
    ${get_name(name)}
 
    </a>
 
    %if fork_of:
 
      <a href="${h.url('summary_home',repo_name=fork_of.repo_name)}"><i class="icon-code-fork"></i></a>
 
      <a href="${h.url('summary_home',repo_name=fork_of.repo_name)}"><i class="icon-fork"></i></a>
 
    %endif
 
    %if rstate == 'repo_state_pending':
 
      <i class="icon-sliders" style="color: #036185;" title="${_('Repository creating in progress...')}"></i>
 
    %endif
 
  </div>
 
</%def>
kallithea/templates/summary/summary.html
➞
Show inline comments
 
@@ -19,20 +19,20 @@
 
     %endif
 
    %endif
 

			




	
	
	
		
 
    ##FORK

			




	
	
	
		
 
    %if c.db_repo.fork:

			




	
	
	
		
 
    <span>

			




	
	
	
		
 
        - <i class="icon-code-fork"></i> ${_('Fork of')} "<a href="${h.url('summary_home',repo_name=c.db_repo.fork.repo_name)}">${c.db_repo.fork.repo_name}</a>"

			




	
	
	
		
 
        - <i class="icon-fork"></i> ${_('Fork of')} "<a href="${h.url('summary_home',repo_name=c.db_repo.fork.repo_name)}">${c.db_repo.fork.repo_name}</a>"

			




	
	
	
		
 
    </span>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 

			




	
	
	
		
 
    ##REMOTE

			




	
	
	
		
 
    %if c.db_repo.clone_uri:

			




	
	
	
		
 
    <span>

			




	
	
	
		
 
       - <i class="icon-code-fork"></i> ${_('Clone from')} "<a href="${h.url(str(h.hide_credentials(c.db_repo.clone_uri)))}">${h.hide_credentials(c.db_repo.clone_uri)}</a>"

			




	
	
	
		
 
       - <i class="icon-fork"></i> ${_('Clone from')} "<a href="${h.url(str(h.hide_credentials(c.db_repo.clone_uri)))}">${h.hide_credentials(c.db_repo.clone_uri)}</a>"

			




	
	
	
		
 
    <span>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('repositories')}

			




	
	
		
 
@@ -150,13 +150,13 @@ summary = lambda n:{False:'summary-short

			




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

			




	
	
	
		
 
                <span class="stats-bullet" id="current_followers_count">${c.repository_followers}</span>

			




	
	
	
		
 
              </a>

			




	
	
	
		
 
            </li>

			




	
	
	
		
 
            <li>

			




	
	
	
		
 
              <a title="${_('Forks')}" href="${h.url('repo_forks_home',repo_name=c.repo_name)}">

			




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

			




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

			




	
	
	
		
 
                <span class="stats-bullet">${c.repository_forks}</span>

			




	
	
	
		
 
              </a>

			




	
	
	
		
 
            </li>

			




	
	
	
		
 

			




	
	
	
		
 
            %if c.authuser.username != 'default':

			




	
	
	
		
 
            <li class="repo_size">

			




        

    


    
    

    

        

                

                    kallithea/templates/switch_to_list.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
<li>

			




	
	
	
		
 
    <a href="${h.url('branches_home',repo_name=c.repo_name)}" class="childs"><i class="icon-code-fork"></i> ${'%s (%s)' % (_('Branches'),len(c.db_repo_scm_instance.branches.values()))}</a>

			




	
	
	
		
 
    <a href="${h.url('branches_home',repo_name=c.repo_name)}" class="childs"><i class="icon-fork"></i> ${'%s (%s)' % (_('Branches'),len(c.db_repo_scm_instance.branches.values()))}</a>

			




	
	
	
		
 
    <ul>

			




	
	
	
		
 
    %if c.db_repo_scm_instance.branches.values():

			




	
	
	
		
 
        %for cnt,branch in enumerate(c.db_repo_scm_instance.branches.items()):

			




	
	
	
		
 
            <li><div><pre>${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=(branch[0] if '/' not in branch[0] else branch[1]), at=branch[0]))}</pre></div></li>

			




	
	
	
		
 
        %endfor

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        <li>${h.link_to(_('There are no branches yet'),'#')}</li>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    </ul>

			




	
	
	
		
 
</li>

			




	
	
	
		
 
%if c.db_repo_scm_instance.closed_branches.values():

			




	
	
	
		
 
<li>

			




	
	
	
		
 
    <a href="${h.url('branches_home',repo_name=c.repo_name)}" class="childs"><i class="icon-code-fork"></i> ${'%s (%s)' % (_('Closed Branches'),len(c.db_repo_scm_instance.closed_branches.values()))}</a>

			




	
	
	
		
 
    <a href="${h.url('branches_home',repo_name=c.repo_name)}" class="childs"><i class="icon-fork"></i> ${'%s (%s)' % (_('Closed Branches'),len(c.db_repo_scm_instance.closed_branches.values()))}</a>

			




	
	
	
		
 
    <ul>

			




	
	
	
		
 
        %for cnt,branch in enumerate(c.db_repo_scm_instance.closed_branches.items()):

			




	
	
	
		
 
            <li><div><pre>${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=(branch[0] if '/' not in branch[0] else branch[1]), at=branch[0]))}</pre></div></li>

			




	
	
	
		
 
        %endfor

			




	
	
	
		
 
    </ul>

			




	
	
	
		
 
</li>

			




        

    



    


    



    



      

      





    
    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.