fmartingr
/
shelfzilla
Archived
1
0
Fork 0
Code Releases Activity

+ Added view/template for django messages framework 

+ Added custom URL to access messages directly (for pjax support)
+ Added javascript method to call a messages update
This commit is contained in:
Felipe Martin 2014-03-31 16:39:37 +02:00
parent 30c19c545c
commit 51e2617bd9
5 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
shelfzilla/themes/bootflat/static/coffee/main.coffee
View File

@ -1,8 +1,18 @@
# Background
NProgress.start()
window.updateMessages = ->
jQuery.pjax
url: '/messages/'
container: '[data-pjax-container="messages"]'
push: false
jQuery ->
NProgress.inc(0.3)
# Background
jQuery.vegas
src: '/static/backgrounds/shelves.jpg'
fade: 1200
complete: -> NProgress.done()
# PJAX
if jQuery.support.pjax
@ -24,8 +34,6 @@ jQuery ->
# Tooltips
jQuery('[data-toggle="tooltip"]').tooltip();
# Nprogress
jQuery(document).on 'pjax:start', -> NProgress.start()
jQuery(document).on 'pjax:end', -> NProgress.done()
#jQuery(document).on 'page:restore', -> NProgress.remove()

13
shelfzilla/themes/bootflat/templates/_layout.html
View File

@ -4,7 +4,7 @@
<head>
<link rel="stylesheet" href="/static/css/style.css" />
{% block extra_css %}{% endblock %}
<title>{% block page_title %}Shelfzilla{% endblock %}</title>
<title>{% block page_title %}ShelfZilla{% endblock %}</title>
</head>
<body>
{% block navigation_bar %}
@ -53,16 +53,11 @@
{% endblock %}
{% block messages %}
<div class="messages container" data-pjax-container="messages">
{% if messages %}
<div class="messages container">
{% for message in messages %}
<div{% if message.tags %} class="alert alert-{{ message.tags }}"{% endif %}>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
{{ message }}
</div>
{% endfor %}
</div>
{% include "contrib/messages.html" %}
{% endif %}
</div>
{% endblock %}
<div id="main_content" data-pjax-container="main">
{% block main_content %}{% endblock %}

6
shelfzilla/themes/bootflat/templates/contrib/messages.html Normal file
View File

@ -0,0 +1,6 @@
{% for message in messages %}
<div{% if message.tags %} class="alert alert-{{ message.tags }}"{% endif %}>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
{{ message }}
</div>
{% endfor %}

3
shelfzilla/urls.py
View File

@ -4,8 +4,11 @@ from django.conf import settings
from django.contrib import admin
admin.autodiscover()
from .views import MessagesView
urlpatterns = patterns(
'',
url(r'^messages/$', MessagesView.as_view(), name="contrib.messages"),
url(r'^', include('shelfzilla.apps.landing.urls')),
url(r'^', include('shelfzilla.apps.users.urls')),
url(r'^series/', include('shelfzilla.apps.manga.urls.series')),

10
shelfzilla/views.py
View File

@ -1,4 +1,6 @@
from django.views.generic import View as DjangoView
from django.template import RequestContext
from django.shortcuts import render_to_response
class View(DjangoView):
@ -11,3 +13,11 @@ class View(DjangoView):
}
return context
class MessagesView(View):
template = 'contrib/messages.html'
def get(self, request):
ctx = RequestContext(request, {})
return render_to_response(self.template, context_instance=ctx)