kallithea Changeset - be3823704f21

Changeset - be3823704f21

Parent rev.

Child rev.

[Not reviewed]

default

1 8 0

Sean Farley - 11 years ago 2014-07-15 06:55:15
sean.michael.farley@gmail.com

arrow_inout.png: replace icon-loop with icon-git-compare

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

9 files changed with 8 insertions and 15 deletions:

kallithea/public/css/contextbar.css

kallithea/public/css/style.css

kallithea/public/images/icons/arrow_inout.png

bin+del

kallithea/templates/base/base.html

kallithea/templates/changelog/changelog.html

kallithea/templates/changeset/changeset_range.html

kallithea/templates/compare/compare_diff.html

kallithea/templates/forks/forks_data.html

kallithea/templates/pullrequests/pullrequest_show_all.html

0 comments (0 inline, 0 general)

kallithea/public/css/contextbar.css

➞

Show inline comments

@@ @@ -6,26 +6,24 @@ i.icon-arrow-right { background-image: u @@
 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-merge { background-image: url("../images/icons/arrow_merge.png"); } /* unused! */
 i.icon-ellipsis-horizontal:after { content: ' ...';}
 i.icon-eye-open { background-image: url("../images/icons/eye.png"); }
 i.icon-file-txt { background-image: url("../images/icons/note_error.png"); }
 i.icon-git { background-image: url('../images/icons/giticon.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-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-refresh { background-image: url('../images/icons/arrow_refresh.png');}
 i.icon-tag { background-image: url("../images/icons/tag_blue.png"); }
 i.icon-unlock { background-image: url('../images/icons/lock_open.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-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');}

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -536,29 +536,24 @@ div.header img { @@
+}
 #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.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;
+}

kallithea/public/images/icons/arrow_inout.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -161,27 +161,27 @@ @@
         <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-sliders"></i> ${_('Options')}</a>
              %else:
                <a href="#" class="dropdown"><i class="icon-sliders"></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>
+                   <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-loop"></i> ${_('Compare')}</a></li>
+              <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

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -53,25 +53,25 @@ ${self.repo_context_bar('changelog', c.f @@
                         <div style="float: right; margin: 0px 0px 0px 4px">
                             <a href="#" class="btn btn-small" id="rev_range_container" style="display:none"></a>
                             <a href="#" class="btn btn-small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
                             %if c.revision:
                                 <a class="btn btn-small" href="${h.url('changelog_home', repo_name=c.repo_name)}">
                                     ${_('Go to tip of repository')}
                                 </a>
                             %endif
                             %if c.db_repo.fork:
                                 <a id="compare_fork"
                                    title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}"
                                    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)}"
-                                   class="btn btn-small"><i class="icon-loop"></i> ${_('Compare fork with parent repo (%s)' % c.db_repo.fork.repo_name)}</a>
+                                   class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare fork with parent repo (%s)' % c.db_repo.fork.repo_name)}</a>
                             %endif
                             ## text and href of open_new_pr is controlled from javascript
                             <a id="open_new_pr" class="btn btn-small"></a>
                             ${_("Branch filter:")} ${h.select('branch_filter',c.branch_name,c.branch_filters)}
                         </div>
                     </div>
                 </div>
                 <div id="changelog" style="clear:both">
                 <div id="graph_nodes">
                     <canvas id="graph_canvas"></canvas>

kallithea/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -24,25 +24,25 @@ ${self.repo_context_bar('changelog')} @@
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
         <div id="body" class="diffblock">
             <div class="code-header">
                 <div>
                     ${h.show_id(c.cs_ranges[0])}
                     <i class="icon-arrow-right"></i>
                     ${h.show_id(c.cs_ranges[-1])}
-                    <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-loop"></i> Compare Revisions</a>
+                    <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-git-compare"></i> Compare Revisions</a>
                 </div>
             </div>
         </div>
         <div id="changeset_compare_view_content">
             <div class="container">
             <table class="compare_view_commits noborder">
             %for cnt,cs in enumerate(c.cs_ranges):
                 <tr>
                 <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>
                 <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>
                 <td><div class="author">${h.person(cs.author)}</div></td>
                 <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>

kallithea/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -26,25 +26,25 @@ ${self.repo_context_bar('changelog')} @@
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
         <div id="body" class="diffblock">
             <div class="code-header">
                 <div>
                     ${h.hidden('compare_org')} <i class="icon-arrow-right"></i> ${h.hidden('compare_other')}
                     %if not c.compare_home:
                         <a class="btn btn-small" href="${c.swap_url}"><i class="icon-refresh"></i> ${_('Swap')}</a>
                     %endif
-                    <div id="compare_revs" class="btn btn-small"><i class="icon-loop"></i> ${_('Compare Revisions')}</div>
+                    <div id="compare_revs" class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Revisions')}</div>
                 </div>
             </div>
         </div>
     %if c.compare_home:
         <div id="changeset_compare_view_content">
          <div style="color:#999;font-size: 18px">${_('Compare revisions, branches, bookmarks, or tags.')}</div>
         </div>
     %else:
         <div id="changeset_compare_view_content">
                 ##CS
                 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>

kallithea/templates/forks/forks_data.html

➞

Show inline comments

@@ @@ -9,25 +9,25 @@ @@
                 </div>
                 <span style="font-size: 20px">
                  <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname}) /
                   ${h.link_to(f.repo_name,h.url('summary_home',repo_name=f.repo_name))}
                 </span>
                 <div style="padding:5px 3px 3px 42px;">${f.description}</div>
             </div>
             <div style="clear:both;padding-top: 10px"></div>
             <div class="follower_date">${_('Forked')} -
                 <span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span>
                 <a title="${_('Compare fork with %s' % c.repo_name)}"
                    href="${h.url('compare_url',repo_name=c.repo_name, org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=f.repo_name,other_ref_type=c.db_repo.landing_rev[0],other_ref_name=c.db_repo.landing_rev[1], merge=1)}"
-                   class="btn btn-small"><i class="icon-loop"></i> ${_('Compare Fork')}</a>
+                   class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Fork')}</a>
             </div>
             <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
         </div>
     % endfor
   <div class="pagination-wh pagination-left">
   <script type="text/javascript">
   $(document).ready(function(){
       var $forks = $('#forks');
       $forks.on('click','.pager_link',function(e){
           asynchtml(e.target.href, $forks, function(){
               show_more_event();
               tooltip_activate();

kallithea/templates/pullrequests/pullrequest_show_all.html

➞

Show inline comments

@@ @@ -26,27 +26,27 @@ ${self.repo_context_bar('showpullrequest @@
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
              %if c.authuser.username != 'default':
               <span>
                   <a id="open_new_pr" class="btn btn-small btn-success" href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-plus"></i> ${_('Open New Pull Request')}</a>
               </span>
              %endif
               <span>
                 %if c.from_:
-                    <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed)}"><i class="icon-loop-2"></i> ${_('Show Pull Requests to %s') % c.repo_name}</a>
+                    <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed)}"><i class="icon-git-compare"></i> ${_('Show Pull Requests to %s') % c.repo_name}</a>
                 %else:
-                    <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1)}"><i class="icon-loop-2"></i> ${_("Show Pull Requests from '%s'") % c.repo_name}</a>
+                    <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1)}"><i class="icon-git-compare"></i> ${_("Show Pull Requests from '%s'") % c.repo_name}</a>
                 %endif
               </span>
           </li>
         </ul>
     </div>
     <div style="margin: 0 20px">
         <div>
         %if c.closed:
             ${h.link_to(_('Hide closed pull requests (only show open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_))}
         %else:
             ${h.link_to(_('Show closed pull requests (in addition to open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_,closed=1))}

0 comments (0 inline, 0 general)