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

13 files changed with 30 insertions and 46 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/admin/repos/repo_edit.html

rhodecode/templates/base/base.html

rhodecode/templates/base/root.html

rhodecode/templates/changelog/changelog.html

rhodecode/templates/files/files.html

rhodecode/templates/search/search.html

rhodecode/templates/shortlog/shortlog.html

rhodecode/templates/summary/summary.html

0 comments (0 inline, 0 general)

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -314,7 +314,6 @@ class BaseRepoController(BaseController) @@
     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):

rhodecode/lib/utils2.py

➞

Show inline comments

@@ @@ -355,7 +355,6 @@ def age(prevdate, show_short_version=Fal @@
     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

rhodecode/public/css/contextbar.css

➞

Show inline comments

@@ @@ -48,13 +48,13 @@ @@
 #content #context-bar,
 #content #context-bar a,
 #content #context-bar button {
-     color: #FFFFFF;
     color: #FFFFFF;
 }
 #header #header-inner #quick a:hover,
 #content #context-bar a:hover,
 #content #context-bar button:hover {
-     text-decoration: none;
     text-decoration: none;
 }
 #content #context-bar .icon {
@@ @@ -162,6 +162,7 @@ ul#context-actions { @@
     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);
@@ @@ -252,7 +253,7 @@ ul#context-actions { @@
     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+ */

rhodecode/public/css/style.css

➞

Show inline comments

@@ modified file chmod 100644 => 100755 @@
@@ @@ -421,9 +421,8 @@ div:hover > a.permalink { @@
+}
 #header #header-inner #quick li span.icon {
     border-left: none;
-    padding-left: 10px ;
     padding-left: 10px;
+}
 #header #header-inner #quick li span.icon_short {
@@ @@ -1725,7 +1724,6 @@ div.form div.fields div.field div.button @@
     padding-right: 10px;
+}
 #repo_size_2 {
     margin-left: 30px;
     display: block;
@@ @@ -2514,10 +2512,6 @@ h3.files_location { @@
     border-color: #cdcdcd;
+}
 #graph_content .container {
+}
 #graph_content #changesets td {
     overflow: hidden;
     text-overflow: ellipsis;

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -576,7 +576,6 @@ var showRepoSize = function(target, repo @@
     return false;
+}
 /**
  * TOOLTIP IMPL.
  */

rhodecode/templates/admin/repos/repo_edit.html

➞

Show inline comments

@@ @@ -14,7 +14,7 @@ @@
 </%def>
 <%def name="main()">
- ${self.context_bar('options')}
 ${self.context_bar('options')}
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -83,7 +83,7 @@ @@
 <%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>
@@ @@ -129,10 +129,6 @@ @@
       %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>

rhodecode/templates/base/root.html

➞

Show inline comments

@@ @@ -11,7 +11,6 @@ @@
         <%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()}

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -25,7 +25,7 @@ ${self.context_bar('changelog')} @@
     <div class="table">
         % if c.pagination:
             <div id="graph">
-                    <div class="info_box" style="clear: both;padding: 10px 6px;min-height: 12px;text-align: right;">
                 <div class="info_box" style="clear: both;padding: 10px 6px;min-height: 12px;text-align: right;">
                     <a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a>
                     <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
@@ @@ -110,7 +110,6 @@ ${self.context_bar('changelog')} @@
                 </tbody>
                 </table>
                 <div class="pagination-wh pagination-left">
                     ${c.pagination.pager('$link_previous ~2~ $link_next')}
                 </div>
@@ @@ -127,7 +126,7 @@ ${self.context_bar('changelog')} @@
                 var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}";
                 var pr_tmpl = "${h.url('pullrequest_home',repo_name=c.repo_name)}";
-                    var checkbox_checker = function(e){
                 var checkbox_checker = function(e){
                     var checked_checkboxes = [];
                     for (pos in checkboxes){
                         if(checkboxes[pos].checked){
@@ @@ -135,17 +134,17 @@ ${self.context_bar('changelog')} @@
+                        }
+                    }
                     if(YUD.get('open_new_pr')){
                             if(checked_checkboxes.length>1){
                               YUD.setStyle('open_new_pr','display','none');
                             } else {
                                YUD.setStyle('open_new_pr','display','');
                         if(checked_checkboxes.length>1){
                             YUD.setStyle('open_new_pr','display','none');
                         } else {
                             YUD.setStyle('open_new_pr','display','');
                             if(checked_checkboxes.length>0){
                               YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets'];
+                                YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets'];
                             }else{
                               YUD.get('open_new_pr').innerHTML = _TM['Open new pull request'];
+                                YUD.get('open_new_pr').innerHTML = _TM['Open new pull request'];
+                            }
+                          }
+                        }
+                    }
                     if(checked_checkboxes.length>0){
                         var rev_end = checked_checkboxes[0].name;
@@ @@ -165,25 +164,25 @@ ${self.context_bar('changelog')} @@
                         YUD.setStyle('rev_range_clear','display','');
                         YUD.get('open_new_pr').href = pr_tmpl + '?rev_start={0}&rev_end={1}'.format(rev_start,rev_end);
                             YUD.setStyle('compare_fork','display','none');
                     } else{
                         YUD.setStyle('compare_fork','display','none');
                     }else{
                         YUD.setStyle('rev_range_container','display','none');
                         YUD.setStyle('rev_range_clear','display','none');
                             if (checkboxes){
                                 YUD.get('open_new_pr').href = pr_tmpl + '?rev_end={0}'.format(checkboxes[0].name);
+                            }
                             YUD.setStyle('compare_fork','display','');
                         if (checkboxes){
                             YUD.get('open_new_pr').href = pr_tmpl + '?rev_end={0}'.format(checkboxes[0].name);
+                        }
                     };
                     YUE.onDOMReady(checkbox_checker);
                     YUE.on(checkboxes,'click', checkbox_checker);
                         YUD.setStyle('compare_fork','display','');
+                    }
                 };
                 YUE.onDOMReady(checkbox_checker);
                 YUE.on(checkboxes,'click', checkbox_checker);
                 YUE.on('rev_range_clear','click',function(e){
                     for (var i=0; i<checkboxes.length; i++){
                         var cb = checkboxes[i];
                         cb.checked = false;
+                    }
-                        checkbox_checker();
                     checkbox_checker();
                     YUE.preventDefault(e);
                 });
@@ @@ -234,9 +233,7 @@ ${self.context_bar('changelog')} @@
                     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;

rhodecode/templates/files/files.html

➞

Show inline comments

@@ @@ -16,7 +16,7 @@ @@
 </%def>
 <%def name="main()">
- ${self.context_bar('files')}
 ${self.context_bar('files')}
 <div class="box">
     <!-- box / title -->
     <div class="title">

rhodecode/templates/search/search.html

➞

Show inline comments

@@ @@ -29,7 +29,7 @@ @@
     %endif
 </%def>
 <%def name="main()">
- ${self.context_bar('options')}
 ${self.context_bar('options')}
 <div class="box">
     <!-- box / title -->
     <div class="title">

rhodecode/templates/shortlog/shortlog.html

➞

Show inline comments

@@ @@ -20,7 +20,7 @@ @@
     ${self.menu('shortlog')}
 </%def>
 <%def name="main()">
- ${self.context_bar('options')}
 ${self.context_bar('options')}
 <div class="box">
     <!-- box / title -->
     <div class="title">

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -18,7 +18,7 @@ @@
 </%def>
 <%def name="main()">
-    ${self.context_bar('summary')}
 ${self.context_bar('summary')}
     <%
     summary = lambda n:{False:'summary-short'}.get(n)
     %>

0 comments (0 inline, 0 general)