aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Kuzminski <marcin@python-works.com>2013-01-18 01:05:23 +0100
committerMarcin Kuzminski <marcin@python-works.com>2013-01-18 01:05:23 +0100
commit164c637e785679c80b6505007442d73b4a4ac4fa (patch)
treea19cf29fac8b2c0a80af0421957086fe1818f94f
parenta05739ed01f617d61b6a149b5f9313d47acdd651 (diff)
whitespace cleanup
--HG-- branch : beta
-rw-r--r--rhodecode/controllers/api/api.py4
-rw-r--r--rhodecode/lib/base.py4
-rw-r--r--rhodecode/templates/admin/repos/repos.html2
-rw-r--r--rhodecode/templates/admin/users/user_edit_my_account.html6
-rw-r--r--rhodecode/templates/admin/users/user_edit_my_account_repos.html1
-rw-r--r--rhodecode/templates/data_table/_dt_elements.html3
-rw-r--r--rhodecode/templates/index_base.html2
-rw-r--r--rhodecode/templates/journal/journal.html28
-rw-r--r--rhodecode/tests/functional/test_home.py1
9 files changed, 24 insertions, 27 deletions
diff --git a/rhodecode/controllers/api/api.py b/rhodecode/controllers/api/api.py
index a4b94a7f..fc185df0 100644
--- a/rhodecode/controllers/api/api.py
+++ b/rhodecode/controllers/api/api.py
@@ -219,7 +219,7 @@ class ApiController(JSONRPCController):
elif HasRepoPermissionAnyApi('repository.admin',
'repository.write')(user=apiuser,
repo_name=repo.repo_name):
- #make sure normal user does not pass someone else userid,
+ #make sure normal user does not pass someone else userid,
#he is not allowed to do that
if not isinstance(userid, Optional) and userid != apiuser.user_id:
raise JSONRPCError(
@@ -270,7 +270,7 @@ class ApiController(JSONRPCController):
:param userid:
"""
if HasPermissionAnyApi('hg.admin')(user=apiuser) is False:
- #make sure normal user does not pass someone else userid,
+ #make sure normal user does not pass someone else userid,
#he is not allowed to do that
if not isinstance(userid, Optional) and userid != apiuser.user_id:
raise JSONRPCError(
diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py
index da847754..873ece86 100644
--- a/rhodecode/lib/base.py
+++ b/rhodecode/lib/base.py
@@ -44,8 +44,8 @@ def _get_ip_addr(environ):
ip = environ.get(proxy_key2)
if ip:
# HTTP_X_FORWARDED_FOR can have mutliple ips inside
- # the left-most being the original client, and each successive proxy
- # that passed the request adding the IP address where it received the
+ # the left-most being the original client, and each successive proxy
+ # that passed the request adding the IP address where it received the
# request from.
if ',' in ip:
ip = ip.split(',')[0].strip()
diff --git a/rhodecode/templates/admin/repos/repos.html b/rhodecode/templates/admin/repos/repos.html
index 0efa023b..67ad9ddd 100644
--- a/rhodecode/templates/admin/repos/repos.html
+++ b/rhodecode/templates/admin/repos/repos.html
@@ -72,7 +72,7 @@
sortOptions: { sortFunction: nameSort }},
{key:"desc",label:"${_('Description')}",sortable:true},
{key:"last_changeset",label:"${_('Tip')}",sortable:true,
- sortOptions: { sortFunction: revisionSort }},
+ sortOptions: { sortFunction: revisionSort }},
{key:"owner",label:"${_('Owner')}",sortable:true},
{key:"action",label:"${_('Action')}",sortable:false},
];
diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html
index be1eb456..868b0158 100644
--- a/rhodecode/templates/admin/users/user_edit_my_account.html
+++ b/rhodecode/templates/admin/users/user_edit_my_account.html
@@ -100,7 +100,7 @@
</div>
<div id="pullrequests_container" class="table" style="display:none">
## loaded via AJAX
- ${_('Loading...')}
+ ${_('Loading...')}
</div>
</div>
@@ -202,14 +202,14 @@ function table_renderer(data){
}
return res;
}
-
+
// main table sorting
var myColumnDefs = [
{key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
{key:"name",label:"${_('Name')}",sortable:true,
sortOptions: { sortFunction: nameSort }},
{key:"last_changeset",label:"${_('Tip')}",sortable:true,
- sortOptions: { sortFunction: revisionSort }},
+ sortOptions: { sortFunction: revisionSort }},
{key:"action",label:"${_('Action')}",sortable:false},
];
diff --git a/rhodecode/templates/admin/users/user_edit_my_account_repos.html b/rhodecode/templates/admin/users/user_edit_my_account_repos.html
index 8b137891..e69de29b 100644
--- a/rhodecode/templates/admin/users/user_edit_my_account_repos.html
+++ b/rhodecode/templates/admin/users/user_edit_my_account_repos.html
@@ -1 +0,0 @@
-
diff --git a/rhodecode/templates/data_table/_dt_elements.html b/rhodecode/templates/data_table/_dt_elements.html
index c62318a1..8ea532a9 100644
--- a/rhodecode/templates/data_table/_dt_elements.html
+++ b/rhodecode/templates/data_table/_dt_elements.html
@@ -122,7 +122,7 @@
${h.submit('remove_%s' % repo_name,_('delete'),class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo_name+"');")}
${h.end_form()}
</div>
- </div>
+ </div>
</%def>
<%def name="user_actions(user_id, username)">
@@ -141,4 +141,3 @@
onclick="javascript:toggleFollowingRepo(this, ${repo_id},'${str(h.get_token())}')">
</span>
</%def>
-
diff --git a/rhodecode/templates/index_base.html b/rhodecode/templates/index_base.html
index ccfe7ec8..c97e3458 100644
--- a/rhodecode/templates/index_base.html
+++ b/rhodecode/templates/index_base.html
@@ -213,7 +213,7 @@
quick_repo_menu();
var func = function(node){
return node.parentNode.parentNode.parentNode.parentNode;
- }
+ }
q_filter('q_filter',YUQ('div.table tr td a.repo_name'),func);
});
diff --git a/rhodecode/templates/journal/journal.html b/rhodecode/templates/journal/journal.html
index b0a26739..664a7d18 100644
--- a/rhodecode/templates/journal/journal.html
+++ b/rhodecode/templates/journal/journal.html
@@ -43,7 +43,7 @@
</div>
<div class="box box-right">
<!-- box / title -->
-
+
<div class="title">
<h5>
<input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}" style="display: none"/>
@@ -62,14 +62,14 @@
</li>
%endif
</ul>
- </div>
-
+ </div>
+
<!-- end box / title -->
<div id="my_container" style="display:none">
<div class="table yui-skin-sam" id="repos_list_wrap"></div>
<div id="user-paginator" style="padding: 0px 0px 0px 20px"></div>
</div>
-
+
<div id="watched_container">
<div class="table yui-skin-sam" id="watched_repos_list_wrap"></div>
<div id="watched-user-paginator" style="padding: 0px 0px 0px 20px"></div>
@@ -104,8 +104,8 @@
show_changeset_tooltip();
});
YUE.preventDefault(e);
- });
-
+ });
+
var show_my = function(e){
YUD.setStyle('watched_container','display','none');
YUD.setStyle('my_container','display','');
@@ -114,7 +114,7 @@
YUD.addClass('show_my', 'current');
YUD.removeClass('show_watched','current');
-
+
if(!YUD.hasClass('show_my', 'loaded')){
table_renderer(${c.data |n});
YUD.addClass('show_my', 'loaded');
@@ -134,8 +134,8 @@
if(!YUD.hasClass('show_watched', 'loaded')){
watched_renderer(${c.watched_data |n});
YUD.addClass('show_watched', 'loaded');
- }
-
+ }
+
return
var nodes = YUQ('#watched_container .watched_repo a');
var target = 'q_filter';
@@ -201,7 +201,7 @@
{key:"name",label:"${_('Name')}",sortable:true,
sortOptions: { sortFunction: nameSort }},
{key:"last_changeset",label:"${_('Tip')}",sortable:true,
- sortOptions: { sortFunction: revisionSort }},
+ sortOptions: { sortFunction: revisionSort }},
{key:"action",label:"${_('Action')}",sortable:false},
];
@@ -266,7 +266,7 @@
filterTimeout = setTimeout(updateFilter,600);
});
}
-
+
function table_renderer(data){
var myDataSource = new YAHOO.util.DataSource(data);
myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
@@ -305,7 +305,7 @@
{key:"name",label:"${_('Name')}",sortable:true,
sortOptions: { sortFunction: nameSort }},
{key:"last_changeset",label:"${_('Tip')}",sortable:true,
- sortOptions: { sortFunction: revisionSort }},
+ sortOptions: { sortFunction: revisionSort }},
{key:"action",label:"${_('Action')}",sortable:false},
];
@@ -369,7 +369,7 @@
clearTimeout(filterTimeout);
filterTimeout = setTimeout(updateFilter,600);
});
- }
-
+ }
+
</script>
</%def>
diff --git a/rhodecode/tests/functional/test_home.py b/rhodecode/tests/functional/test_home.py
index 941463f6..b23df06c 100644
--- a/rhodecode/tests/functional/test_home.py
+++ b/rhodecode/tests/functional/test_home.py
@@ -106,4 +106,3 @@ merge" class="tooltip" href="/vcs_test_hg/changeset/27cd5cce30c96924232"""
RepoModel().delete('gr1/repo_in_group')
ReposGroupModel().delete(repos_group='gr1', force_delete=True)
Session().commit()
- \ No newline at end of file