Added pjax app
+ Moved context_processor for pjax handling to this app + Added pjax template filter, will convert a template name into its pjax variant (appending -pjax by default) + pjax tempaltetags are auto loaded
This commit is contained in:
parent
02d9b38ef9
commit
07ce16f50f
|
@ -0,0 +1,4 @@
|
|||
from django.template import add_to_builtins
|
||||
|
||||
|
||||
add_to_builtins("shelfzilla.apps.pjax.templatetags.pjax")
|
|
@ -2,13 +2,8 @@ def pjax(request):
|
|||
"""
|
||||
Determines if a request if a pjax request by the X-PJAX header
|
||||
"""
|
||||
template = '_layout.html'
|
||||
is_pjax = request.META.get('HTTP_X_PJAX', False)
|
||||
|
||||
if is_pjax:
|
||||
template = '_pjax.html'
|
||||
|
||||
return {
|
||||
'is_pjax': is_pjax,
|
||||
'extends_template': template,
|
||||
}
|
|
@ -0,0 +1,19 @@
|
|||
from django import template
|
||||
|
||||
|
||||
register = template.Library()
|
||||
|
||||
|
||||
@register.filter
|
||||
def pjax(template_name, request, string="-pjax"):
|
||||
if isinstance(request, (bool, int)):
|
||||
is_pjax = request
|
||||
else:
|
||||
is_pjax = request.META.get("HTTP_X_PJAX", False)
|
||||
|
||||
if is_pjax:
|
||||
name, extension = template_name.split('.')
|
||||
template_name = '{}{}.{}'.format(
|
||||
name, string, extension
|
||||
)
|
||||
return template_name.strip()
|
|
@ -59,6 +59,7 @@ INSTALLED_APPS = (
|
|||
'shelfzilla.apps.homepage',
|
||||
'shelfzilla.apps.landing',
|
||||
'shelfzilla.apps.manga',
|
||||
'shelfzilla.apps.pjax',
|
||||
)
|
||||
|
||||
TEMPLATE_CONTEXT_PROCESSORS = (
|
||||
|
@ -71,7 +72,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
|
|||
'django.contrib.messages.context_processors.messages',
|
||||
'django.core.context_processors.request',
|
||||
|
||||
'shelfzilla.context_processors.pjax',
|
||||
'shelfzilla.apps.pjax.context_processors.pjax',
|
||||
'shelfzilla.apps.manga.context_processors.user_have_volumes',
|
||||
'shelfzilla.apps.manga.context_processors.user_wishlisted_volumes',
|
||||
)
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
{% extends extends_template %}
|
||||
{% extends '_layout.html'|pjax:request %}
|
||||
|
||||
{% block content %}asd{% endblock %}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{% extends extends_template %}
|
||||
{% extends '_layout.html'|pjax:request %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block page_title %}{{ block.super }} | {{ item.name }}{% endblock %}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{% extends extends_template %}
|
||||
{% extends '_layout.html'|pjax:request %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block page_title %}{{ block.super }} | {% trans "Publishers" %}{% endblock %}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{% extends extends_template %}
|
||||
{% extends '_layout.html'|pjax:request %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block page_title %}{{ block.super }} | {{ item.name }}{% endblock %}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{% extends extends_template %}
|
||||
{% extends '_layout.html'|pjax:request %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block page_title %}{{ block.super }} | {% trans "Series" %}{% endblock %}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "_pjax.html" %}
|
||||
{% extends "_layout-pjax.html" %}
|
||||
|
||||
{% block page_title %}{{ block.super }} | {{ volume.series.name }}{% endblock %}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "_layout.html" %}
|
||||
{% extends '_layout.html' %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block navigation_bar %}{% endblock %}
|
||||
|
|
Reference in New Issue