kallithea Changeset - 7967d00e4692

Changeset - 7967d00e4692

Parent rev.

Child rev.

[Not reviewed]

beta

0 13 0

Mads Kiilerich - 13 years ago 2013-03-19 21:47:34
madski@unity3d.com

Transplanted from: 6be5c256fb9b

Stylistic cleanup - mostly formatting

8 files changed with 3 insertions and 19 deletions:

rhodecode/lib/base.py

rhodecode/lib/utils2.py

rhodecode/public/css/contextbar.css

rhodecode/public/css/style.css

rhodecode/public/js/rhodecode.js

rhodecode/templates/base/base.html

rhodecode/templates/base/root.html

rhodecode/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -311,13 +311,12 @@ class BaseRepoController(BaseController) @@
     c.rhodecode_repo: instance of scm repository
     c.rhodecode_db_repo: instance of db
     c.repository_followers: number of followers
     c.repository_forks: number of forks
     c.repository_following: weather the current user is following the current repo
     """
     def __before__(self):
         super(BaseRepoController, self).__before__()
         if c.repo_name:

rhodecode/lib/utils2.py

➞

Show inline comments

@@ @@ -352,13 +352,12 @@ def engine_from_config(configuration, pr @@
 def age(prevdate, show_short_version=False):
     """
     turns a datetime into an age string.
     If show_short_version is True, then it will generate a not so accurate but shorter string,
     example: 2days ago, instead of 2 days and 23 hours ago.
     :param prevdate: datetime object
     :param show_short_version: if it should aproximate the date and return a shorter string
     :rtype: unicode
     :returns: unicode words describing age
     """
     now = datetime.datetime.now()

rhodecode/public/css/contextbar.css

➞

Show inline comments

@@ @@ -159,12 +159,13 @@ ul.horizontal-list li a { @@
 ul#context-actions {
     display: inline-block;
     float: right;
     border-radius: 4px;
     background-image: linear-gradient(top, #4574a2 0%, #2f5d8b 100%);
 }
 #content ul#context-actions li {
     padding: 0px;
     border-right: 1px solid rgba(0,0,0,0.1);
     border-left: 1px solid rgba(255,255,255,0.1);
 }
@@ @@ -249,13 +250,13 @@ ul#context-actions { @@
 #context-pages {
     float: right;
     border-left: 1px solid rgba(0,0,0,0.1);
 }
-#context-pages li.curreasdnt {
+#context-pages li.current {
     background: #535353; /* Old browsers */
     background: -moz-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* FF3.6+ */
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5d5d5d), color-stop(100%,#484848)); /* Chrome,Safari4+ */
     background: -webkit-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* Chrome10+,Safari5.1+ */
     background: -o-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* Opera 11.10+ */
     background: -ms-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* IE10+ */

rhodecode/public/css/style.css

➞

Show inline comments

@@ modified file chmod 100644 => 100755 @@
@@ @@ -418,13 +418,12 @@ div:hover > a.permalink { @@
 #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;
@@ @@ -1722,13 +1721,12 @@ div.form div.fields div.field div.button @@
     padding: 12px 30px;
     background-repeat: no-repeat;
     background-position: 10px 50%;
     padding-right: 10px;
+}
 #repo_size_2 {
     margin-left: 30px;
     display: block;
     padding-right: 10px;
     padding-bottom: 7px;
+}
@@ @@ -2511,16 +2509,12 @@ h3.files_location { @@
     border-collapse: collapse;
     border-left: none;
     border-right: none;
     border-color: #cdcdcd;
+}
 #graph_content .container {
+}
 #graph_content #changesets td {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     height: 31px;
     border-color: #cdcdcd;

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -573,13 +573,12 @@ var showRepoSize = function(target, repo @@
+            }
         },args);
+    }
     return false;
+}
 /**
  * TOOLTIP IMPL.
  */
 YAHOO.namespace('yuitip');
 YAHOO.yuitip.main = {

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -80,13 +80,13 @@ @@
       <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>
   </ul>
 </%def>
 <%def name="admin_menu_simple()">
   <ul>
-      <li>${h.link_to(_('repositories groups'),h.url('repos_groups'),class_='repos_groups')}</li>
+      <li>${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
   </ul>
 </%def>
 <%def name="repo_context_bar(current=None)">
   <%
       def follow_class():
@@ @@ -126,16 +126,12 @@ @@
           <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="pull-request">${_('Create Pull Request')}</a></li>
           %endif
         </ul>
       %endif
     </div>
     <div id="context-state">
       <!--button id="revision-changer">
         <span class="branch-name">graphics/shader-move</span>
         <span class="revision">@73318:8d3d6ee94072</span>
       </button-->
       <ul id="context-pages" class="horizontal-list">
         <li ${is_current('summary')}><a href="${h.url('summary_home', repo_name=c.repo_name)}" class="summary">${_('Summary')}</a></li>
         <li ${is_current('changelog')}><a href="${h.url('changelog_home', repo_name=c.repo_name)}" class="changelogs">${_('Changelog')}</a></li>
         <li ${is_current('files')}><a href="${h.url('files_home', repo_name=c.repo_name)}" class="files"></span>${_('Files')}</a></li>
         <li ${is_current('switch-to')}>
           <a href="#" id="branch_tag_switcher_2" class="dropdown switch-to"></span>${_('Switch To')}</a>

rhodecode/templates/base/root.html

➞

Show inline comments

@@ @@ -8,13 +8,12 @@ @@
         <link rel="icon" href="${h.url('/images/icons/database_gear.png')}" type="image/png" />
         ## CSS ###
         <%def name="css()">
             <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css', ver=c.rhodecode_version)}" media="screen"/>
             <link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css', ver=c.rhodecode_version)}"/>
             <link rel="stylesheet" type="text/css" href="${h.url('/css/contextbar.css', ver=c.rhodecode_version)}"/>
             ## EXTRA FOR CSS
             ${self.css_extra()}
         </%def>
         <%def name="css_extra()">
         </%def>

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -107,13 +107,12 @@ ${self.context_bar('changelog')} @@
                         </td>
                     </tr>
                 %endfor
                 </tbody>
                 </table>
                 <div class="pagination-wh pagination-left">
                     ${c.pagination.pager('$link_previous ~2~ $link_next')}
                 </div>
             </div>
         </div>
@@ @@ -231,15 +230,13 @@ ${self.context_bar('changelog')} @@
                 function set_canvas(width) {
                     var c = document.getElementById('graph_nodes');
                     var t = document.getElementById('graph_content');
                     canvas = document.getElementById('graph_canvas');
                     var div_h = t.clientHeight;
                     //c.style.height=div_h+'px';
                     canvas.setAttribute('height',div_h);
                     //c.style.height=width+'px';
                     canvas.setAttribute('width',width);
                 };
                 var heads = 1;
                 var line_count = 0;
                 var jsdata = ${c.jsdata|n};

0 comments (0 inline, 0 general)