Changeset - 8924172b07ff
Parent rev.
Child rev.
[Not reviewed]
default
0 4 0
Thomas De Schampheleire - 11 years ago 2015-04-06 21:05:05
thomas.de.schampheleire@gmail.com
summary: repeat repo type in front of clone URL

Repeatedly, users report cloning problems of the Kallithea sources on IRC,
caused by them assuming that it is a Git repository.

Try to solve this problem by repeating the repository tag, indicating 'hg'
or 'git' in front of the clone URL.

Additionally, decrease the font size of the URL a notch, and improve
alignment with the repotag by removing top/bottom padding.

To avoid duplication of the repotag logic, introduce a mako def for it.
4 files changed with 16 insertions and 13 deletions:
kallithea/public/css/style.css
2
2
kallithea/templates/base/base.html
10
6
kallithea/templates/data_table/_dt_elements.html
3
5
kallithea/templates/summary/summary.html
1
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -1255,50 +1255,50 @@ div.label-summary label {
 
    margin: 0 0 0 200px;
 
}
 

			




	
	
	
		
 
#content div.box-left div.form div.fields div.field div.input,

			




	
	
	
		
 
#content div.box-right div.form div.fields div.field div.input {

			




	
	
	
		
 
    margin: 0 0 0 0px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input input,

			




	
	
	
		
 
.reviewer_ac input {

			




	
	
	
		
 
    background: #FFF;

			




	
	
	
		
 
    border-top: 1px solid #b3b3b3;

			




	
	
	
		
 
    border-left: 1px solid #b3b3b3;

			




	
	
	
		
 
    border-right: 1px solid #eaeaea;

			




	
	
	
		
 
    border-bottom: 1px solid #eaeaea;

			




	
	
	
		
 
    color: #000;

			




	
	
	
		
 
    font-size: 12px;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 7px 7px 6px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input input#clone_url,

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input input#clone_url_id

			




	
	
	
		
 
{

			




	
	
	
		
 
    font-size: 16px;

			




	
	
	
		
 
    padding: 2px;

			




	
	
	
		
 
    font-size: 14px;

			




	
	
	
		
 
    padding: 0 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.file input {

			




	
	
	
		
 
    background: none repeat scroll 0 0 #FFFFFF;

			




	
	
	
		
 
    border-color: #B3B3B3 #EAEAEA #EAEAEA #B3B3B3;

			




	
	
	
		
 
    border-style: solid;

			




	
	
	
		
 
    border-width: 1px;

			




	
	
	
		
 
    color: #000000;

			




	
	
	
		
 
    font-size: 12px;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 7px 7px 6px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
input.disabled {

			




	
	
	
		
 
    background-color: #F5F5F5 !important;

			




	
	
	
		
 
}

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input input.small {

			




	
	
	
		
 
    width: 30%;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.form div.fields div.field div.input input.medium {

			




	
	
	
		
 
    width: 55%;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/base/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -64,72 +64,76 @@

			




	
	
	
		
 
      <li><a href="${h.url('admin_permissions')}"><i class="icon-block"></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-users"></i> ${_('User Groups')}</a></li>

			




	
	
	
		
 
   %endif

			




	
	
	
		
 
  </ul>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repotag(repo)">

			




	
	
	
		
 
  %if h.is_hg(repo):

			




	
	
	
		
 
    <span class="repotag" title="${_('Mercurial repository')}">hg</span>

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
  %if h.is_git(repo):

			




	
	
	
		
 
    <span class="repotag" title="${_('Git repository')}">git</span>

			




	
	
	
		
 
  %endif

			




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

			




	
	
	
		
 
  %>

			




	
	
	
		
 
  <%

			




	
	
	
		
 
    def is_current(selected):

			




	
	
	
		
 
        if selected == current:

			




	
	
	
		
 
            return h.literal('class="current"')

			




	
	
	
		
 
    %>

			




	
	
	
		
 

			




	
	
	
		
 
  <!--- CONTEXT BAR -->

			




	
	
	
		
 
  <div id="context-bar" class="box">

			




	
	
	
		
 
      <h2>

			




	
	
	
		
 
        %if h.is_hg(c.db_repo):

			




	
	
	
		
 
          <span class="repotag">hg</span>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        %if h.is_git(c.db_repo):

			




	
	
	
		
 
          <span class="repotag">git</span>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        ${repotag(c.db_repo)}

			




	
	
	
		
 

			




	
	
	
		
 
        ## public/private

			




	
	
	
		
 
        %if c.db_repo.private:

			




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

			




	
	
	
		
 
        %else:

			




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

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
        ${h.repo_link(c.db_repo.groups_and_repo)}

			




	
	
	
		
 

			




	
	
	
		
 
        %if current == 'createfork':

			




	
	
	
		
 
         - ${_('Create Fork')}

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      </h2>

			




	
	
	
		
 
      <!--

			




	
	
	
		
 
      <div id="breadcrumbs">

			




	
	
	
		
 
        ${h.link_to(_(u'Repositories'),h.url('home'))}

			




	
	
	
		
 
        &raquo;

			




	
	
	
		
 
        ${h.repo_link(c.db_repo.groups_and_repo)}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      -->

			




	
	
	
		
 
      <ul id="context-pages" class="horizontal-list">

			




	
	
	
		
 
        <li ${is_current('summary')}><a href="${h.url('summary_home', repo_name=c.repo_name)}"><i class="icon-doc-text"></i> ${_('Summary')}</a></li>

			




	
	
	
		
 
        %if rev:

			




	
	
	
		
 
        <li ${is_current('changelog')}><a href="${h.url('changelog_file_home', repo_name=c.repo_name, revision=rev, f_path='')}"><i class="icon-clock"></i> ${_('Changelog')}</a></li>

			




        

    


    
    

    

        

                

                    kallithea/templates/data_table/_dt_elements.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## DATA TABLE RE USABLE ELEMENTS

			




	
	
	
		
 
## usage:

			




	
	
	
		
 
## <%namespace name="dt" file="/data_table/_dt_elements.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%namespace name="base" file="/base/base.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="quick_menu(repo_name)">

			




	
	
	
		
 
  <ul class="menu_items hidden">

			




	
	
	
		
 
  ##<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">

			




	
	
	
		
 

			




	
	
	
		
 
    <li style="border-top:1px solid #577632; margin-left: 21px; padding-left: -99px;"></li>

			




	
	
	
		
 
    <li>

			




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

			




	
	
	
		
 
       <span class="icon">

			




	
	
	
		
 
           <i class="icon-doc-text-inv"></i>

			




	
	
	
		
 
       </span>

			




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

			




	
	
	
		
 
       </a>

			




	
	
	
		
 
    </li>

			




	
	
	
		
 
    <li>

			




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

			




	
	
	
		
 
       <span class="icon">

			




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

			




	
	
	
		
 
       </span>

			




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

			




	
	
	
		
 
       </a>

			




	
	
	
		
 
    </li>

			




	
	
	
		
 
    <li>

			




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

			




	
	
	
		
 
       <span class="icon">

			




	
	
		
 
@@ -42,53 +44,49 @@

			




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

			




	
	
	
		
 
  </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]

			




	
	
	
		
 
      else:

			




	
	
	
		
 
        return name

			




	
	
	
		
 
    %>

			




	
	
	
		
 
  <div class="dt_repo ${'dt_repo_pending' if rstate == 'repo_state_pending' else ''}">

			




	
	
	
		
 
    ##NAME

			




	
	
	
		
 
    <a href="${h.url('edit_repo' if admin else 'summary_home', repo_name=name)}">

			




	
	
	
		
 

			




	
	
	
		
 
    ##TYPE OF REPO

			




	
	
	
		
 
    %if h.is_hg(rtype):

			




	
	
	
		
 
        <span class="repotag" title="${_('Mercurial repository')}">hg</span>

			




	
	
	
		
 
    %elif h.is_git(rtype):

			




	
	
	
		
 
        <span class="repotag" title="${_('Git repository')}">git</span>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    ${base.repotag(rtype)}

			




	
	
	
		
 

			




	
	
	
		
 
    ##PRIVATE/PUBLIC

			




	
	
	
		
 
    %if private and c.visual.show_private_icon:

			




	
	
	
		
 
      <i class="icon-keyhole-circled" title="${_('Private repository')}"></i>

			




	
	
	
		
 
    %elif not private and c.visual.show_public_icon:

			




	
	
	
		
 
      <i class="icon-globe" title="${_('Public repository')}"></i>

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
      <span style="margin: 0px 8px 0px 8px"></span>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    <span class="dt_repo_name">${get_name(name)}</span>

			




	
	
	
		
 
    </a>

			




	
	
	
		
 
    %if fork_of:

			




	
	
	
		
 
      <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-wrench" title="${_('Repository creation 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>

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/summary/summary.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -51,48 +51,49 @@

			




	
	
	
		
 
  window.onhashchange = function() {

			




	
	
	
		
 
    redirect_hash_branch();

			




	
	
	
		
 
  };

			




	
	
	
		
 
  </script>

			




	
	
	
		
 
</%block>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('summary')}

			




	
	
	
		
 
<%

			




	
	
	
		
 
summary = lambda n:{False:'summary-short'}.get(n)

			




	
	
	
		
 
%>

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <!-- end box / title -->

			




	
	
	
		
 
    <div class="form">

			




	
	
	
		
 
        <div id="summary" class="fields">

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
                <div class="label-summary">

			




	
	
	
		
 
                  <label>${_('Clone URL')}:</label>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="input ${summary(c.show_stats)}">

			




	
	
	
		
 
                  ${self.repotag(c.db_repo)}

			




	
	
	
		
 
                  <input style="width:80%" type="text" id="clone_url" readonly="readonly" value="${c.clone_repo_url}"/>

			




	
	
	
		
 
                  <input style="display:none;width:80%" type="text" id="clone_url_id" readonly="readonly" value="${c.clone_repo_url_id}"/>

			




	
	
	
		
 
                  <div style="display:none" id="clone_by_name" class="btn btn-small">${_('Show by Name')}</div>

			




	
	
	
		
 
                  <div id="clone_by_id" class="btn btn-small">${_('Show by ID')}</div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
              <div class="label-summary">

			




	
	
	
		
 
                  <label>${_('Description')}:</label>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
                 %if c.visual.stylify_metatags:

			




	
	
	
		
 
                   <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(h.desc_stylize(c.db_repo.description))}</div>

			




	
	
	
		
 
                 %else:

			




	
	
	
		
 
                   <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(c.db_repo.description)}</div>

			




	
	
	
		
 
                 %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            <div class="field">

			




	
	
	
		
 
              <div class="label-summary">

			




	
	
	
		
 
                  <label>${_('Trending files')}:</label>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="input ${summary(c.show_stats)}">

			




	
	
	
		
 
                %if c.show_stats:

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-22144
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support