Mercurial > kallithea
changeset 2907:0b86972de820 beta
white space cleanup
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 09 Oct 2012 00:14:41 +0200 |
| parents | c008f1b0cf62 |
| children | 3148c08cf86f 3dfa25f35482 |
| files | rhodecode/controllers/settings.py rhodecode/lib/db_manage.py rhodecode/templates/admin/users/user_edit_my_account.html rhodecode/templates/pullrequests/pullrequest.html rhodecode/templates/pullrequests/pullrequest_show.html rhodecode/templates/shortlog/shortlog_data.html rhodecode/tests/functional/test_compare.py rhodecode/tests/test_libs.py |
| diffstat | 8 files changed, 18 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/settings.py Tue Oct 09 00:14:14 2012 +0200 +++ b/rhodecode/controllers/settings.py Tue Oct 09 00:14:41 2012 +0200 @@ -188,4 +188,3 @@ h.flash(_('An error occurred during unlocking'), category='error') return redirect(url('summary_home', repo_name=repo_name)) -
--- a/rhodecode/lib/db_manage.py Tue Oct 09 00:14:14 2012 +0200 +++ b/rhodecode/lib/db_manage.py Tue Oct 09 00:14:41 2012 +0200 @@ -667,4 +667,4 @@ if not __py_version__ >= (2, 6): notify('Python2.5 detected, please switch ' 'egg:waitress#main -> egg:Paste#http ' - 'in your .ini file') \ No newline at end of file + 'in your .ini file')
--- a/rhodecode/templates/admin/users/user_edit_my_account.html Tue Oct 09 00:14:14 2012 +0200 +++ b/rhodecode/templates/admin/users/user_edit_my_account.html Tue Oct 09 00:14:41 2012 +0200 @@ -118,7 +118,7 @@ YUD.setStyle('my','display','none'); YUD.setStyle('pullrequests','display','none'); YUD.setStyle('perms','display',''); - YUD.setStyle('q_filter','display','none'); + YUD.setStyle('q_filter','display','none'); } YUE.on('show_perms','click',function(e){ show_perms(); @@ -134,12 +134,12 @@ YUD.setStyle('my','display',''); YUD.setStyle('q_filter','display',''); - + var url = "${h.url('admin_settings_my_repos')}"; ypjax(url, 'my', function(){ table_sort(); filter_activate(); - }); + }); } YUE.on('show_my','click',function(e){ show_my(e); @@ -154,9 +154,9 @@ YUD.setStyle('perms','display','none'); YUD.setStyle('pullrequests','display',''); YUD.setStyle('q_filter','display','none'); - + var url = "${h.url('admin_settings_my_pullrequests')}"; - ypjax(url, 'pullrequests'); + ypjax(url, 'pullrequests'); } YUE.on('show_pullrequests','click',function(e){ show_pullrequests(e) @@ -167,12 +167,12 @@ 'my': show_my, 'pullrequests': show_pullrequests } -var url = location.href.split('#'); -if (url[1]) { - //We have a hash +var url = location.href.split('#'); +if (url[1]) { + //We have a hash var tabHash = url[1]; console.log(tabs, tabHash) - tabs[tabHash](); + tabs[tabHash](); } // main table sorting
--- a/rhodecode/templates/pullrequests/pullrequest.html Tue Oct 09 00:14:14 2012 +0200 +++ b/rhodecode/templates/pullrequests/pullrequest.html Tue Oct 09 00:14:41 2012 +0200 @@ -133,7 +133,7 @@ PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA); var other_repos_info = ${c.other_repos_info|n}; - + var loadPreview = function(){ YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none'); var url = "${h.url('compare_url', @@ -150,18 +150,18 @@ var select_ref_data = select_ref.value.split(':'); var key = null; var val = null; - + if(select_ref_data.length>1){ key = select_ref.name+"_type"; val = select_ref_data[0]; url = url.replace(key,val); rev_data[key] = val; - + key = select_ref.name; val = select_ref_data[1]; url = url.replace(key,val); rev_data[key] = val; - + }else{ key = select_ref.name; val = select_ref.value; @@ -175,7 +175,7 @@ // replace the <select> of changed repo YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs']; }); - + ypjax(url,'pull_request_overview', function(data){ var sel_box = YUQ('#pull_request_form #other_repo')[0]; var repo_name = sel_box.options[sel_box.selectedIndex].value;
--- a/rhodecode/templates/pullrequests/pullrequest_show.html Tue Oct 09 00:14:14 2012 +0200 +++ b/rhodecode/templates/pullrequests/pullrequest_show.html Tue Oct 09 00:14:41 2012 +0200 @@ -47,7 +47,7 @@ % if len(c.pull_request_pending_reviewers) > 0: <div class="tooltip" title="${h.tooltip(','.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div> %else: - <div>${_('pull request was reviewed by all reviewers')}</div> + <div>${_('pull request was reviewed by all reviewers')}</div> %endif </div> </div>
--- a/rhodecode/templates/shortlog/shortlog_data.html Tue Oct 09 00:14:14 2012 +0200 +++ b/rhodecode/templates/shortlog/shortlog_data.html Tue Oct 09 00:14:41 2012 +0200 @@ -25,7 +25,7 @@ %endif </div> %endif - </div> + </div> <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}">r${cs.revision}:${h.short_id(cs.raw_id)}</a></pre> </div> </td>
--- a/rhodecode/tests/functional/test_compare.py Tue Oct 09 00:14:14 2012 +0200 +++ b/rhodecode/tests/functional/test_compare.py Tue Oct 09 00:14:41 2012 +0200 @@ -400,4 +400,4 @@ self.assertFalse("""line1-from-new-parent""" in response.body) finally: RepoModel().delete(r2_id) - RepoModel().delete(r1_id) \ No newline at end of file + RepoModel().delete(r1_id)