kallithea Changeset - 07e664871e98

Changeset - 07e664871e98

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich (mads) - 5 years ago 2020-11-09 16:17:26
mads@kiilerich.com

Grafted from: 45cf4b3667c5

templates: pass repo type to repolabel as str

Keep it simple and avoid passing complex repo objects around.

2 files changed with 7 insertions and 7 deletions:

kallithea/templates/base/base.html

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -72,41 +72,41 @@ @@
    %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="repolabel(repo)">
   %if h.is_hg(repo):
 <%def name="repolabel(repo_type)">
   %if repo_type == 'hg':
     <span class="label label-repo" title="${_('Mercurial repository')}">hg</span>
   %endif
-  %if h.is_git(repo):
+  %if repo_type == 'git':
     <span class="label label-repo" title="${_('Git repository')}">git</span>
   %endif
 </%def>
 <%def name="repo_context_bar(current=None, rev=None)">
   <% rev = None if rev == 'tip' else rev %>
   <!--- CONTEXT BAR -->
   <nav id="context-bar" class="navbar navbar-inverse">
     <div class="container-fluid">
     <div class="navbar-header">
       <div class="navbar-brand">
         ${repolabel(c.db_repo)}
+        ${repolabel(c.db_repo.repo_type)}
         ## public/private
         %if c.db_repo.private:
           <i class="icon-lock"></i>
         %else:
           <i class="icon-globe"></i>
         %endif
         %for group in c.db_repo.groups_with_parents:
           ${h.link_to(group.name, url('repos_group_home', group_name=group.group_name), class_='navbar-link')}
           &raquo;
         %endfor
         ${h.link_to(c.db_repo.just_name, url('summary_home', repo_name=c.db_repo.repo_name), class_='navbar-link')}

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -46,42 +46,42 @@ @@
 <%def name="main()">
 ${self.repo_context_bar('summary')}
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <div id="summary-panel-body" class="form panel-body">
         <div id="summary" class="pull-left">
             <div class="form-group form-inline">
                 <label>${_('Clone URL')}:</label>
                 <div id="clone-url">
                   <div id="clone_by_name" class="input-group" style="${'display:none' if c.ssh_repo_url else ''}">
                     <span class="input-group-addon">${self.repolabel(c.db_repo)}</span>
+                    <span class="input-group-addon">${self.repolabel(c.db_repo.repo_type)}</span>
                     <input class="form-control" size="80" readonly="readonly" value="${c.clone_repo_url}"/>
                     <span class="input-group-addon btn use-id">${_('Use ID')}</span>
                     %if c.ssh_repo_url:
                     <span class="input-group-addon btn use-ssh">${_('Use SSH')}</span>
                     %endif
                   </div>
                   <div id="clone_by_id" class="input-group" style="display:none">
                     <span class="input-group-addon">${self.repolabel(c.db_repo)}</span>
+                    <span class="input-group-addon">${self.repolabel(c.db_repo.repo_type)}</span>
                     <input class="form-control" size="80" readonly="readonly" value="${c.clone_repo_url_id}"/>
                     <span class="input-group-addon btn use-name">${_('Use Name')}</span>
                     %if c.ssh_repo_url:
                     <span class="input-group-addon btn use-ssh">${_('Use SSH')}</span>
                     %endif
                   </div>
                   %if c.ssh_repo_url:
                   <div id="clone_ssh" class="input-group">
                     <span class="input-group-addon">${self.repolabel(c.db_repo)}</span>
+                    <span class="input-group-addon">${self.repolabel(c.db_repo.repo_type)}</span>
                     <input id="ssh_url" class="form-control" size="80" readonly="readonly" value="${c.ssh_repo_url}"/>
                     <span class="input-group-addon btn use-name">${_('Use HTTP')}</span>
                   </div>
                   %endif
                 </div>
             </div>
             <div class="form-group">
               <label>${_('Description')}:</label>
               <div class="formatted-fixed">${h.urlify_text(c.db_repo.description, stylize=c.visual.stylify_metalabels)}</div>
             </div>

0 comments (0 inline, 0 general)