Moving all views over to using util.render_template()!
This commit is contained in:
parent
f99f61c65c
commit
b5d3aec615
@ -18,6 +18,7 @@ import uuid
|
|||||||
|
|
||||||
from webob import Response, exc
|
from webob import Response, exc
|
||||||
|
|
||||||
|
from mediagoblin.util import render_template
|
||||||
from mediagoblin.db.util import ObjectId
|
from mediagoblin.db.util import ObjectId
|
||||||
from mediagoblin.auth import lib as auth_lib
|
from mediagoblin.auth import lib as auth_lib
|
||||||
from mediagoblin.auth import forms as auth_forms
|
from mediagoblin.auth import forms as auth_forms
|
||||||
@ -58,20 +59,16 @@ def register(request):
|
|||||||
location=request.urlgen("mediagoblin.auth.register_success"))
|
location=request.urlgen("mediagoblin.auth.register_success"))
|
||||||
|
|
||||||
# render
|
# render
|
||||||
template = request.template_env.get_template(
|
|
||||||
'mediagoblin/auth/register.html')
|
|
||||||
return Response(
|
return Response(
|
||||||
template.render(
|
render_template(
|
||||||
{'request': request,
|
request, 'mediagoblin/auth/register.html',
|
||||||
'register_form': register_form}))
|
{'register_form': register_form}))
|
||||||
|
|
||||||
|
|
||||||
def register_success(request):
|
def register_success(request):
|
||||||
template = request.template_env.get_template(
|
|
||||||
'mediagoblin/auth/register_success.html')
|
|
||||||
return Response(
|
return Response(
|
||||||
template.render(
|
render_template(
|
||||||
{'request': request}))
|
request, 'mediagoblin/auth/register_success.html', {}))
|
||||||
|
|
||||||
|
|
||||||
def login(request):
|
def login(request):
|
||||||
@ -106,12 +103,10 @@ def login(request):
|
|||||||
login_failed = True
|
login_failed = True
|
||||||
|
|
||||||
# render
|
# render
|
||||||
template = request.template_env.get_template(
|
|
||||||
'mediagoblin/auth/login.html')
|
|
||||||
return Response(
|
return Response(
|
||||||
template.render(
|
render_template(
|
||||||
{'request': request,
|
request, 'mediagoblin/auth/login.html',
|
||||||
'login_form': login_form,
|
{'login_form': login_form,
|
||||||
'next': request.GET.get('next') or request.POST.get('next'),
|
'next': request.GET.get('next') or request.POST.get('next'),
|
||||||
'login_failed': login_failed}))
|
'login_failed': login_failed}))
|
||||||
|
|
||||||
@ -146,12 +141,10 @@ def verify_email(request):
|
|||||||
else:
|
else:
|
||||||
verification_successful = False
|
verification_successful = False
|
||||||
|
|
||||||
template = request.template_env.get_template(
|
|
||||||
'mediagoblin/auth/verify_email.html')
|
|
||||||
return Response(
|
return Response(
|
||||||
template.render(
|
render_template(
|
||||||
{'request': request,
|
request, 'mediagoblin/auth/verify_email.html',
|
||||||
'user': user,
|
{'user': user,
|
||||||
'verification_successful': verification_successful}))
|
'verification_successful': verification_successful}))
|
||||||
|
|
||||||
def verify_email_notice(request):
|
def verify_email_notice(request):
|
||||||
@ -161,12 +154,9 @@ def verify_email_notice(request):
|
|||||||
When the user tries to do some action that requires their account
|
When the user tries to do some action that requires their account
|
||||||
to be verified beforehand, this view is called upon!
|
to be verified beforehand, this view is called upon!
|
||||||
"""
|
"""
|
||||||
|
|
||||||
template = request.template_env.get_template(
|
|
||||||
'mediagoblin/auth/verification_needed.html')
|
|
||||||
return Response(
|
return Response(
|
||||||
template.render(
|
render_template(
|
||||||
{'request': request}))
|
request, 'mediagoblin/auth/verification_needed.html', {}))
|
||||||
|
|
||||||
|
|
||||||
def resend_activation(request):
|
def resend_activation(request):
|
||||||
@ -186,8 +176,6 @@ def resend_activation(request):
|
|||||||
|
|
||||||
|
|
||||||
def resend_activation_success(request):
|
def resend_activation_success(request):
|
||||||
template = request.template_env.get_template(
|
|
||||||
'mediagoblin/auth/resent_verification_email.html')
|
|
||||||
return Response(
|
return Response(
|
||||||
template.render(
|
render_template(
|
||||||
{'request': request}))
|
request, 'mediagoblin/auth/resent_verification_email.html', {}))
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
|
|
||||||
from webob import Response, exc
|
from webob import Response, exc
|
||||||
|
|
||||||
|
from mediagoblin.util import render_template
|
||||||
from mediagoblin.edit import forms
|
from mediagoblin.edit import forms
|
||||||
from mediagoblin.edit.lib import may_edit_media
|
from mediagoblin.edit.lib import may_edit_media
|
||||||
from mediagoblin.decorators import require_active_login, get_user_media_entry
|
from mediagoblin.decorators import require_active_login, get_user_media_entry
|
||||||
@ -56,10 +57,8 @@ def edit_media(request, media):
|
|||||||
user=media.uploader()['username'], media=media['slug']))
|
user=media.uploader()['username'], media=media['slug']))
|
||||||
|
|
||||||
# render
|
# render
|
||||||
template = request.template_env.get_template(
|
|
||||||
'mediagoblin/edit/edit.html')
|
|
||||||
return Response(
|
return Response(
|
||||||
template.render(
|
render_template(
|
||||||
{'request': request,
|
request, 'mediagoblin/edit/edit.html',
|
||||||
'media': media,
|
{'media': media,
|
||||||
'form': form}))
|
'form': form}))
|
||||||
|
@ -20,6 +20,7 @@ from cgi import FieldStorage
|
|||||||
from webob import Response, exc
|
from webob import Response, exc
|
||||||
from werkzeug.utils import secure_filename
|
from werkzeug.utils import secure_filename
|
||||||
|
|
||||||
|
from mediagoblin.util import render_template
|
||||||
from mediagoblin.decorators import require_active_login
|
from mediagoblin.decorators import require_active_login
|
||||||
from mediagoblin.submit import forms as submit_forms
|
from mediagoblin.submit import forms as submit_forms
|
||||||
from mediagoblin.process_media import process_media_initial
|
from mediagoblin.process_media import process_media_initial
|
||||||
@ -80,18 +81,14 @@ def submit_start(request):
|
|||||||
location=request.urlgen("mediagoblin.submit.success"))
|
location=request.urlgen("mediagoblin.submit.success"))
|
||||||
|
|
||||||
# render
|
# render
|
||||||
template = request.template_env.get_template(
|
|
||||||
'mediagoblin/submit/start.html')
|
|
||||||
return Response(
|
return Response(
|
||||||
template.render(
|
render_template(
|
||||||
{'request': request,
|
request, 'mediagoblin/submit/start.html',
|
||||||
'submit_form': submit_form}))
|
{'submit_form': submit_form}))
|
||||||
|
|
||||||
|
|
||||||
def submit_success(request):
|
def submit_success(request):
|
||||||
# render
|
# render
|
||||||
template = request.template_env.get_template(
|
|
||||||
'mediagoblin/submit/success.html')
|
|
||||||
return Response(
|
return Response(
|
||||||
template.render(
|
render_template(
|
||||||
{'request': request}))
|
request, 'mediagoblin/submit/success.html', {}))
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
from webob import Response, exc
|
from webob import Response, exc
|
||||||
from mediagoblin.db.util import DESCENDING
|
from mediagoblin.db.util import DESCENDING
|
||||||
from mediagoblin.util import Pagination
|
from mediagoblin.util import Pagination, render_template
|
||||||
|
|
||||||
from mediagoblin.decorators import uses_pagination, get_user_media_entry
|
from mediagoblin.decorators import uses_pagination, get_user_media_entry
|
||||||
|
|
||||||
@ -42,13 +42,10 @@ def user_home(request, page):
|
|||||||
if media_entries == None:
|
if media_entries == None:
|
||||||
return exc.HTTPNotFound()
|
return exc.HTTPNotFound()
|
||||||
|
|
||||||
template = request.template_env.get_template(
|
|
||||||
'mediagoblin/user_pages/user.html')
|
|
||||||
|
|
||||||
return Response(
|
return Response(
|
||||||
template.render(
|
render_template(
|
||||||
{'request': request,
|
request, 'mediagoblin/user_pages/user.html',
|
||||||
'user': user,
|
{'user': user,
|
||||||
'media_entries': media_entries,
|
'media_entries': media_entries,
|
||||||
'pagination': pagination}))
|
'pagination': pagination}))
|
||||||
|
|
||||||
@ -56,12 +53,11 @@ def user_home(request, page):
|
|||||||
@get_user_media_entry
|
@get_user_media_entry
|
||||||
def media_home(request, media):
|
def media_home(request, media):
|
||||||
"""'Homepage' of a MediaEntry()"""
|
"""'Homepage' of a MediaEntry()"""
|
||||||
template = request.template_env.get_template(
|
|
||||||
'mediagoblin/user_pages/media.html')
|
|
||||||
return Response(
|
return Response(
|
||||||
template.render(
|
render_template(
|
||||||
{'request': request,
|
request, 'mediagoblin/user_pages/media.html',
|
||||||
'media': media}))
|
{'media': media}))
|
||||||
|
|
||||||
|
|
||||||
ATOM_DEFAULT_NR_OF_UPDATED_ITEMS = 5
|
ATOM_DEFAULT_NR_OF_UPDATED_ITEMS = 5
|
||||||
|
|
||||||
|
@ -15,15 +15,15 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from webob import Response
|
from webob import Response
|
||||||
|
|
||||||
|
from mediagoblin.util import render_template
|
||||||
from mediagoblin.db.util import DESCENDING
|
from mediagoblin.db.util import DESCENDING
|
||||||
|
|
||||||
def root_view(request):
|
def root_view(request):
|
||||||
media_entries = request.db.MediaEntry.find(
|
media_entries = request.db.MediaEntry.find(
|
||||||
{u'state': u'processed'}).sort('created', DESCENDING)
|
{u'state': u'processed'}).sort('created', DESCENDING)
|
||||||
|
|
||||||
template = request.template_env.get_template(
|
|
||||||
'mediagoblin/root.html')
|
|
||||||
return Response(
|
return Response(
|
||||||
template.render(
|
render_template(
|
||||||
{'request': request,
|
request, 'mediagoblin/root.html',
|
||||||
'media_entries': media_entries}))
|
{'media_entries': media_entries}))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user