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

@@ @@ -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

@@ @@ -45,19 +45,19 @@ @@
 }
 #header #header-inner #quick a,
 #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 {
     display: inline-block;
     width: 16px;
     height: 16px;
@@ @@ -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,15 +418,14 @@ 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 ;
     padding-left: 10px;
+}
 #header #header-inner #quick li span.icon_short {
     top: 0;
     left: 0;
     border-left: none;
@@ @@ -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/admin/repos/repo_edit.html

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ @@
 <%def name="page_nav()">
     ${self.menu('options')}
 </%def>
 <%def name="main()">
- ${self.context_bar('options')}
 ${self.context_bar('options')}
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repo', repo_name=c.repo_info.repo_name),method='put')}

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

@@ @@ -22,13 +22,13 @@ ${self.context_bar('changelog')} @@
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <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>
                     %if c.rhodecode_db_repo.fork:
                         <a id="compare_fork" title="${_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default',merge=1)}" class="ui-btn small">${_('Compare fork with parent')}</a>
                     %endif
@@ @@ -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>
@@ @@ -124,31 +123,31 @@ ${self.context_bar('changelog')} @@
                 //Monitor range checkboxes and build a link to changesets
                 //ranges
                 var checkboxes = YUD.getElementsByClassName('changeset_range');
                 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){
                             checked_checkboxes.push(checkboxes[pos]);
+                        }
+                    }
                     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;
                         var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
                         var url = url_tmpl.replace('__REVRANGE__',
                                 rev_start+'...'+rev_end);
@@ @@ -162,31 +161,31 @@ ${self.context_bar('changelog')} @@
                         YUD.get('rev_range_container').href = url;
                         YUD.get('rev_range_container').innerHTML = link;
                         YUD.setStyle('rev_range_container','display','');
                         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);
                 });
                 var msgs = YUQ('.message');
                 // get first element height
                 var el = YUQ('#graph_content .container')[0];
@@ @@ -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};

rhodecode/templates/files/files.html

➞

Show inline comments

@@ @@ -13,13 +13,13 @@ @@
 <%def name="page_nav()">
     ${self.menu('files')}
 </%def>
 <%def name="main()">
- ${self.context_bar('files')}
 ${self.context_bar('files')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
             <li>

rhodecode/templates/search/search.html

➞

Show inline comments

@@ @@ -26,13 +26,13 @@ @@
     ${self.menu('options')}
     %else:
     ${self.menu('search')}
     %endif
 </%def>
 <%def name="main()">
- ${self.context_bar('options')}
 ${self.context_bar('options')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->

rhodecode/templates/shortlog/shortlog.html

➞

Show inline comments

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

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -15,13 +15,13 @@ @@
 <%def name="head_extra()">
 <link href="${h.url('atom_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('repo %s ATOM feed') % c.repo_name}" type="application/atom+xml" />
 <link href="${h.url('rss_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('repo %s RSS feed') % c.repo_name}" type="application/rss+xml" />
 </%def>
 <%def name="main()">
-    ${self.context_bar('summary')}
 ${self.context_bar('summary')}
     <%
     summary = lambda n:{False:'summary-short'}.get(n)
     %>
     %if c.show_stats:
         <div class="box box-left">
     %else:

0 comments (0 inline, 0 general)