templates: remove sekizai tags and rename base.html
- fixes #7234 - fixes #7233
This commit is contained in:
parent
651681aa6e
commit
d6b774ee47
|
|
@ -38,7 +38,6 @@ INSTALLED_APPS = (
|
|||
'django.contrib.messages',
|
||||
'django.contrib.staticfiles',
|
||||
'django_tables2',
|
||||
'sekizai',
|
||||
'gadjo',
|
||||
'fargo.fargo',
|
||||
)
|
||||
|
|
@ -55,7 +54,7 @@ MIDDLEWARE_CLASSES = (
|
|||
|
||||
TEMPLATE_CONTEXT_PROCESSORS += (
|
||||
'django.core.context_processors.request',
|
||||
'sekizai.context_processors.sekizai',)
|
||||
)
|
||||
|
||||
ROOT_URLCONF = 'fargo.urls'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
{% load i18n sekizai_tags staticfiles %}<!DOCTYPE html>
|
||||
{% load i18n staticfiles gadjo %}<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>{% block title %}Fargo{% endblock %}</title>
|
||||
<link rel="stylesheet" href="{% static "fargo/css/style.css" %}" />
|
||||
{% render_block "css" %}
|
||||
{% render_block "js" %}
|
||||
{% block extra_scripts %}
|
||||
<link rel="stylesheet" href="{{ STATIC_URL }}django_tables2/themes/paleblue/css/screen.css" />
|
||||
<script type="text/javascript" src="{% xstatic 'jquery' 'jquery.min.js' %}"></script>
|
||||
{% endblock %}
|
||||
</head>
|
||||
|
||||
<body {% block bodyattr %}{% endblock %}>
|
||||
|
|
@ -1,20 +1,36 @@
|
|||
{% extends "base.html" %}
|
||||
{% extends "fargo/base.html" %}
|
||||
{% load render_table from django_tables2 %}
|
||||
{% load sekizai_tags i18n %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block extra_scripts %}
|
||||
{{ block.super }}
|
||||
<script>
|
||||
$(function () {
|
||||
$('tbody').on("click", "tr", function (event) {
|
||||
var $target = $(event.target)
|
||||
if (! $target.is('tr')) {
|
||||
$target = $target.parents('tr');
|
||||
}
|
||||
var url = $target.data('url');
|
||||
if (url) {
|
||||
window.location.href = url;
|
||||
}
|
||||
});
|
||||
})
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% addtoblock "css" %}<link rel="stylesheet" href="{{ STATIC_URL }}django_tables2/themes/paleblue/css/screen.css" />{% endaddtoblock %}
|
||||
<div id="user-files">
|
||||
{% render_table table "fargo/table.html" %}
|
||||
<div id="user-files">
|
||||
{% render_table table "fargo/table.html" %}
|
||||
|
||||
<form method="post" enctype="multipart/form-data">
|
||||
{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
<input type="submit" name="submit" value="{% trans "Upload" %}">
|
||||
{% if pick %}
|
||||
<input type="submit" name="cancel" value="{% trans "Cancel" %}">
|
||||
{% endif %}
|
||||
</form>
|
||||
</div>
|
||||
<form method="post" enctype="multipart/form-data">
|
||||
{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
<input type="submit" name="submit" value="{% trans "Upload" %}">
|
||||
{% if pick %}
|
||||
<input type="submit" name="cancel" value="{% trans "Cancel" %}">
|
||||
{% endif %}
|
||||
</form>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,105 +1,41 @@
|
|||
{% spaceless %}
|
||||
{% extends "django_tables2/table.html" %}
|
||||
{% load django_tables2 %}
|
||||
{% load i18n %}
|
||||
{% load sekizai_tags %}
|
||||
{% load gadjo %}
|
||||
{% addtoblock "js" %}<script type="text/javascript" src="{% xstatic 'jquery' 'jquery.min.js' %}"></script>{% endaddtoblock %}
|
||||
<script>
|
||||
$(function () {
|
||||
$('tbody').on("click", "tr", function (event) {
|
||||
var $target = $(event.target)
|
||||
if (! $target.is('tr')) {
|
||||
$target = $target.parents('tr');
|
||||
}
|
||||
var url = $target.data('url');
|
||||
if (url) {
|
||||
window.location.href = url;
|
||||
}
|
||||
});
|
||||
})
|
||||
</script>
|
||||
{% if table.page %}
|
||||
<div class="table-container">
|
||||
{% endif %}
|
||||
{% block table %}
|
||||
<table{% if table.attrs %} {{ table.attrs.as_html }}{% endif %}>
|
||||
{% nospaceless %}
|
||||
{% block table.thead %}
|
||||
<thead>
|
||||
<tr>
|
||||
{% for column in table.columns %}
|
||||
{% if column.orderable %}
|
||||
<th {{ column.attrs.th.as_html }}><a href="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}">{{ column.header }}</a></th>
|
||||
{% else %}
|
||||
<th {{ column.attrs.th.as_html }}>{{ column.header }}</th>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<th class="delete-column"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
{% endblock table.thead %}
|
||||
{% block table.tbody %}
|
||||
<tbody>
|
||||
{% for row in table.page.object_list|default:table.rows %} {# support pagination #}
|
||||
{% block table.tbody.row %}
|
||||
<tr data-url="{% url 'download' pk=row.record.pk filename=row.record.document_filename %}" class="{{ forloop.counter|divisibleby:2|yesno:"even,odd" }}"> {# avoid cycle for Django 1.2-1.6 compatibility #}
|
||||
{% for column, cell in row.items %}
|
||||
<td {{ column.attrs.td.as_html }}>{% if column.localize == None %}{{ cell }}{% else %}{% if column.localize %}{{ cell|localize }}{% else %}{{ cell|unlocalize }}{% endif %}{% endif %}</td>
|
||||
{% endfor %}
|
||||
<td class="delete-column">
|
||||
{% if pick %}
|
||||
<form method="post" action="{% url 'pick' pk=row.record.pk %}{% querystring %}">
|
||||
{% csrf_token %}
|
||||
<button>{% trans "Pick" %}</button>
|
||||
</form>
|
||||
{% else %}
|
||||
<form method="post" action="{% url 'delete' pk=row.record.pk %}{% querystring %}">
|
||||
{% csrf_token %}
|
||||
<button>{% trans "Delete" %}</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</th>
|
||||
</tr>
|
||||
</tr>
|
||||
{% endblock table.tbody.row %}
|
||||
{% empty %}
|
||||
{% if table.empty_text %}
|
||||
{% block table.tbody.empty_text %}
|
||||
<tr><td colspan="{{ table.columns|length }}">{{ table.empty_text }}</td></tr>
|
||||
{% endblock table.tbody.empty_text %}
|
||||
|
||||
{% block table.thead %}
|
||||
<thead>
|
||||
<tr>
|
||||
{% for column in table.columns %}
|
||||
{% if column.orderable %}
|
||||
<th {{ column.attrs.th.as_html }}>
|
||||
<a href="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}">{{ column.header }}</a>
|
||||
</th>
|
||||
{% else %}
|
||||
<th {{ column.attrs.th.as_html }}>{{ column.header }}</th>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
{% endblock table.tbody %}
|
||||
{% block table.tfoot %}
|
||||
<tfoot></tfoot>
|
||||
{% endblock table.tfoot %}
|
||||
{% endnospaceless %}
|
||||
</table>
|
||||
{% endblock table %}
|
||||
{% endfor %}
|
||||
<th class="delete-column"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
{% endblock table.thead %}
|
||||
|
||||
{% if table.page %}
|
||||
{% with table.page.paginator.count as total %}
|
||||
{% with table.page.object_list|length as count %}
|
||||
{% block pagination %}
|
||||
<ul class="pagination">
|
||||
{% if table.page.has_previous %}
|
||||
{% nospaceless %}{% block pagination.previous %}<li class="previous"><a href="{% querystring table.prefixed_page_field=table.page.previous_page_number %}">{% trans "Previous" %}</a></li>{% endblock pagination.previous %}{% endnospaceless %}
|
||||
{% endif %}
|
||||
|
||||
{% if table.page.has_previous or table.page.has_next %}
|
||||
{% nospaceless %}{% block pagination.current %}<li class="current">{% blocktrans with table.page.number as current and table.paginator.num_pages as total %}Page {{ current }} of {{ total }}{% endblocktrans %}</li>{% endblock pagination.current %}{% endnospaceless %}
|
||||
{% endif %}
|
||||
|
||||
{% if table.page.has_next %}
|
||||
{% nospaceless %}{% block pagination.next %}<li class="next"><a href="{% querystring table.prefixed_page_field=table.page.next_page_number %}">{% trans "Next" %}</a></li>{% endblock pagination.next %}{% endnospaceless %}
|
||||
{% endif %}
|
||||
|
||||
{% nospaceless %}{% block pagination.cardinality %}<li class="cardinality">{% if total != count %}{% blocktrans %}{{ count }} of {{ total }}{% endblocktrans %}{% else %}{{ total }}{% endif %} {% if total == 1 %}{{ table.data.verbose_name }}{% else %}{{ table.data.verbose_name_plural }}{% endif %}</li>{% endblock pagination.cardinality %}{% endnospaceless %}
|
||||
</ul>
|
||||
{% endblock pagination %}
|
||||
{% endwith %}
|
||||
{% endwith %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endspaceless %}
|
||||
{% block table.tbody.row %}
|
||||
<tr class="{{ forloop.counter|divisibleby:2|yesno:"even,odd" }}"> {# avoid cycle for Django 1.2-1.6 compatibility #}
|
||||
{% for column, cell in row.items %}
|
||||
<td {{ column.attrs.td.as_html }}>{% if column.localize == None %}{{ cell }}{% else %}{% if column.localize %}{{ cell|localize }}{% else %}{{ cell|unlocalize }}{% endif %}{% endif %}</td>
|
||||
{% endfor %}
|
||||
<td class="delete-column">
|
||||
{% if pick %}
|
||||
<form method="post" action="{% url 'pick' pk=row.record.pk %}{% querystring %}">
|
||||
{% csrf_token %}
|
||||
<button>{% trans "Pick" %}</button>
|
||||
</form>
|
||||
{% else %}
|
||||
<form method="post" action="{% url 'delete' pk=row.record.pk %}{% querystring %}">
|
||||
{% csrf_token %}
|
||||
<button>{% trans "Delete" %}</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endblock table.tbody.row %}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{% extends "base.html" %}
|
||||
{% extends "fargo/base.html" %}
|
||||
{% load render_table from django_tables2 %}
|
||||
{% load sekizai_tags i18n %}
|
||||
{% load i18n %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "base.html" %}
|
||||
{% extends "fargo/base.html" %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue