kallithea Changeset - dc5abab268dc

Changeset - dc5abab268dc

Parent rev.

Child rev.

[Not reviewed]

default

1 5 0

Sean Farley - 11 years ago 2014-07-21 02:56:13
sean.michael.farley@gmail.com

database_edit.png: use new icon-file-zip font

Previously, database_edit.png was used for icon-archive class so those have all
been renamed via a search-and-replace.

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

6 files changed with 8 insertions and 14 deletions:

kallithea/public/css/contextbar.css

kallithea/public/css/style.css

kallithea/public/images/icons/database_edit.png

bin+del

kallithea/templates/base/base.html

kallithea/templates/journal/journal.html

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/public/css/contextbar.css

➞

Show inline comments

 /**
  * Stylesheets for the context bar
  */
 i.icon-archive { background-image: url("../images/icons/database_edit.png"); }
 i.icon-arrow-right { background-image: url('../images/icons/arrow_right.png');}
 i.icon-ban-circle { background-image: url("../images/icons/cancel.png"); }
 i.icon-bar-chart { background-image: url("../images/icons/chart_bar.png"); }
 i.icon-bookmark { background-image: url("../images/icons/tag_green.png"); }
 i.icon-code-fork { background-image: url("../images/icons/arrow_branch.png"); }
 i.icon-code-merge { background-image: url("../images/icons/arrow_merge.png"); } /* unused! */
 i.icon-cogs { background-image: url("../images/icons/table_gear.png"); }
 i.icon-ellipsis-horizontal:after { content: ' ...';}
 i.icon-eye-open { background-image: url("../images/icons/eye.png"); }
 i.icon-file-2 { background-image: url("../images/icons/note.png"); }
 i.icon-file-alt { background-image: url("../images/icons/note_add.png"); }
 i.icon-file { background-image: url("../images/icons/file.png"); }
 i.icon-file-text { background-image: url("../images/icons/clipboard_16.png"); }
 i.icon-file-txt { background-image: url("../images/icons/note_error.png"); }
 i.icon-folder-close { background-image: url("../images/icons/database_link.png"); }
 i.icon-git { background-image: url('../images/icons/giticon.png');}
 i.icon-group { background-image: url("../images/icons/group_edit.png"); }
 i.icon-heart { background-image: url("../images/icons/heart_delete.png"); }
 i.icon-heart-empty { background-image: url("../images/icons/heart.png"); }
 i.icon-hg { background-image: url('../images/icons/hgicon.png');}
 i.icon-key { background-image: url("../images/icons/server_key.png"); }
 i.icon-lock { background-image: url('../images/icons/lock.png');}
 i.icon-lock-alt { background-image: url('../images/icons/private_repo.png');}
 i.icon-loop { background-image: url('../images/icons/arrow_inout.png');}
 i.icon-loop-2 { background-image: url('../images/icons/arrow_inout.png');}
 i.icon-private { background-image: url('../images/icons/private_repo.png');}
 i.icon-public { background-image: url('../images/icons/public_repo.png');}
 i.icon-random { background-image: url("../images/icons/arrow_switch.png"); }
 i.icon-refresh { background-image: url('../images/icons/arrow_refresh.png');}
 i.icon-tag { background-image: url("../images/icons/tag_blue.png"); }
 i.icon-time { background-image: url("../images/icons/time.png"); }
 i.icon-list-alt { background-image: url("../images/icons/time.png"); }
 i.icon-unlock { background-image: url('../images/icons/lock_open.png');}
 i.icon-unlock-alt { background-image: url('../images/icons/public_repo.png');}
 i.icon-user { background-image: url("../images/icons/user_edit.png"); }
 i.icon-wrench { background-image: url("../images/icons/wrench.png"); }
 i.icon-rss-sign { background-image: url('../images/icons/rss_16.png');}
 i.icon-plus-sign { background-image: url('../images/icons/add.png');}
 i.icon-chevron-left:after { content: "\00AB";}
 i.icon-chevron-right:after { content: "\00BB";}
 i.icon-copy { background-image: url('../images/icons/note_add.png');}
 i.icon-pencil { background-image: url('../images/icons/application_form_edit.png');}
 i.icon-remove { background-image: url('../images/icons/delete.png');}
 i.icon-remove-sign { background-image: url('../images/icons/delete.png');}
 i.icon-plus { background-image: url('../images/icons/plus_16.png');}
 i.icon-resize-vertical { background-image: url('../images/icons/text_align_left.png');}
 i.icon-ok-sign { background-image: url('../images/icons/tick.png');}
 i.icon-minus-sign { background-image: url('../images/icons/delete.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 */
 }
 #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;
 }

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -432,197 +432,192 @@ div.header img { @@
 #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.private_repo,
 #header #header-inner #quick li ul li a.private_repo:hover {
     background-image: url("../images/icons/private_repo.png")
+}
 #header #header-inner #quick li ul li a.public_repo,
 #header #header-inner #quick li ul li a.public_repo:hover {
     background-image: url("../images/icons/public_repo.png");
+}
 #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;
+}
 #header #header-inner #quick li ul li a.repos,
 #header #header-inner #quick li ul li a.repos:hover {
     background-image: url("../images/icons/database_edit.png");
+}
 #header #header-inner #quick li ul li a.repos_groups,
 #header #header-inner #quick li ul li a.repos_groups:hover {
     background-image: url("../images/icons/database_link.png");
+}
 #header #header-inner #quick li ul li a.users,
 #header #header-inner #quick li ul li a.users:hover {
     background-image: url("../images/icons/user_edit.png");
+}
 #header #header-inner #quick li ul li a.groups,
 #header #header-inner #quick li ul li a.groups:hover {
     background-image: url("../images/icons/group_edit.png");
+}
 #header #header-inner #quick li ul li a.defaults,
 #header #header-inner #quick li ul li a.defaults:hover {
     background-image: url("../images/icons/wrench.png");
+}
 #header #header-inner #quick li ul li a.permissions,
 #header #header-inner #quick li ul li a.permissions:hover {
     background-image: url("../images/icons/key.png");
+}
 #header #header-inner #quick li ul li a.ldap,
 #header #header-inner #quick li ul li a.ldap:hover {
     background-image: url("../images/icons/server_key.png");
+}
 #header #header-inner #quick li ul li a.fork,
 #header #header-inner #quick li ul li a.fork:hover {
     background-image: url("../images/icons/arrow_divide.png");
+}
 #header #header-inner #quick li ul li a.locking_add,
 #header #header-inner #quick li ul li a.locking_add:hover {
     background-image: url("../images/icons/lock_add.png");
+}
 #header #header-inner #quick li ul li a.locking_del,
 #header #header-inner #quick li ul li a.locking_del:hover {
     background-image: url("../images/icons/lock_delete.png");
+}
 #header #header-inner #quick li ul li a.pull_request,
 #header #header-inner #quick li ul li a.pull_request:hover {
     background-image: url("../images/icons/arrow_join.png") ;
+}
 #header #header-inner #quick li ul li a.compare_request,
 #header #header-inner #quick li ul li a.compare_request:hover {
     background-image: url("../images/icons/arrow_inout.png");
+}
 #header #header-inner #quick li ul li a.delete,
 #header #header-inner #quick li ul li a.delete:hover {
     background-image: url("../images/icons/delete.png");
+}
 #header #header-inner #quick li ul li a.branches,
 #header #header-inner #quick li ul li a.branches:hover {
     background-image: url("../images/icons/arrow_branch.png");
+}
 #header #header-inner #quick li ul li a.tags,
 #header #header-inner #quick li ul li a.tags:hover {
     background: #FFF url("../images/icons/tag_blue.png") no-repeat 4px 9px;
     width: 167px;
     margin: 0;
     padding: 12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.bookmarks,
 #header #header-inner #quick li ul li a.bookmarks:hover {
     background: #FFF url("../images/icons/tag_green.png") no-repeat 4px 9px;
     width: 167px;
     margin: 0;
     padding: 12px 9px 7px 24px;
+}
 .groups_breadcrumbs a {
     color: #fff;
+}
 .groups_breadcrumbs a:hover {
     color: #bfe3ff;
     text-decoration: none;
+}
 td.quick_repo_menu {
     background: #FFF url("../images/vertical-indicator.png") 8px 50% no-repeat !important;
     cursor: pointer;
     width: 8px;
     border: 1px solid transparent;
+}

kallithea/public/images/icons/database_edit.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/templates/base/base.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="root.html"/>
 <!-- HEADER -->
 <div id="header">
     <div id="header-inner" class="title">
         <div id="logo">
           <a href="${h.url('home')}" style="display: block;">
             <div class="header">
                 <img src="${h.url('/images/kallithea-logo.svg')}" onerror="this.src='${h.url('/images/kallithea-logo.png')}'" alt="Kallithea"/>
             </div>
             %if c.site_name:
              <div class="branding">${c.site_name}</div>
             %endif
           </a>
         </div>
         <!-- MENU -->
         ${self.page_nav()}
         <!-- END MENU -->
         ${self.body()}
     </div>
 </div>
 <!-- END HEADER -->
 <!-- CONTENT -->
 <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;2014 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-archive"></i> ${_('Repositories')}</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-close"></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-group"></i> ${_('User Groups')}</a></li>
       <li><a href="${h.url('admin_permissions')}"><i class="icon-ban-circle"></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-archive"></i> ${_('Repositories')}</a></li>
+      <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-close"></i> ${_('Repository Groups')}</a></li>
    %endif
    %if user_groups:
       <li><a href="${h.url('users_groups')}"><i class="icon-group"></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>
         %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-lock"></i>
         %else:
           <i class="icon-unlock-alt"></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-time"></i> ${_('Changelog')}</a></li>
         %else:
         <li ${is_current('changelog')}><a href="${h.url('changelog_home', repo_name=c.repo_name)}"><i class="icon-time"></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-file"></i> ${_('Files')}</a></li>
         <li ${is_current('switch-to')}>
           <a href="#" id="branch_tag_switcher_2" class="dropdown"><i class="icon-random"></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-cogs"></i> ${_('Options')}</a>
              %else:
                <a href="#" class="dropdown"><i class="icon-cogs"></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-loop"></i> ${_('Compare Fork')}</a></li>
               %endif
               <li><a href="${h.url('compare_home',repo_name=c.repo_name)}"><i class="icon-loop"></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':
@@ @@ -307,204 +307,204 @@ @@
               <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"><img alt="gravatar" src="${h.gravatar_url(c.authuser.email,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> ';
+                }
                 else if(obj_dict['repo_type'] === 'git'){
                     tmpl += '<i class="icon-git"></i> ';
+                }
                 if(obj_dict['private']){
                     tmpl += '<i class="icon-lock" style="color: #e85634;"></i> ';
+                }
                 else if(visual_show_public_icon){
                     tmpl += '<i class="icon-unlock-alt"></i> ';
+                }
                 tmpl += '</span>';
+            }
             if(obj_dict && state.type == 'group'){
                     tmpl += '<i class="icon-folder-close"></i> ';
+            }
             tmpl += state.text;
             return tmpl;
+        }
         $("#repo_switcher").select2({
-            placeholder: '<i class="icon-archive"></i> ${_('Repositories')}',
+            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,28) == '<i class="icon-archive"></i>'){
+                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')){
                 $('#header-inner').removeClass('hover');
                 $('#content').removeClass('hover');
+            }
             else{
                 $('#header-inner').addClass('hover');
                 $('#content').addClass('hover');
+            }
             return false;
         });
         // general nav g + action
         Mousetrap.bind(['g h'], function(e) {
             window.location = pyroutes.url('home');
         });
         Mousetrap.bind(['g g'], function(e) {
             window.location = pyroutes.url('gists', {'private':1});
         });
         Mousetrap.bind(['g G'], function(e) {
             window.location = pyroutes.url('gists', {'public':1});
         });
         Mousetrap.bind(['n g'], function(e) {
             window.location = pyroutes.url('new_gist');
         });
         Mousetrap.bind(['n r'], function(e) {
             window.location = pyroutes.url('new_repo');
         });
         % if hasattr(c, 'repo_name') and hasattr(c, 'db_repo'):
             // nav in repo context
             Mousetrap.bind(['g s'], function(e) {
                 window.location = pyroutes.url('summary_home', {'repo_name': REPO_NAME});
             });

kallithea/templates/journal/journal.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Journal')}
     %if c.site_name:
         &middot; ${c.site_name}
     %endif
 </%def>
 <%def name="breadcrumbs()">
     <h5>
     <form id="filter_form">
     <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/>
     <span class="tooltip" title="${h.tooltip(h.journal_filter_help())}">?</span>
     <input type='submit' value="${_('Filter')}" class="btn btn-small" style="padding:0px 2px 0px 2px;margin:0px"/>
     ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}
     </form>
     ${h.end_form()}
     </h5>
 </%def>
 <%def name="page_nav()">
     ${self.menu('journal')}
 </%def>
 <%def name="head_extra()">
 <link href="${h.url('journal_atom', api_key=c.authuser.api_key)}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" />
 <link href="${h.url('journal_rss', api_key=c.authuser.api_key)}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />
 </%def>
 <%def name="main()">
     <div class="box box-left">
         <!-- box / title -->
         <div class="title">
          ${self.breadcrumbs()}
          <ul class="links icon-only-links">
            <li>
              <span><a id="refresh" href="${h.url('journal')}"><i class="icon-refresh"></i></a></span>
            </li>
            <li>
              <span><a href="${h.url('journal_atom', api_key=c.authuser.api_key)}"><i class="icon-rss-sign"></i></a></span>
            </li>
          </ul>
         </div>
         <div id="journal">${c.journal_data}</div>
     </div>
     <div class="box box-right">
         <!-- box / title -->
         <div class="title">
             <h5>
             <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value="" style="display: none"/>
             <input class="q_filter_box" id="q_filter_watched" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value="" style="display: none"/>
             </h5>
             <ul class="links nav nav-tabs">
                 <li class="active" id="show_watched_li">
                     <a id="show_watched" href="#watched"><i class="icon-eye-open"></i> ${_('Watched')}</a>
                 </li>
                 <li id="show_my_li">
-                    <a id="show_my" href="#my"><i class="icon-archive"></i> ${_('My Repos')}</a>
+                    <a id="show_my" href="#my"><i class="icon-database"></i> ${_('My Repos')}</a>
                </li>
             </ul>
         </div>
         <!-- end box / title -->
         <div id="my_container" style="display:none">
             <div class="table-grid table yui-skin-sam" id="repos_list_wrap"></div>
             <div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
         </div>
         <div id="watched_container">
             <div class="table-grid table yui-skin-sam" id="watched_repos_list_wrap"></div>
             <div id="watched-user-paginator" style="padding: 0px 0px 0px 20px"></div>
         </div>
     </div>
     <script type="text/javascript">
     $('#j_filter').click(function(){
         var $jfilter = $('#j_filter');
         if($jfilter.hasClass('initial')){
             $jfilter.val('');
+        }
     });
     var fix_j_filter_width = function(len){
         $('#j_filter').css('width', Math.max(80, len*6.50)+'px');
     };
     $('#j_filter').keyup(function(){
         fix_j_filter_width($('#j_filter').val().length);
     });
     $('#filter_form').submit(function(e){
         e.preventDefault();
         var val = $('#j_filter').val();
         window.location = "${url.current(filter='__FILTER__')}".replace('__FILTER__',val);
     });
     fix_j_filter_width($('#j_filter').val().length);
     $('#refresh').click(function(e){
         asynchtml("${h.url.current(filter=c.search_term)}", $("#journal"), function(){
             show_more_event();
             tooltip_activate();
             show_changeset_tooltip();
             });
         e.preventDefault();
     });
     var show_my = function(e){
         $('#watched_container').hide();
         $('#my_container').show();
         $('#q_filter').show();
         $('#q_filter_watched').hide();
         $('#show_my_li').addClass('active');
         $('#show_watched_li').removeClass('active');
         if(!$('#show_my').hasClass('loaded')){
             table_renderer(${c.data |n});
             $('#show_my').addClass('loaded');
+        }
     };
     $('#show_my').click(function(){
         show_my();
     });
     var show_watched = function(){
         $('#my_container').hide();
         $('#watched_container').show();
         $('#q_filter_watched').show();
         $('#q_filter').hide();
         $('#show_watched_li').addClass('active');
         $('#show_my_li').removeClass('active');
         if(!$('#show_watched').hasClass('loaded')){
             watched_renderer(${c.watched_data |n});
             $('#show_watched').addClass('loaded');
+        }
     };
     $('#show_watched').click(function(){
         show_watched();
     });
     //init watched
     show_watched();
     var tabs = {
         'watched': show_watched,
         'my': show_my
+    }
     var url = location.href.split('#');
     if (url[1]) {
         //We have a hash
         var tabHash = url[1];
         var func = tabs[tabHash]
         if (func){
             func();
+        }
+    }
     function watched_renderer(data){
         var myDataSource = new YAHOO.util.DataSource(data);

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -31,369 +31,369 @@ @@
     <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>"
     <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" />
 <script>
 redirect_hash_branch = function(){
     var branch = window.location.hash.replace(/^#(.*)/, '$1');
     if (branch){
         window.location = "${h.url('changelog_home',repo_name=c.repo_name,branch='__BRANCH__')}"
             .replace('__BRANCH__',branch);
+    }
+}
 redirect_hash_branch();
 window.onhashchange = function() {
     redirect_hash_branch();
 };
 </script>
 </%def>
 <%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)}">
                   <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:
                 <div id="lang_stats"></div>
                 %else:
                    ${_('Statistics are disabled for this repository')}
                    %if h.HasPermissionAll('hg.admin')('enable stats on from summary'):
                         ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_statistics'),class_="btn btn-mini")}
                    %endif
                 %endif
               </div>
             </div>
             <div class="field">
               <div class="label-summary">
                   <label>${_('Download')}:</label>
               </div>
               <div class="input ${summary(c.show_stats)}">
                 %if len(c.db_repo_scm_instance.revisions) == 0:
                   ${_('There are no downloads yet')}
                 %elif not c.enable_downloads:
                   ${_('Downloads are disabled for this repository')}
                     %if h.HasPermissionAll('hg.admin')('enable downloads on from summary'):
                         ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_downloads'),class_="btn btn-mini")}
                     %endif
                 %else:
                     <span id="${'zip_link'}">
-                        <a class="btn btn-small" href="${h.url('files_archive_home',repo_name=c.db_repo.repo_name,fname='tip.zip')}"><i class="icon-archive"></i> ${_('Download as zip')}</a>
+                        <a class="btn btn-small" href="${h.url('files_archive_home',repo_name=c.db_repo.repo_name,fname='tip.zip')}"><i class="icon-file-zip"></i> ${_('Download as zip')}</a>
                     </span>
                     ${h.hidden('download_options')}
                     <span style="vertical-align: bottom">
                       <input id="archive_subrepos" type="checkbox" name="subrepos" />
                       <label for="archive_subrepos" class="tooltip" title="${h.tooltip(_('Check this to download archive with subrepos'))}" >${_('with subrepos')}</label>
                     </span>
                 %endif
               </div>
             </div>
         </div>
         <div id="summary-menu-stats">
           <ul>
             <li>
                <a title="${_('Owner')} ${c.db_repo.user.email}">
                 <i class="icon-user"></i> ${c.db_repo.user.username}
                   <div class="gravatar" style="float: right; margin: 0px 0px 0px 0px" title="${c.db_repo.user.name} ${c.db_repo.user.lastname}">
                      <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')}
                 <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-archive"></i> ${_('Repository Size')}</a>
+              <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>
             %if c.authuser.username != 'default':
               <a href="${h.url('atom_feed_home',repo_name=c.db_repo.repo_name,api_key=c.authuser.api_key)}"><i class="icon-rss-sign"></i> ${_('Feed')}</a>
             %else:
               <a href="${h.url('atom_feed_home',repo_name=c.db_repo.repo_name)}"><i class="icon-rss-sign"></i> ${_('Feed')}</a>
             %endif
             </li>
             %if c.show_stats:
             <li>
               <a title="${_('Statistics')}" href="${h.url('repo_stats_home',repo_name=c.repo_name)}">
                 <i class="icon-bar-chart"></i> ${_('Statistics')}
               </a>
             </li>
             %endif
           </ul>
         </div>
     </div>
 </div>
 <div class="box">
     <div class="title">
         <div class="breadcrumbs">
         %if c.repo_changesets:
             ${h.link_to(_('Latest Changes'),h.url('changelog_home',repo_name=c.repo_name))}
         %else:
             ${_('Quick Start')}
          %endif
         </div>
     </div>
     <div class="table">
         <div id="shortlog_data">
             <%include file='../changelog/changelog_summary_data.html'/>
         </div>
     </div>
 </div>
 %if c.readme_data:
 <div id="readme" class="anchor">
 <div class="box" style="background-color: #FAFAFA">
     <div class="title" title="${_('Readme file from revision %s:%s') % (c.db_repo.landing_rev[0], c.db_repo.landing_rev[1])}">
         <div class="breadcrumbs">
             <a href="${h.url('files_home',repo_name=c.repo_name,revision='tip',f_path=c.readme_file)}">${c.readme_file}</a>
         </div>
     </div>
     <div class="readme">
       <div class="readme_box">
         ${c.readme_data|n}
       </div>
     </div>
 </div>
 </div>
 %endif
 <script type="text/javascript">
 $(document).ready(function(){
     var $clone_url = $('#clone_url');
     var $clone_url_id = $('#clone_url_id');
     var $clone_by_name = $('#clone_by_name');
     var $clone_by_id = $('#clone_by_id');
     $clone_url.click(function(e){
         if($clone_url.hasClass('selected')){
             return ;
         }else{
             $clone_url.addClass('selected');
             $clone_url.select();
+        }
     });
     $clone_by_name.click(function(e){
         // show url by name and hide name button
         $clone_url.show();
         $clone_by_name.hide();
         // hide url by id and show name button
         $clone_by_id.show();
         $clone_url_id.hide();
     });
     $clone_by_id.click(function(e){
         // show url by id and hide id button
         $clone_by_id.hide();
         $clone_url_id.show();
         // hide url by name and show id button
         $clone_by_name.show();
         $clone_url.hide();
     });
     var cache = {}
     $("#download_options").select2({
         placeholder: _TM['Select changeset'],
         dropdownAutoWidth: true,
         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})
+                    }
                 })
                 data.results.push({'text': section, 'children': children})
             });
             query.callback(data);
           }else{
               $.ajax({
                 url: pyroutes.url('repo_refs_data', {'repo_name': '${c.repo_name}'}),
                 data: {},
                 dataType: 'json',
                 type: 'GET',
                 success: function(data) {
                   cache[key] = data;
                   query.callback({results: data.results});
+                }
               })
+          }
+        }
     });
     // on change of download options
     $('#download_options').change(function(e){
        var new_cs = e.added
        for(k in tmpl_links){
            var s = $('#'+k+'_link');
            if(s){
              var title_tmpl = "${_('Download %s as %s') % ('__CS_NAME__','__CS_EXT__')}";
              title_tmpl= title_tmpl.replace('__CS_NAME__',new_cs.text);
              title_tmpl = title_tmpl.replace('__CS_EXT__',k);
-             title_tmpl = '<i class="icon-archive"></i> '+ title_tmpl;
+             title_tmpl = '<i class="icon-file-zip"></i> '+ title_tmpl;
              var url = tmpl_links[k].replace('__CS__',new_cs.id);
              var subrepos = $('#archive_subrepos').is(':checked');
              url = url.replace('__SUB__',subrepos);
              url = url.replace('__NAME__',title_tmpl);
              s.html(url)
+           }
+       }
     });
     var tmpl_links = {};
     %for cnt,archive in enumerate(c.db_repo_scm_instance._get_archives()):
       tmpl_links["${archive['type']}"] = '${h.link_to('__NAME__', h.url('files_archive_home',repo_name=c.db_repo.repo_name, fname='__CS__'+archive['extension'],subrepos='__SUB__'),class_='btn btn-small')}';
     %endfor
 })
 </script>
 %if c.show_stats:
 <script type="text/javascript">
 $(document).ready(function(){
     var data = ${c.trending_languages|n};
     var total = 0;
     var no_data = true;
     var tbl = document.createElement('table');
     tbl.setAttribute('class','trending_language_tbl');
     var cnt = 0;
     for (var i=0;i<data.length;i++){
         total+= data[i][1].count;
+    }
     for (var i=0;i<data.length;i++){
         cnt += 1;
         no_data = false;
         var hide = cnt>2;
         var tr = document.createElement('tr');
         if (hide){
             tr.setAttribute('style','display:none');
             tr.setAttribute('class','stats_hidden');
+        }
         var k = data[i][0];
         var obj = data[i][1];
         var percentage = Math.round((obj.count/total*100),2);
         var td1 = document.createElement('td');
         td1.width = 150;
         var trending_language_label = document.createElement('div');
         trending_language_label.innerHTML = obj.desc+" ("+k+")";
         td1.appendChild(trending_language_label);
         var td2 = document.createElement('td');
         td2.setAttribute('style','padding-right:14px !important');
         var trending_language = document.createElement('div');
         var nr_files = obj.count+" ${_('files')}";
         trending_language.title = k+" "+nr_files;
         if (percentage>22){
             trending_language.innerHTML = "<b style='font-size:0.8em'>"+percentage+"% "+nr_files+ "</b>";
+        }
         else{
             trending_language.innerHTML = "<b style='font-size:0.8em'>"+percentage+"%</b>";
+        }
         trending_language.setAttribute("class", 'trending_language top-right-rounded-corner bottom-right-rounded-corner');
         trending_language.style.width=percentage+"%";
         td2.appendChild(trending_language);
         tr.appendChild(td1);
         tr.appendChild(td2);
         tbl.appendChild(tr);
         if(cnt == 3){
             var show_more = document.createElement('tr');
             var td = document.createElement('td');
             lnk = document.createElement('a');
             lnk.href='#';
             lnk.innerHTML = "${_('Show more')}";
             lnk.id='code_stats_show_more';
             td.appendChild(lnk);
             show_more.appendChild(td);
             show_more.appendChild(document.createElement('td'));
             tbl.appendChild(show_more);
+        }
+    }
     $('#lang_stats').appendChild(tbl);
     $('#code_status_show_more').click(function(){
         $('.stats_hidden').show();
         $('#code_status_show_more').hide();
     });
 });
 </script>
 %endif

0 comments (0 inline, 0 general)