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
 
@@ -768,37 +768,37 @@ def action_parser(user_log, feed=False,
 

			




	
	
	
		
 
    def get_archive_name():

			




	
	
	
		
 
        archive_name = action_params

			




	
	
	
		
 
        return archive_name

			




	
	
	
		
 

			




	
	
	
		
 
    # action : translated str, callback(extractor), icon

			




	
	
	
		
 
    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'),

			




	
	
	
		
 
    'admin_created_users_group':   (_('[created] user group'),

			




	
	
	
		
 
                                    get_users_group, 'icon-pencil icon-pencil-colored'),

			




	
	
	
		
 
    'admin_updated_users_group':   (_('[updated] user group'),

			




	
	
	
		
 
                                    get_users_group, 'icon-pencil icon-pencil-colored'),

			




	
	
	
		
 
    'user_commented_revision':     (_('[commented] on revision in repository'),

			




	
	
	
		
 
                                    get_cs_links, 'icon-comment icon-comment-colored'),

			




        

    


    
    

    

        

                

                    kallithea/templates/data_table/_dt_elements.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 
    </li>

			




	
	
	
		
 
    <li>

			




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

			




	
	
	
		
 
       <span class="icon">

			




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

			




	
	
	
		
 
       </span>

			




	
	
	
		
 
       <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)}">

			




	
	
	
		
 
       <span class="icon">

			




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

			




	
	
	
		
 
       </span>

			




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

			




	
	
	
		
 
       </a>

			




	
	
	
		
 
    </li>

			




	
	
		
 
@@ -75,25 +75,25 @@

			




	
	
	
		
 

			




	
	
	
		
 
    ##PRIVATE/PUBLIC

			




	
	
	
		
 
    %if private and c.visual.show_private_icon:

			




	
	
	
		
 
      <i class="icon-lock" style="color: #e85634; font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px" title="${_('Private repository')}"></i>

			




	
	
	
		
 
    %elif not private and c.visual.show_public_icon:

			




	
	
	
		
 
      <i class="icon-unlock-alt" style="color: #999999; font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px" title="${_('Public repository')}"></i>

			




	
	
	
		
 
    %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>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="last_change(last_change)">

			




	
	
	
		
 
  <span class="tooltip" date="${last_change}" title="${h.tooltip(h.fmt_date(last_change))}">${h.age(last_change)}</span>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="revision(name,rev,tip,author,last_msg)">

			




        

    


    
    

    

        

                

                    kallithea/templates/summary/summary.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -13,32 +13,32 @@

			




	
	
	
		
 
    ## locking icon

			




	
	
	
		
 
    %if c.db_repo.enable_locking:

			




	
	
	
		
 
     %if c.db_repo.locked[0]:

			




	
	
	
		
 
       <span class="locking_locked tooltip" title="${_('Repository locked by %s') % h.person_by_id(c.db_repo.locked[0])}"></span>

			




	
	
	
		
 
     %else:

			




	
	
	
		
 
       <span class="locking_unlocked tooltip" title="${_('Repository unlocked')}"></span>

			




	
	
	
		
 
     %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')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="head_extra()">

			




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

			




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

			




	
	
	
		
 

			




	
	
		
 
@@ -144,25 +144,25 @@ summary = lambda n:{False:'summary-short

			




	
	
	
		
 
                     <img alt="gravatar" src="${h.gravatar_url(c.db_repo.user.email, 18)}"/>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
              </a>

			




	
	
	
		
 
            </li>

			




	
	
	
		
 
            <li>

			




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

			




	
	
	
		
 
                <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">

			




	
	
	
		
 
              <a href="#" onclick="javascript:showRepoSize('repo_size_2','${c.db_repo.repo_name}','${str(h.get_token())}')"><i class="icon-database"></i> ${_('Repository Size')}</a>

			




	
	
	
		
 
              <span  class="stats-bullet" id="repo_size_2"></span>

			




	
	
	
		
 
            </li>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 

			




	
	
	
		
 
            <li>

			




        

    


    
    

    

        

                

                    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>

			




	
	
	
		
 
%endif

			




	
	
	
		
 
<li>

			




	
	
	
		
 
    <a href="${h.url('tags_home',repo_name=c.repo_name)}" class="childs"><i class="icon-tag"></i> ${'%s (%s)' % (_('Tags'),len(c.db_repo_scm_instance.tags.values()))}</a>

			




	
	
	
		
 
    <ul>

			




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

			




	
	
	
		
 
        %for cnt,tag in enumerate(c.db_repo_scm_instance.tags.items()):

			




        

    



    


    



    



      

      





    
    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.