kallithea Changeset - 0cb4a35d8248

Changeset - 0cb4a35d8248

Parent rev.

Child rev.

[Not reviewed]

default

1 5 0

Sean Farley - 11 years ago 2015-02-18 00:02:25
sean.michael.farley@gmail.com

hgicon.png: use repotag class to make an icon

The inline 'style' attribute was modified to remove the color but nothing else,
as was discussed with other Kallithea devs, since it makes more sense to leave
the spacing until another pass of css refactoring.

A quick search revealed that some old css code was never used, so it was
removed.

6 files changed with 5 insertions and 13 deletions:

kallithea/public/css/contextbar.css

kallithea/public/css/style.css

kallithea/public/images/icons/hgicon.png

bin+del

kallithea/templates/base/base.html

kallithea/templates/data_table/_dt_elements.html

kallithea/tests/functional/test_summary.py

0 comments (0 inline, 0 general)

kallithea/public/css/contextbar.css

➞

Show inline comments

 /**
  * Stylesheets for the context bar
  */
 i.icon-ellipsis-horizontal:after { content: ' ...';}
 i.icon-git { background-image: url('../images/icons/giticon.png');}
 i.icon-hg { background-image: url('../images/icons/hgicon.png');}
 i.icon-disabled { background-image: url('../images/icons/shading.png');} /* todo: use instead of minus sign */
 i[class^='icon-'] {
     background-repeat: no-repeat;
     background-position: center;
     display: inline-block;
     min-width: 16px;
     min-height: 16px;
     margin: -2px 0 -4px 0;
     /* background-color: red; /* for debugging */
 }
 /* css classes for diff file status ... it'd be nice if css had a way to
    inherit from another class but alas, we must make sure this content is the
    same from the icon font file */
 .icon-diff-M:before {
     font-family: 'kallithea';
     content: '\e805';
     color: #d0b44c;
 }
 .icon-diff-D:before {
     font-family: 'kallithea';
     content: '\e807';
     color: #bd2c00;
 }
 .icon-diff-A:before {
     font-family: 'kallithea';
     content: '\e806';
     color: #6cc644;
 }
 .icon-diff-R:before {
     font-family: 'kallithea';
     content: '\e81f';
     color: #677a85;
 }
 #content #context-bar {
     position: relative;
     overflow: visible;
     background-color: #577632;
     padding: 0 5px;
     min-height: 36px;
 }
 #content #context-bar h2 {
     display: inline-block;
     color: #FFF;
 }
 #header #header-inner #quick a,
 #content #context-bar,
 #content #context-bar a {
     color: #FFFFFF;
 }
 #header #header-inner #quick a:hover,
 #content #context-bar a:hover {
     text-decoration: none;
 }
 #content #context-bar .icon {
     display: inline-block;
     width: 16px;
     height: 16px;
     vertical-align: text-bottom;
 }
 ul.horizontal-list {
     display: block;
 }
 ul.horizontal-list > li {
     float: left;
     position: relative;
 }
 #header #header-inner #quick ul,
 ul.horizontal-list > li ul {
     position: absolute;
     display: none;
     right: 0;
     z-index: 999;
 }
 #header #header-inner #quick li:hover > ul,
 ul.horizontal-list li:hover > ul {
     display: block;
 }
 #header #header-inner #quick li ul li,
 ul.horizontal-list ul li {

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -408,199 +408,192 @@ div.header img { @@
     margin: 0;
     padding: 0;
+}
 #header #header-inner #home a:hover {
     background-position: 0 -40px;
+}
 #header #header-inner #logo {
     float: left;
     position: absolute;
+}
 #header #header-inner #logo h1 {
     color: #FFF;
     font-size: 20px;
     margin: 12px 0 0 13px;
     padding: 0;
+}
 #header #header-inner #logo a {
     color: #fff;
     text-decoration: none;
+}
 #header #header-inner #logo a:hover {
     color: #bfe3ff;
+}
 #header #header-inner #quick {
     position: relative;
     float: right;
     list-style-type: none;
     list-style-position: outside;
     margin: 4px 8px 0 0;
     padding: 0;
     border-radius: 4px;
+}
 #header #header-inner #quick li span.short {
     padding: 9px 6px 8px 6px;
+}
 #header #header-inner #quick li span {
     display: inline;
     margin: 0;
+}
 #header #header-inner #quick li span.normal {
     border: none;
     padding: 10px 12px 8px;
+}
 #header #header-inner #quick li span.icon {
     border-left: none;
     padding-left: 10px;
+}
 #header #header-inner #quick li span.icon_short {
     top: 0;
     left: 0;
     border-left: none;
     border-right: 1px solid #2e5c89;
     padding: 8px 6px 4px;
+}
 #header #header-inner #quick li span.icon img,
 #header #header-inner #quick li span.icon_short img {
     vertical-align: middle;
     margin-bottom: 2px;
+}
 #header #header-inner #quick ul.repo_switcher {
     max-height: 275px;
     overflow-x: hidden;
     overflow-y: auto;
+}
 #header #header-inner #quick ul.repo_switcher li.qfilter_rs {
     padding: 2px 3px;
     padding-right: 17px;
+}
 #header #header-inner #quick ul.repo_switcher li.qfilter_rs input {
     width: 100%;
     border-radius: 10px;
     padding: 2px 7px;
+}
 #header #header-inner #quick .repo_switcher_type {
     position: absolute;
     left: 0;
     top: 9px;
     margin: 0px 2px 0px 2px;
+}
 #header #header-inner #quick li ul li a.hg,
 #header #header-inner #quick li ul li a.hg:hover {
     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;
+}
 .groups_breadcrumbs a {
     color: #fff;
+}
 .groups_breadcrumbs a:hover {
     color: #bfe3ff;
     text-decoration: none;
+}
 td.quick_repo_menu:before {
     font-family: "kallithea";
     content: "\e80f";           /* triangle-right */
     margin-left: 3px;
     padding-right: 3px;
+}
 td.quick_repo_menu {
     cursor: pointer;
     width: 8px;
     border: 1px solid transparent;
+}
 td.quick_repo_menu.active:before {
     font-family: "kallithea";
     content: "\e80d";           /* triangle-down */
     margin-left: 1px;
     padding-right: 0px;
+}
 td.quick_repo_menu.active {
     border: 1px solid #577632;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
     cursor: pointer;
+}
 td.quick_repo_menu .menu_items {
     margin-top: 5px;
     margin-left: -6px;
     width: 150px;
     position: absolute;
     background-color: #FFF;
     background: none repeat scroll 0 0 #FFFFFF;
     border-color: #577632 #666666 #666666;
     border-right: 1px solid #666666;
     border-style: solid;
     border-width: 1px;
     box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2);
     border-top-style: none;
+}
 td.quick_repo_menu .menu_items li {
     padding: 0 !important;
+}
 td.quick_repo_menu .menu_items a {
     display: block;
     padding: 4px 12px 4px 8px;
+}
 td.quick_repo_menu .menu_items a:hover {
     background-color: #EEE;
     text-decoration: none;
+}
 td.quick_repo_menu .menu_items .icon img {
     margin-bottom: -2px;
+}
 td.quick_repo_menu .menu_items.hidden {
     display: none;
+}
 .yui-dt-first th {
     text-align: left;
+}
 /*
     Copyright (c) 2011, Yahoo! Inc. All rights reserved.
     Code licensed under the BSD License:
     http://developer.yahoo.com/yui/license.html
     version: 2.9.0
 */
 .yui-skin-sam .yui-dt-mask {
     position: absolute;
     z-index: 9500;
+}
 .yui-dt-tmp {
     position: absolute;
     left: -9000px;

kallithea/public/images/icons/hgicon.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -5,193 +5,193 @@ @@
 <div id="content">
     ${self.flash_msg()}
     <div id="main">
         ${next.main()}
     </div>
 </div>
 <!-- END CONTENT -->
 <!-- FOOTER -->
 <div id="footer">
    <div id="footer-inner" class="title">
        <div>
            <p class="footer-link">
                ${_('Server instance: %s') % c.instance_id if c.instance_id else ''}
            </p>
            <p class="footer-link-right">
                This site is powered by
                %if c.visual.show_version:
                    <a href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a> ${c.kallithea_version},
                %else:
                    <a href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a>,
                %endif
                which is
                <a href="${h.canonical_url('about')}#copyright">&copy; 2010&ndash;2015 by various authors &amp; licensed under GPLv3</a>.
                %if c.issues_url:
                    &ndash; <a href="${c.issues_url}" target="_blank">${_('Support')}</a>
                %endif
            </p>
        </div>
    </div>
 </div>
 <!-- END FOOTER -->
 ### MAKO DEFS ###
 <%def name="flash_msg()">
     <%include file="/base/flash_msg.html"/>
 </%def>
 <%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-users"></i> ${_('User Groups')}</a></li>
       <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="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):
-          <i class="icon-hg" style="color: #576622; font-size: 24px"></i>
+          <span class="repotag">hg</span>
         %endif
         %if h.is_git(c.db_repo):
           <i class="icon-git" style="color: #e85634; font-size: 24px"></i>
         %endif
         ## 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-file-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>
         %else:
         <li ${is_current('changelog')}><a href="${h.url('changelog_home', repo_name=c.repo_name)}"><i class="icon-clock"></i> ${_('Changelog')}</a></li>
         %endif
         <li ${is_current('files')}><a href="${h.url('files_home', repo_name=c.repo_name, revision=rev or 'tip')}"><i class="icon-doc-inv"></i> ${_('Files')}</a></li>
         <li ${is_current('switch-to')}>
           <a href="#" id="branch_tag_switcher_2" class="dropdown"><i class="icon-exchange"></i> ${_('Switch To')}</a>
           <ul id="switch_to_list_2" class="switch_to submenu">
             <li><a href="#">${_('Loading...')}</a></li>
           </ul>
         </li>
         <li ${is_current('options')}>
              %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                <a href="${h.url('edit_repo',repo_name=c.repo_name)}" class="dropdown"><i class="icon-wrench"></i> ${_('Options')}</a>
              %else:
                <a href="#" class="dropdown"><i class="icon-wrench"></i> ${_('Options')}</a>
              %endif
           <ul>
              %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                    <li><a href="${h.url('edit_repo',repo_name=c.repo_name)}"><i class="icon-gear"></i> ${_('Settings')}</a></li>
              %endif
               %if c.db_repo.fork:
                <li><a href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1], other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}">
                    <i class="icon-git-compare"></i> ${_('Compare Fork')}</a></li>
               %endif
               <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-git-compare"></i> ${_('Compare')}</a></li>
               <li><a href="${h.url('search_repo',repo_name=c.repo_name)}"><i class="icon-search"></i> ${_('Search')}</a></li>
               %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.db_repo.enable_locking:
                 %if c.db_repo.locked[0]:
                   <li>${h.link_to(_('Unlock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_del')}</li>
                 %else:
                   <li>${h.link_to(_('Lock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_add')}</li>
                 %endif
               %endif
               ## TODO: this check feels wrong, it would be better to have a check for permissions
               ## also it feels like a job for the controller
               %if c.authuser.username != 'default':
                   <li>
                    <a class="${follow_class()}" onclick="javascript:toggleFollowingRepo(this,${c.db_repo.repo_id},'${str(h.get_token())}');">
                     <span class="show-follow"><i class="icon-heart-empty"></i> ${_('Follow')}</span>
                     <span class="show-following"><i class="icon-heart"></i> ${_('Unfollow')}</span>
                   </a>
                   </li>
                   <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i> ${_('Fork')}</a></li>
                   <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i> ${_('Create Pull Request')}</a></li>
               %endif
              </ul>
         </li>
         <li ${is_current('showpullrequest')}>
           <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests for %s') % c.repo_name}"> <i class="icon-git-pull-request"></i> ${_('Pull Requests')}
             %if c.repository_pull_requests:
               <span>${c.repository_pull_requests}</span>
             %endif
           </a>
         </li>
       </ul>
   </div>
   <script type="text/javascript">
       YUE.on('branch_tag_switcher_2','mouseover',function(){
          var $branch_tag_switcher_2 = $('#branch_tag_switcher_2');
          var loaded = $branch_tag_switcher_2.hasClass('loaded');
          if(!loaded){
              $branch_tag_switcher_2.addClass('loaded');
              asynchtml("${h.url('branch_tag_switcher',repo_name=c.repo_name)}", $('#switch_to_list_2'));
+         }
          return false;
       });
@@ @@ -267,193 +267,193 @@ @@
         <i class="icon-git-pull-request"></i> ${_('My Pull Requests')}
         %if c.my_pr_count != 0:
           <span class="menu_link_notifications">${c.my_pr_count}</span>
         %endif
       </a>
     </li>
     ## USER MENU
     <li>
       <a class="menu_link childs" id="quick_login_link">
           <span class="icon">
             ${h.gravatar(c.authuser.email, size=20)}
           </span>
           %if c.authuser.username != 'default':
             <span class="menu_link_user">${c.authuser.username}</span>
             %if c.unread_notifications != 0:
               <span class="menu_link_notifications">${c.unread_notifications}</span>
             %endif
           %else:
               <span>${_('Not Logged In')}</span>
           %endif
       </a>
       <div class="user-menu">
         <div id="quick_login">
           %if c.authuser.username == 'default' or c.authuser.user_id is None:
             <h4>${_('Login to Your Account')}</h4>
             ${h.form(h.url('login_home',came_from=h.url.current()))}
             <div class="form">
                 <div class="fields">
                     <div class="field">
                         <div class="label">
                             <label for="username">${_('Username')}:</label>
                         </div>
                         <div class="input">
                             ${h.text('username',class_='focus')}
                         </div>
                     </div>
                     <div class="field">
                         <div class="label">
                             <label for="password">${_('Password')}:</label>
                         </div>
                         <div class="input">
                             ${h.password('password',class_='focus')}
                         </div>
                     </div>
                     <div class="buttons">
                         <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div>
                         <div class="register">
                         %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
                          ${h.link_to(_("Don't have an account ?"),h.url('register'))}
                         %endif
                         </div>
                         <div class="submit">
                             ${h.submit('sign_in',_('Log In'),class_="btn btn-mini")}
                         </div>
                     </div>
                 </div>
             </div>
             ${h.end_form()}
           %else:
             <div class="links_left">
                 <div class="big_gravatar">
                   ${h.gravatar(c.authuser.email, size=48)}
                 </div>
                 <div class="full_name">${c.authuser.full_name_or_username}</div>
                 <div class="email">${c.authuser.email}</div>
             </div>
             <div class="links_right">
             <ol class="links">
               <li><a href="${h.url('notifications')}">${_('Notifications')}: ${c.unread_notifications}</a></li>
               <li>${h.link_to(_(u'My Account'),h.url('my_account'))}</li>
               <li class="logout">${h.link_to(_(u'Log Out'),h.url('logout_home'))}</li>
             </ol>
             </div>
           %endif
         </div>
       </div>
     </li>
     <script type="text/javascript">
         var visual_show_public_icon = "${c.visual.show_public_icon}" == "True";
         var cache = {}
         /*format the look of items in the list*/
         var format = function(state){
             if (!state.id){
               return state.text; // optgroup
+            }
             var obj_dict = state.obj;
             var tmpl = '';
             if(obj_dict && state.type == 'repo'){
                 tmpl += '<span class="repo-icons">';
                 if(obj_dict['repo_type'] === 'hg'){
-                    tmpl += '<i class="icon-hg"></i> ';
+                    tmpl += '<span class="repotag">hg</span> ';
+                }
                 else if(obj_dict['repo_type'] === 'git'){
                     tmpl += '<i class="icon-git"></i> ';
+                }
                 if(obj_dict['private']){
                     tmpl += '<i class="icon-keyhole-circled"></i> ';
+                }
                 else if(visual_show_public_icon){
                     tmpl += '<i class="icon-globe"></i> ';
+                }
                 tmpl += '</span>';
+            }
             if(obj_dict && state.type == 'group'){
                     tmpl += '<i class="icon-folder"></i> ';
+            }
             tmpl += state.text;
             return tmpl;
+        }
         $("#repo_switcher").select2({
             placeholder: '<i class="icon-database"></i> ${_('Repositories')}',
             dropdownAutoWidth: true,
             formatResult: format,
             formatSelection: format,
             formatNoMatches: function(term){
                 return "${_('No matches found')}";
             },
             containerCssClass: "repo-switcher",
             dropdownCssClass: "repo-switcher-dropdown",
             escapeMarkup: function(m){
                 // don't escape our custom placeholder
                 if(m.substr(0,29) == '<i class="icon-database"></i>'){
                     return m;
+                }
                 return Select2.util.escapeMarkup(m);
             },
             query: function(query){
               var key = 'cache';
               var cached = cache[key] ;
               if(cached) {
                 var data = {results: []};
                 //filter results
                 $.each(cached.results, function(){
                     var section = this.text;
                     var children = [];
                     $.each(this.children, function(){
                         if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){
                             children.push({'id': this.id, 'text': this.text, 'type': this.type, 'obj': this.obj})
+                        }
                     })
                     if(children.length !== 0){
                         data.results.push({'text': section, 'children': children})
+                    }
                 });
                 query.callback(data);
               }else{
                   $.ajax({
                     url: "${h.url('repo_switcher_data')}",
                     data: {},
                     dataType: 'json',
                     type: 'GET',
                     success: function(data) {
                       cache[key] = data;
                       query.callback({results: data.results});
+                    }
                   })
+              }
+            }
         });
         $("#repo_switcher").on('select2-selecting', function(e){
             e.preventDefault();
             window.location = pyroutes.url('summary_home', {'repo_name': e.val})
         })
         ## Global mouse bindings ##
         // general help "?"
         Mousetrap.bind(['?'], function(e) {
             $('#help_kb').modal({})
         });
         // / open the quick filter
         Mousetrap.bind(['/'], function(e) {
             $("#repo_switcher").select2("open");
             // return false to prevent default browser behavior
             // and stop event from bubbling
             return false;
         });
         // ctrl/command+b, show the the main bar
         Mousetrap.bind(['command+b', 'ctrl+b'], function(e) {
             if($('#header-inner').hasClass('hover') && $('#content').hasClass('hover')){

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"/>
 <%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:18px;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">
            <i class="icon-docs"></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-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>
   </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 style="white-space: nowrap; ${'opacity: 0.5' if rstate == 'repo_state_pending' else ''}}">
     ##NAME
     %if admin:
         <a href="${h.url('edit_repo',repo_name=name)}">
     %else:
         <a href="${h.url('summary_home',repo_name=name)}">
     %endif
     ##TYPE OF REPO
     %if h.is_hg(rtype):
-        <span title="${_('Mercurial repository')}"><i class="icon-hg" style="color: #576622; font-size: 14px;"></i></span>
+        <span class="repotag" title="${_('Mercurial repository')}">hg</span>
     %elif h.is_git(rtype):
         <span title="${_('Git repository')}"><i class="icon-git" style="color: #e85634; font-size: 14px;"></i></span>
     %endif
     ##PRIVATE/PUBLIC
     %if private and c.visual.show_private_icon:
       <i class="icon-keyhole-circled" title="${_('Private repository')}" style="font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px"></i>
     %elif not private and c.visual.show_public_icon:
       <i class="icon-globe" title="${_('Public repository')}" style="font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px"></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-fork"></i></a>
     %endif
     %if rstate == 'repo_state_pending':
       <i class="icon-wrench" style="color: #036185;" 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>
 <%def name="revision(name,rev,tip,author,last_msg)">
   <div>
   %if rev >= 0:
       <pre><a title="${h.tooltip('%s:\n\n%s' % (author,last_msg))}" class="tooltip" href="${h.url('changeset_home',repo_name=name,revision=tip)}">${'r%s:%s' % (rev,h.short_id(tip))}</a></pre>
   %else:
       ${_('No changesets yet')}
   %endif
   </div>
 </%def>
 <%def name="rss(name)">
   %if c.authuser.username != 'default':
     <a title="${_('Subscribe to %s rss feed')% name}" href="${h.url('rss_feed_home',repo_name=name,api_key=c.authuser.api_key)}"><i class="icon-rss-squared"></i></a>
   %else:
     <a title="${_('Subscribe to %s rss feed')% name}" href="${h.url('rss_feed_home',repo_name=name)}"><i class="icon-rss-squared"></i></a>
   %endif
 </%def>
 <%def name="atom(name)">
   %if c.authuser.username != 'default':
     <a title="${_('Subscribe to %s atom feed')% name}" href="${h.url('atom_feed_home',repo_name=name,api_key=c.authuser.api_key)}"><i class="icon-rss-squared"></i></a>
   %else:
     <a title="${_('Subscribe to %s atom feed')% name}" href="${h.url('atom_feed_home',repo_name=name)}"><i class="icon-rss-squared"></i></a>
   %endif
 </%def>
 <%def name="repo_actions(repo_name, super_user=True)">
   <div>
     <div style="float:left; margin-right:5px;" class="grid_edit">
       <a href="${h.url('edit_repo',repo_name=repo_name)}" title="${_('edit')}">
         <i class="icon-pencil"></i> ${h.submit('edit_%s' % repo_name,_('edit'),class_="action_button")}
       </a>
     </div>
     <div style="float:left" class="grid_delete">
       ${h.form(h.url('repo', repo_name=repo_name),method='delete')}
         <i class="icon-minus-circled" style="color:#FF4444"></i>
         ${h.submit('remove_%s' % repo_name,_('delete'),class_="action_button",
         onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo_name+"');")}
       ${h.end_form()}
     </div>
   </div>
 </%def>
 <%def name="repo_state(repo_state)">
   <div>
     %if repo_state == 'repo_state_pending':
         <div class="btn btn-mini btn-info disabled">${_('Creating')}</div>
     %elif repo_state == 'repo_state_created':
         <div class="btn btn-mini btn-success disabled">${_('Created')}</div>
     %else:
         <div class="btn btn-mini btn-danger disabled" title="${repo_state}">invalid</div>
     %endif
   </div>
 </%def>
 <%def name="user_actions(user_id, username)">
  <div style="float:left" class="grid_edit">
    <a href="${h.url('edit_user',id=user_id)}" title="${_('edit')}">
      <i class="icon-pencil"></i> ${h.submit('edit_%s' % username,_('edit'),class_="action_button")}
    </a>
  </div>
  <div style="float:left" class="grid_delete">
   ${h.form(h.url('delete_user', id=user_id),method='delete')}
     <i class="icon-minus-circled" style="color:#FF4444"></i>
     ${h.submit('remove_',_('delete'),id="remove_user_%s" % user_id, class_="action_button",
     onclick="return confirm('"+_('Confirm to delete this user: %s') % username+"');")}
   ${h.end_form()}
  </div>
 </%def>

kallithea/tests/functional/test_summary.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from kallithea.tests import *
 from kallithea.tests.fixture import Fixture
 from kallithea.model.db import Repository
 from kallithea.model.repo import RepoModel
 from kallithea.model.meta import Session
 from kallithea.model.scm import ScmModel
 fixture = Fixture()
 class TestSummaryController(TestController):
     def test_index(self):
         self.log_user()
         ID = Repository.get_by_repo_name(HG_REPO).repo_id
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name=HG_REPO))
         #repo type
         response.mustcontain(
-            """<i class="icon-hg" """
+            """<span class="repotag">hg"""
+        )
         #public/private
         response.mustcontain(
             """<i class="icon-globe">"""
+        )
         # clone url...
         response.mustcontain('''id="clone_url" readonly="readonly" value="http://test_admin@localhost:80/%s"''' % HG_REPO)
         response.mustcontain('''id="clone_url_id" readonly="readonly" value="http://test_admin@localhost:80/_%s"''' % ID)
     def test_index_git(self):
         self.log_user()
         ID = Repository.get_by_repo_name(GIT_REPO).repo_id
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name=GIT_REPO))
         #repo type
         response.mustcontain(
             """<i class="icon-git" """
+        )
         #public/private
         response.mustcontain(
             """<i class="icon-globe">"""
+        )
         # clone url...
         response.mustcontain('''id="clone_url" readonly="readonly" value="http://test_admin@localhost:80/%s"''' % GIT_REPO)
         response.mustcontain('''id="clone_url_id" readonly="readonly" value="http://test_admin@localhost:80/_%s"''' % ID)
     def test_index_by_id_hg(self):
         self.log_user()
         ID = Repository.get_by_repo_name(HG_REPO).repo_id
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name='_%s' % ID))
         #repo type
         response.mustcontain(
-            """<i class="icon-hg" """
+            """<span class="repotag">hg"""
+        )
         #public/private
         response.mustcontain(
             """<i class="icon-globe">"""
+        )
     def test_index_by_repo_having_id_path_in_name_hg(self):
         self.log_user()
         fixture.create_repo(name='repo_1')
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name='repo_1'))
         try:
             response.mustcontain("repo_1")
         finally:
             RepoModel().delete(Repository.get_by_repo_name('repo_1'))
             Session().commit()
     def test_index_by_id_git(self):
         self.log_user()
         ID = Repository.get_by_repo_name(GIT_REPO).repo_id
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name='_%s' % ID))
         #repo type
         response.mustcontain(
             """<i class="icon-git" """
+        )
         #public/private
         response.mustcontain(
             """<i class="icon-globe">"""
+        )
     def _enable_stats(self, repo):
         r = Repository.get_by_repo_name(repo)
         r.enable_statistics = True
         Session().add(r)
         Session().commit()
     def test_index_trending(self):
         self.log_user()
         #codes stats
         self._enable_stats(HG_REPO)
         ScmModel().mark_for_invalidation(HG_REPO)
         response = self.app.get(url(controller='summary', action='index',
                                     repo_name=HG_REPO))
         response.mustcontain(
             '[["py", {"count": 68, "desc": ["Python"]}], '
             '["rst", {"count": 16, "desc": ["Rst"]}], '
             '["css", {"count": 2, "desc": ["Css"]}], '
             '["sh", {"count": 2, "desc": ["Bash"]}], '
             '["yml", {"count": 1, "desc": ["Yaml"]}], '
             '["makefile", {"count": 1, "desc": ["Makefile", "Makefile"]}], '
             '["js", {"count": 1, "desc": ["Javascript"]}], '
             '["cfg", {"count": 1, "desc": ["Ini"]}], '
             '["ini", {"count": 1, "desc": ["Ini"]}], '
             '["html", {"count": 1, "desc": ["EvoqueHtml", "Html"]}]];'
+        )
     def test_index_statistics(self):
         self.log_user()
         #codes stats
         self._enable_stats(HG_REPO)
         ScmModel().mark_for_invalidation(HG_REPO)
         response = self.app.get(url(controller='summary', action='statistics',
                                     repo_name=HG_REPO))
     def test_index_trending_git(self):
         self.log_user()
         #codes stats
         self._enable_stats(GIT_REPO)
         ScmModel().mark_for_invalidation(GIT_REPO)
         response = self.app.get(url(controller='summary', action='index',
                                     repo_name=GIT_REPO))
         response.mustcontain(
             '[["py", {"count": 68, "desc": ["Python"]}], '
             '["rst", {"count": 16, "desc": ["Rst"]}], '
             '["css", {"count": 2, "desc": ["Css"]}], '
             '["sh", {"count": 2, "desc": ["Bash"]}], '
             '["makefile", {"count": 1, "desc": ["Makefile", "Makefile"]}], '
             '["js", {"count": 1, "desc": ["Javascript"]}], '
             '["cfg", {"count": 1, "desc": ["Ini"]}], '
             '["ini", {"count": 1, "desc": ["Ini"]}], '
             '["html", {"count": 1, "desc": ["EvoqueHtml", "Html"]}], '
             '["bat", {"count": 1, "desc": ["Batch"]}]];'
+        )
     def test_index_statistics_git(self):
         self.log_user()
         #codes stats
         self._enable_stats(GIT_REPO)

0 comments (0 inline, 0 general)