kallithea Changeset - 685ebc84c2e9

Changeset - 685ebc84c2e9

Parent rev.

Child rev.

[Not reviewed]

beta

0 15 0

Marcin Kuzminski - 13 years ago 2012-11-26 20:14:40
marcin@python-works.com

White space cleanup

15 files changed with 22 insertions and 23 deletions:

rhodecode/controllers/feed.py

rhodecode/lib/diffs.py

rhodecode/lib/ext_json.py

rhodecode/templates/admin/repos/repo_edit.html

rhodecode/templates/admin/users_groups/users_group_edit.html

rhodecode/templates/changelog/changelog.html

rhodecode/templates/compare/compare_diff.html

rhodecode/templates/files/files.html

rhodecode/templates/files/files_history_box.html

rhodecode/templates/files/files_source.html

rhodecode/templates/pullrequests/pullrequest.html

rhodecode/templates/pullrequests/pullrequest_show.html

rhodecode/templates/tags/tags.html

rhodecode/templates/tags/tags_data.html

rhodecode/tests/functional/test_compare.py

0 comments (0 inline, 0 general)

rhodecode/controllers/feed.py

➞

Show inline comments

@@ @@ -180,4 +180,3 @@ class FeedController(BaseRepoController) @@
             region_invalidate(_get_feed_from_cache, None, key)
             CacheInvalidation.set_valid(inv.cache_key)
         return _get_feed_from_cache(key)

rhodecode/lib/diffs.py

➞

Show inline comments

@@ @@ -765,4 +765,4 @@ def differ(org_repo, org_ref, other_repo @@
                                       node2=org_repo[org_ref].node(),
                                       opts=opts))
     return ''
@@ \ No newline at end of file @@
     return ''

rhodecode/lib/ext_json.py

➞

Show inline comments

@@ @@ -119,4 +119,4 @@ if simplejson: @@
 elif stdlibjson:
     json = _json
 else:
     raise ImportError('Could not find any json modules')
@@ \ No newline at end of file @@
     raise ImportError('Could not find any json modules')

rhodecode/templates/admin/repos/repo_edit.html

➞

Show inline comments

@@ @@ -204,7 +204,7 @@ @@
                     </tr>
                   %for cache in c.repo_info.cache_keys:
                       <tr>
-                        <td>${cache.prefix or '-'}</td>
                         <td>${cache.prefix or '-'}</td>
                         <td>${cache.cache_key}</td>
                         <td>${h.bool2icon(cache.cache_active)}</td>
                       </tr>

rhodecode/templates/admin/users_groups/users_group_edit.html

➞

Show inline comments

@@ @@ -161,7 +161,7 @@ ${h.end_form()} @@
       </ul>
       %else:
         <span class="empty_data">${_('No members yet')}</span>
-      %endif
       %endif
     </div>
 </div>

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -161,7 +161,7 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
                           if(checked_checkboxes.length>0){
                             // modify open pull request to show we have selected cs
                             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'];
+                          }
@@ @@ -204,7 +204,7 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
                             YUD.setStyle('rev_range_clear','display','');
                             YUD.get('open_new_pr').href += '?rev_start={0}&rev_end={1}'.format(rev_start,rev_end);
+                        }
                         else{
                         	YUD.setStyle('rev_range_container','display','none');

rhodecode/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -39,13 +39,13 @@ @@
             ## FILES
             <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
             % if c.limited_diff:
                 ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}
             % else:
                 ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:
             %endif
             </div>
             <div class="cs_files">
               %if not c.files:
@@ @@ -60,7 +60,7 @@ @@
             </div>
             % if c.limited_diff:
               <h5>${_('Changeset was too big and was cut off...')}</h5>
-            % endif
             % endif
         </div>
     </div>

rhodecode/templates/files/files.html

➞

Show inline comments

@@ @@ -91,7 +91,7 @@ var callbacks = function(State){ @@
     ypjax_links();
     tooltip_activate();
     fileBrowserListeners(State.url, State.data.node_list_url, State.data.url_base);
     if(YUD.get('hlcode')){
     	YUE.on('hlcode', 'mouseup', getSelectionLink);
+    }

rhodecode/templates/files/files_history_box.html

➞

Show inline comments

@@ @@ -22,4 +22,4 @@ @@
         </div>
         <div style="clear:both"></div>
     </dd>
 </dl>
@@ \ No newline at end of file @@
 </dl>

rhodecode/templates/files/files_source.html

➞

Show inline comments

@@ @@ -106,8 +106,8 @@ YUE.onDOMReady(function(){ @@
         ypjax(_url, 'node_history', function(o){
         	tooltip_activate();
         })
-    });
     });
    });
 </script>

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -23,7 +23,7 @@ @@
     <div style="float:left;padding:0px 30px 30px 30px">
         <input type="hidden" name="rev_start" value="${request.GET.get('rev_start')}" />
         <input type="hidden" name="rev_end" value="${request.GET.get('rev_end')}" />
         ##ORG
         <div style="float:left">
             <div class="fork_user">

rhodecode/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -68,16 +68,16 @@ @@
               ##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>
               <%include file="/compare/compare_cs.html" />
               ## FILES
               <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
               % if c.limited_diff:
                   ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}
               % else:
                   ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:
               %endif
               </div>
               <div class="cs_files">
                 %if not c.files:
@@ @@ -92,7 +92,7 @@ @@
               </div>
               % if c.limited_diff:
                 <h5>${_('Changeset was too big and was cut off...')}</h5>
-              % endif
               % endif
           </div>
       </div>
       ## REVIEWERS

rhodecode/templates/tags/tags.html

➞

Show inline comments

@@ @@ -27,7 +27,7 @@ @@
     <!-- end box / title -->
     %if c.repo_tags:
     <div class="info_box" id="compare_tags" style="clear: both;padding: 10px 19px;vertical-align: right;text-align: right;"><a href="#" class="ui-btn small">${_('Compare tags')}</a></div>
-    %endif
     %endif
     <div class="table">
         <%include file='tags_data.html'/>
     </div>
@@ @@ -54,7 +54,7 @@ var myColumnDefs = [ @@
     {key:"author",label:"${_('Author')}",sortable:true},
     {key:"revision",label:"${_('Revision')}",sortable:true,
         sortOptions: { sortFunction: revisionSort }},
-    {key:"compare",label:"${_('Compare')}",sortable:false,},
     {key:"compare",label:"${_('Compare')}",sortable:false,},
 ];
 var myDataSource = new YAHOO.util.DataSource(YUD.get("tags_data"));

rhodecode/templates/tags/tags_data.html

➞

Show inline comments

@@ @@ -29,7 +29,7 @@ @@
             <td>
                 <input class="branch-compare" type="radio" name="compare_org" value="${tag[0]}"/>
                 <input class="branch-compare" type="radio" name="compare_other" value="${tag[0]}"/>
-            </td>
             </td>
 		</tr>
 		%endfor
     </table>

rhodecode/tests/functional/test_compare.py

➞

Show inline comments

@@ @@ -113,7 +113,7 @@ class TestCompareController(TestControll @@
         finally:
             RepoModel().delete(r2_id)
             RepoModel().delete(r1_id)
     def test_compare_forks_on_branch_extra_commits_origin_has_incomming_hg(self):
         self.log_user()

0 comments (0 inline, 0 general)