kallithea Changeset - 2ba39763ae7e

Changeset - 2ba39763ae7e

Parent rev.

Child rev.

[Not reviewed]

default

1 2 0

Sean Farley - 11 years ago 2014-07-21 15:46:31
sean.michael.farley@gmail.com

block_16.png: use new icon-block font

3 files changed with 1 insertions and 11 deletions:

kallithea/public/css/style.css

kallithea/public/images/icons/block_16.png

bin+del

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -3042,394 +3042,384 @@ table.code-browser i[class^='icon-'] { @@
+}
 .box .search div.search_path div.link a {
     color: #577632;
     cursor: pointer;
     text-decoration: none;
+}
 #path_unlock {
     color: red;
     font-size: 1.2em;
     padding-left: 4px;
+}
 .info_box span {
     margin-left: 3px;
     margin-right: 3px;
+}
 .info_box .rev {
     color: #577632;
     font-size: 1.6em;
     font-weight: bold;
     vertical-align: sub;
+}
 .info_box input#at_rev,
 .info_box input#size {
     background: #FFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     color: #000;
     font-size: 12px;
     margin: 0;
     padding: 1px 5px 1px;
+}
 .info_box input#view {
     text-align: center;
     padding: 4px 3px 2px 2px;
+}
 .info_box_elem {
     display: inline-block;
     padding: 0 2px;
+}
 .yui-overlay, .yui-panel-container {
     visibility: hidden;
     position: absolute;
     z-index: 2;
+}
 #tip-box {
     position: absolute;
     background-color: #FFF;
     border: 2px solid #577632;
     font: 100% sans-serif;
     width: auto;
     opacity: 1;
     padding: 8px;
     white-space: pre-wrap;
     -webkit-border-radius: 8px 8px 8px 8px;
     -khtml-border-radius: 8px 8px 8px 8px;
     border-radius: 8px 8px 8px 8px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
     -webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
     z-index: 100000;
+}
 .hl-tip-box {
     z-index: 1;
     position: absolute;
     color: #666;
     background-color: #FFF;
     border: 2px solid #577632;
     font: 100% sans-serif;
     width: auto;
     opacity: 1;
     padding: 8px;
     white-space: pre-wrap;
     -webkit-border-radius: 8px 8px 8px 8px;
     -khtml-border-radius: 8px 8px 8px 8px;
     border-radius: 8px 8px 8px 8px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 .mentions-container {
     width: 90% !important;
+}
 .mentions-container .yui-ac-content {
     width: 100% !important;
+}
 .ac {
     vertical-align: top;
+}
 .ac .yui-ac {
     position: inherit;
     font-size: 100%;
+}
 .ac .perm_ac {
     width: 20em;
+}
 .ac .yui-ac-input {
     width: 100%;
+}
 .ac .yui-ac-container {
     position: absolute;
     top: 1.6em;
     width: auto;
+}
 .ac .yui-ac-content {
     position: absolute;
     border: 1px solid gray;
     background: #fff;
     z-index: 9050;
+}
 .ac .yui-ac-shadow {
     position: absolute;
     width: 100%;
     background: #000;
     opacity: .10;
     filter: alpha(opacity = 10);
     z-index: 9049;
     margin: .3em;
+}
 .ac .yui-ac-content ul {
     width: 100%;
     margin: 0;
     padding: 0;
     z-index: 9050;
+}
 .ac .yui-ac-content li {
     cursor: default;
     white-space: nowrap;
     margin: 0;
     padding: 2px 5px;
     height: 18px;
     z-index: 9050;
     display: block;
     width: auto !important;
+}
 .ac .yui-ac-content li .ac-container-wrap {
     width: auto;
+}
 .ac .yui-ac-content li.yui-ac-prehighlight {
     background: #B3D4FF;
     z-index: 9050;
+}
 .ac .yui-ac-content li.yui-ac-highlight {
     background: #556CB5;
     color: #FFF;
     z-index: 9050;
+}
 .ac .yui-ac-bd {
     z-index: 9050;
+}
 .reposize {
     background: url("../images/icons/server.png") no-repeat scroll 3px;
     height: 16px;
     width: 20px;
     cursor: pointer;
     display: block;
     float: right;
     margin-top: 2px;
+}
 #repo_size {
     display: block;
     margin-top: 4px;
     color: #666;
     float: right;
+}
 .locking_locked {
     background: #FFF url("../images/icons/block_16.png") no-repeat scroll 3px;
     height: 16px;
     width: 20px;
     cursor: pointer;
     display: block;
     float: right;
     margin-top: 2px;
+}
 .currently_following {
     padding-left: 10px;
     padding-bottom: 5px;
+}
 .pull_icon {
     background: url("../images/icons/connect.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .archive_icon {
     background: url("../images/icons/compress.png") no-repeat scroll 3px;
     padding-left: 20px;
     text-align: left;
     padding-top: 1px;
+}
 .start_following_icon {
     background: url("../images/icons/heart_add.png") no-repeat scroll 3px;
     padding-left: 20px;
     text-align: left;
     padding-top: 0px;
+}
 .action_button {
     border: 0;
     display: inline;
+}
 .action_button:hover {
     border: 0;
     text-decoration: underline;
     cursor: pointer;
+}
 #switch_repos {
     position: absolute;
     height: 25px;
     z-index: 1;
+}
 #switch_repos select {
     min-width: 150px;
     max-height: 250px;
     z-index: 1;
+}
 .breadcrumbs {
     border: medium none;
     color: #FFF;
     float: left;
     font-weight: 700;
     font-size: 14px;
     margin: 0;
     padding: 11px 0 11px 10px;
+}
 .breadcrumbs .hash {
     text-transform: none;
     color: #fff;
+}
 .breadcrumbs a {
     color: #FFF;
+}
 .flash_msg {
+}
 .flash_msg ul {
+}
 .error_red {
     color: red;
+}
 .flash_msg .alert-error {
     background-color: #c43c35;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35) );
     background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
     background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35) );
     background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
     background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
     background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b',endColorstr='#c43c35', GradientType=0 );
     border-color: #c43c35 #c43c35 #882a25;
+}
 .flash_msg .alert-error a {
     text-decoration: underline;
+}
 .flash_msg .alert-warning {
     color: #404040 !important;
     background-color: #eedc94;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94) );
     background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
     background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94) );
     background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
     background-image: -o-linear-gradient(top, #fceec1, #eedc94);
     background-image: linear-gradient(to bottom, #fceec1, #eedc94);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0 );
     border-color: #eedc94 #eedc94 #e4c652;
+}
 .flash_msg .alert-warning a {
     text-decoration: underline;
+}
 .flash_msg .alert-success {
     background-color: #57a957;
     background-repeat: repeat-x !important;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957) );
     background-image: -moz-linear-gradient(top, #62c462, #57a957);
     background-image: -ms-linear-gradient(top, #62c462, #57a957);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957) );
     background-image: -webkit-linear-gradient(top, #62c462, #57a957);
     background-image: -o-linear-gradient(top, #62c462, #57a957);
     background-image: linear-gradient(to bottom, #62c462, #57a957);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0 );
     border-color: #57a957 #57a957 #3d773d;
+}
 .flash_msg .alert-success a {
     text-decoration: underline;
     color: #FFF !important;
+}
 .flash_msg .alert-info {
     background-color: #339bb9;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9) );
     background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
     background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9) );
     background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
     background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
     background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0 );
     border-color: #339bb9 #339bb9 #22697d;
+}
 .flash_msg .alert-info a {
     text-decoration: underline;
+}
 .flash_msg .alert-error,
 .flash_msg .alert-warning,
 .flash_msg .alert-success,
 .flash_msg .alert-info {
     font-size: 12px;
     font-weight: 700;
     min-height: 14px;
     line-height: 14px;
     margin-bottom: 10px;
     margin-top: 0;
     display: block;
     overflow: auto;
     padding: 6px 10px 6px 10px;
     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
     position: relative;
     color: #FFF;
     border-width: 1px;
     border-style: solid;
     -webkit-border-radius: 4px;
     border-radius: 4px;
     -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
     box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+}
 #msg_close {
     background: transparent url("../images/cross_grey_small.png") no-repeat scroll 0 0;
     cursor: pointer;
     height: 16px;
     position: absolute;
     right: 5px;
     top: 5px;
     width: 16px;
+}
 div#legend_data {
     padding-left: 10px;
+}
 div#legend_container table {
     border: none !important;
+}
 div#legend_container table,

kallithea/public/images/icons/block_16.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/templates/summary/summary.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('%s Summary') % c.repo_name}
     %if c.site_name:
         &middot; ${c.site_name}
     %endif
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Summary')}
     ## locking icon
     %if c.db_repo.enable_locking:
      %if c.db_repo.locked[0]:
        <span class="locking_locked tooltip" title="${_('Repository locked by %s') % h.person_by_id(c.db_repo.locked[0])}"></span>
+       <span class="locking_locked tooltip icon-block" title="${_('Repository locked by %s') % h.person_by_id(c.db_repo.locked[0])}"></span>
      %else:
        <span class="locking_unlocked tooltip icon-ok" title="${_('Repository unlocked')}"></span>
      %endif
     %endif
     ##FORK
     %if c.db_repo.fork:
     <span>
         - <i class="icon-fork"></i> ${_('Fork of')} "<a href="${h.url('summary_home',repo_name=c.db_repo.fork.repo_name)}">${c.db_repo.fork.repo_name}</a>"
     </span>
     %endif
     ##REMOTE
     %if c.db_repo.clone_uri:
     <span>
        - <i class="icon-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-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-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-ruler"></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-squared"></i> ${_('Feed')}</a>
             %else:
               <a href="${h.url('atom_feed_home',repo_name=c.db_repo.repo_name)}"><i class="icon-rss-squared"></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-graph"></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">

0 comments (0 inline, 0 general)