aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Kuzminski <marcin@python-works.com>2013-01-05 02:26:39 +0100
committerMarcin Kuzminski <marcin@python-works.com>2013-01-05 02:26:39 +0100
commitf1be0d1d72f2993078fa8b5b99659e23f8eb0240 (patch)
tree75357f84d7c51b72d0571addd4eb446707128e18
parent5294ac1c4b98913cefc79934b70c13f5cf8ec6a3 (diff)
white space cleanup
--HG-- branch : beta
-rw-r--r--rhodecode/controllers/pullrequests.py2
-rw-r--r--rhodecode/lib/helpers.py1
-rw-r--r--rhodecode/lib/utils.py2
-rw-r--r--rhodecode/model/validators.py2
-rw-r--r--rhodecode/templates/admin/admin.html1
-rw-r--r--rhodecode/templates/admin/admin_log.html2
-rw-r--r--rhodecode/templates/base/root.html4
-rw-r--r--rhodecode/templates/changeset/changeset.html10
-rw-r--r--rhodecode/templates/changeset/changeset_file_comment.html2
-rw-r--r--rhodecode/templates/email_templates/pull_request.html2
-rw-r--r--rhodecode/templates/index_base.html2
-rw-r--r--rhodecode/templates/journal/journal.html6
-rw-r--r--rhodecode/templates/pullrequests/pullrequest_show.html2
-rw-r--r--rhodecode/templates/settings/repo_settings.html2
-rw-r--r--rhodecode/tests/models/test_user_permissions_on_repos.py2
15 files changed, 19 insertions, 23 deletions
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py
index fffbd520..fa08b632 100644
--- a/rhodecode/controllers/pullrequests.py
+++ b/rhodecode/controllers/pullrequests.py
@@ -97,7 +97,7 @@ class PullrequestsController(BaseRepoController):
return repo.branches.keys()[0]
def _get_is_allowed_change_status(self, pull_request):
- owner = self.rhodecode_user.user_id == pull_request.user_id
+ owner = self.rhodecode_user.user_id == pull_request.user_id
reviewer = self.rhodecode_user.user_id in [x.user_id for x in
pull_request.reviewers]
return (self.rhodecode_user.admin or owner or reviewer)
diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
index 21bd554b..aa6696eb 100644
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -1170,4 +1170,3 @@ def ip_range(ip_addr):
from rhodecode.model.db import UserIpMap
s, e = UserIpMap._get_ip_range(ip_addr)
return '%s - %s' % (s, e)
-
diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py
index 716c2c6d..24a3ffa6 100644
--- a/rhodecode/lib/utils.py
+++ b/rhodecode/lib/utils.py
@@ -751,4 +751,4 @@ def jsonify(func, *args, **kwargs):
warnings.warn(msg, Warning, 2)
log.warning(msg)
log.debug("Returning JSON wrapped action output")
- return json.dumps(data, encoding='utf-8') \ No newline at end of file
+ return json.dumps(data, encoding='utf-8')
diff --git a/rhodecode/model/validators.py b/rhodecode/model/validators.py
index a9fe81fe..61ed0583 100644
--- a/rhodecode/model/validators.py
+++ b/rhodecode/model/validators.py
@@ -566,7 +566,7 @@ def ValidPerms(type_='repo'):
def ValidSettings():
class _validator(formencode.validators.FancyValidator):
def _to_python(self, value, state):
- # settings form for users that are not admin
+ # settings form for users that are not admin
# can't edit certain parameters, it's extra backup if they mangle
# with forms
diff --git a/rhodecode/templates/admin/admin.html b/rhodecode/templates/admin/admin.html
index 80c4b3b4..d77f31cd 100644
--- a/rhodecode/templates/admin/admin.html
+++ b/rhodecode/templates/admin/admin.html
@@ -53,4 +53,3 @@ YUE.on('filter_form','submit',function(e){
fix_j_filter_width(YUD.get('j_filter').value.length);
</script>
</%def>
-
diff --git a/rhodecode/templates/admin/admin_log.html b/rhodecode/templates/admin/admin_log.html
index c50e2163..5c98c2a5 100644
--- a/rhodecode/templates/admin/admin_log.html
+++ b/rhodecode/templates/admin/admin_log.html
@@ -16,7 +16,7 @@
${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))}
%else:
${l.username}
- %endif
+ %endif
</td>
<td>${h.action_parser(l)[0]()}
<div class="journal_action_params">
diff --git a/rhodecode/templates/base/root.html b/rhodecode/templates/base/root.html
index e207b4ed..83ad7fe1 100644
--- a/rhodecode/templates/base/root.html
+++ b/rhodecode/templates/base/root.html
@@ -74,7 +74,7 @@
return false;
}
})(window);
-
+
YUE.onDOMReady(function(){
tooltip_activate();
show_more_event();
@@ -83,7 +83,7 @@
YUE.on('quick_login_link','click',function(e){
// make sure we don't redirect
YUE.preventDefault(e);
-
+
if(YUD.hasClass('quick_login_link','enabled')){
YUD.setStyle('quick_login','display','none');
YUD.removeClass('quick_login_link','enabled');
diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html
index 37649206..1be9452a 100644
--- a/rhodecode/templates/changeset/changeset.html
+++ b/rhodecode/templates/changeset/changeset.html
@@ -40,7 +40,7 @@
%endfor
%else:
<span>${_('No parents')}</span>
- %endif
+ %endif
</div>
<div class="children">
%if c.changeset.children:
@@ -50,10 +50,10 @@
%endfor
%else:
<span>${_('No children')}</span>
- %endif
- </div>
+ %endif
+ </div>
<div class="code-header banner">
-
+
<div class="hash">
r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
</div>
@@ -74,7 +74,7 @@
${c.context_url(request.GET)}
</div>
<div class="comments-number" style="float:right;padding-right:5px">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}</div>
- </div>
+ </div>
</div>
<div id="changeset_content">
<div class="container">
diff --git a/rhodecode/templates/changeset/changeset_file_comment.html b/rhodecode/templates/changeset/changeset_file_comment.html
index 50d69136..c9aa552f 100644
--- a/rhodecode/templates/changeset/changeset_file_comment.html
+++ b/rhodecode/templates/changeset/changeset_file_comment.html
@@ -130,7 +130,7 @@
<div id="status_block_container" class="status-block" style="display:none">
%for status,lbl in c.changeset_statuses:
<div class="">
- <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">
+ <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}">
<label for="${status}">${lbl}</label>
</div>
%endfor
diff --git a/rhodecode/templates/email_templates/pull_request.html b/rhodecode/templates/email_templates/pull_request.html
index 91193d4e..c84ff5dd 100644
--- a/rhodecode/templates/email_templates/pull_request.html
+++ b/rhodecode/templates/email_templates/pull_request.html
@@ -15,5 +15,3 @@ ${body}
<li>${r}</li>
%endfor
</ul>
-
-
diff --git a/rhodecode/templates/index_base.html b/rhodecode/templates/index_base.html
index 48d32925..c89dc0b2 100644
--- a/rhodecode/templates/index_base.html
+++ b/rhodecode/templates/index_base.html
@@ -268,7 +268,7 @@
{key:"last_change",label:"${_('Last Change')}",sortable:true,
sortOptions: { sortFunction: ageSort }},
{key:"tip",label:"${_('Tip')}",sortable:true,
- sortOptions: { sortFunction: revisionSort }},
+ sortOptions: { sortFunction: revisionSort }},
{key:"owner",label:"${_('Owner')}",sortable:true},
{key:"rss",label:"",sortable:false},
{key:"atom",label:"",sortable:false},
diff --git a/rhodecode/templates/journal/journal.html b/rhodecode/templates/journal/journal.html
index dd9db024..5d9600c0 100644
--- a/rhodecode/templates/journal/journal.html
+++ b/rhodecode/templates/journal/journal.html
@@ -114,7 +114,7 @@
</div>
<script type="text/javascript">
-
+
YUE.on('j_filter','click',function(){
var jfilter = YUD.get('j_filter');
if(YUD.hasClass(jfilter, 'initial')){
@@ -132,8 +132,8 @@
var val = YUD.get('j_filter').value;
window.location = "${url.current(filter='__FILTER__')}".replace('__FILTER__',val);
});
- fix_j_filter_width(YUD.get('j_filter').value.length);
-
+ fix_j_filter_width(YUD.get('j_filter').value.length);
+
var show_my = function(e){
YUD.setStyle('watched','display','none');
YUD.setStyle('my','display','');
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html
index 2388b6dc..9e8220b6 100644
--- a/rhodecode/templates/pullrequests/pullrequest_show.html
+++ b/rhodecode/templates/pullrequests/pullrequest_show.html
@@ -198,7 +198,7 @@
// inject comments into they proper positions
var file_comments = YUQ('.inline-comment-placeholder');
renderInlineComments(file_comments);
-
+
YUE.on(YUD.get('update_pull_request'),'click',function(e){
updateReviewers();
})
diff --git a/rhodecode/templates/settings/repo_settings.html b/rhodecode/templates/settings/repo_settings.html
index 37ca4cf7..1b61be27 100644
--- a/rhodecode/templates/settings/repo_settings.html
+++ b/rhodecode/templates/settings/repo_settings.html
@@ -94,7 +94,7 @@
${h.submit('save',_('Save'),class_="ui-btn large")}
${h.reset('reset',_('Reset'),class_="ui-btn large")}
</div>
-
+
</div>
${h.end_form()}
</div>
diff --git a/rhodecode/tests/models/test_user_permissions_on_repos.py b/rhodecode/tests/models/test_user_permissions_on_repos.py
index bd8841cc..da810542 100644
--- a/rhodecode/tests/models/test_user_permissions_on_repos.py
+++ b/rhodecode/tests/models/test_user_permissions_on_repos.py
@@ -1 +1 @@
-#TODO; write tests when we activate algo for permissions. \ No newline at end of file
+#TODO; write tests when we activate algo for permissions.