aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/auth/views.py38
-rw-r--r--mediagoblin/edit/views.py9
-rw-r--r--mediagoblin/submit/views.py12
-rw-r--r--mediagoblin/user_pages/views.py16
-rw-r--r--mediagoblin/views.py6
5 files changed, 38 insertions, 43 deletions
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index a5112299..d54e673c 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -58,15 +58,14 @@ def register(request):
return exc.HTTPFound(
location=request.urlgen("mediagoblin.auth.register_success"))
- # render
- return render_to_response(
- request, 'mediagoblin/auth/register.html',
- {'register_form': register_form})
+ return render_to_response(request,
+ 'mediagoblin/auth/register.html',
+ {'register_form': register_form})
def register_success(request):
- return render_to_response(
- request, 'mediagoblin/auth/register_success.html', {})
+ return render_to_response(request,
+ 'mediagoblin/auth/register_success.html', {})
def login(request):
@@ -100,12 +99,11 @@ def login(request):
auth_lib.fake_login_attempt()
login_failed = True
- # render
- return render_to_response(
- request, 'mediagoblin/auth/login.html',
- {'login_form': login_form,
- 'next': request.GET.get('next') or request.POST.get('next'),
- 'login_failed': login_failed})
+ return render_to_response(request,
+ 'mediagoblin/auth/login.html',
+ {'login_form': login_form,
+ 'next': request.GET.get('next') or request.POST.get('next'),
+ 'login_failed': login_failed})
def logout(request):
@@ -138,10 +136,10 @@ def verify_email(request):
else:
verification_successful = False
- return render_to_response(
- request, 'mediagoblin/auth/verify_email.html',
- {'user': user,
- 'verification_successful': verification_successful})
+ return render_to_response(request,
+ 'mediagoblin/auth/verify_email.html',
+ {'user': user,
+ 'verification_successful': verification_successful})
def verify_email_notice(request):
"""
@@ -150,8 +148,8 @@ def verify_email_notice(request):
When the user tries to do some action that requires their account
to be verified beforehand, this view is called upon!
"""
- return render_to_response(
- request, 'mediagoblin/auth/verification_needed.html', {})
+ return render_to_response(request,
+ 'mediagoblin/auth/verification_needed.html', {})
def resend_activation(request):
@@ -171,5 +169,5 @@ def resend_activation(request):
def resend_activation_success(request):
- return render_to_response(
- request, 'mediagoblin/auth/resent_verification_email.html', {})
+ return render_to_response(request,
+ 'mediagoblin/auth/resent_verification_email.html', {})
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index ac286bec..258f14e3 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -56,8 +56,7 @@ def edit_media(request, media):
location=request.urlgen("mediagoblin.user_pages.media_home",
user=media.uploader()['username'], media=media['slug']))
- # render
- return render_to_response(
- request, 'mediagoblin/edit/edit.html',
- {'media': media,
- 'form': form})
+ return render_to_response(request,
+ 'mediagoblin/edit/edit.html',
+ {'media': media,
+ 'form': form})
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index a51e14e6..95257b72 100644
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -80,13 +80,11 @@ def submit_start(request):
return exc.HTTPFound(
location=request.urlgen("mediagoblin.submit.success"))
- # render
- return render_to_response(
- request, 'mediagoblin/submit/start.html',
- {'submit_form': submit_form})
+ return render_to_response(request,
+ 'mediagoblin/submit/start.html',
+ {'submit_form': submit_form})
def submit_success(request):
- # render
- return render_to_response(
- request, 'mediagoblin/submit/success.html', {})
+ return render_to_response(request,
+ 'mediagoblin/submit/success.html', {})
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 0442e736..e2fbcc80 100644
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -42,19 +42,19 @@ def user_home(request, page):
if media_entries == None:
return exc.HTTPNotFound()
- return render_to_response(
- request, 'mediagoblin/user_pages/user.html',
- {'user': user,
- 'media_entries': media_entries,
- 'pagination': pagination})
+ return render_to_response(request,
+ 'mediagoblin/user_pages/user.html',
+ {'user': user,
+ 'media_entries': media_entries,
+ 'pagination': pagination})
@get_user_media_entry
def media_home(request, media):
"""'Homepage' of a MediaEntry()"""
- return render_to_response(
- request, 'mediagoblin/user_pages/media.html',
- {'media': media})
+ return render_to_response(request,
+ 'mediagoblin/user_pages/media.html',
+ {'media': media})
ATOM_DEFAULT_NR_OF_UPDATED_ITEMS = 5
diff --git a/mediagoblin/views.py b/mediagoblin/views.py
index dc2d45ba..22673d59 100644
--- a/mediagoblin/views.py
+++ b/mediagoblin/views.py
@@ -21,6 +21,6 @@ def root_view(request):
media_entries = request.db.MediaEntry.find(
{u'state': u'processed'}).sort('created', DESCENDING)
- return render_to_response(
- request, 'mediagoblin/root.html',
- {'media_entries': media_entries})
+ return render_to_response(request,
+ 'mediagoblin/root.html',
+ {'media_entries': media_entries})