Mercurial > kallithea
changeset 3168:2fb94c52e20e beta
whitespace cleanup
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Fri, 18 Jan 2013 01:05:23 +0100 |
| parents | 87258a137018 |
| children | a649599ad8b7 |
| files | rhodecode/controllers/api/api.py rhodecode/lib/base.py rhodecode/templates/admin/repos/repos.html rhodecode/templates/admin/users/user_edit_my_account.html rhodecode/templates/admin/users/user_edit_my_account_repos.html rhodecode/templates/data_table/_dt_elements.html rhodecode/templates/index_base.html rhodecode/templates/journal/journal.html rhodecode/tests/functional/test_home.py |
| diffstat | 9 files changed, 24 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/api/api.py Fri Jan 18 01:01:22 2013 +0100 +++ b/rhodecode/controllers/api/api.py Fri Jan 18 01:05:23 2013 +0100 @@ -219,7 +219,7 @@ 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 @@ :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(
--- a/rhodecode/lib/base.py Fri Jan 18 01:01:22 2013 +0100 +++ b/rhodecode/lib/base.py Fri Jan 18 01:05:23 2013 +0100 @@ -44,8 +44,8 @@ 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()
--- a/rhodecode/templates/admin/repos/repos.html Fri Jan 18 01:01:22 2013 +0100 +++ b/rhodecode/templates/admin/repos/repos.html Fri Jan 18 01:05:23 2013 +0100 @@ -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}, ];
--- a/rhodecode/templates/admin/users/user_edit_my_account.html Fri Jan 18 01:01:22 2013 +0100 +++ b/rhodecode/templates/admin/users/user_edit_my_account.html Fri Jan 18 01:05:23 2013 +0100 @@ -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 @@ } 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}, ];
--- a/rhodecode/templates/admin/users/user_edit_my_account_repos.html Fri Jan 18 01:01:22 2013 +0100 +++ b/rhodecode/templates/admin/users/user_edit_my_account_repos.html Fri Jan 18 01:05:23 2013 +0100 @@ -1,1 +0,0 @@ -
--- a/rhodecode/templates/data_table/_dt_elements.html Fri Jan 18 01:01:22 2013 +0100 +++ b/rhodecode/templates/data_table/_dt_elements.html Fri Jan 18 01:05:23 2013 +0100 @@ -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> -
--- a/rhodecode/templates/index_base.html Fri Jan 18 01:01:22 2013 +0100 +++ b/rhodecode/templates/index_base.html Fri Jan 18 01:05:23 2013 +0100 @@ -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); });
--- a/rhodecode/templates/journal/journal.html Fri Jan 18 01:01:22 2013 +0100 +++ b/rhodecode/templates/journal/journal.html Fri Jan 18 01:05:23 2013 +0100 @@ -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>
--- a/rhodecode/tests/functional/test_home.py Fri Jan 18 01:01:22 2013 +0100 +++ b/rhodecode/tests/functional/test_home.py Fri Jan 18 01:05:23 2013 +0100 @@ -106,4 +106,3 @@ RepoModel().delete('gr1/repo_in_group') ReposGroupModel().delete(repos_group='gr1', force_delete=True) Session().commit() - \ No newline at end of file