From: Radek Czajka Date: Wed, 6 Mar 2013 16:03:43 +0000 (+0100) Subject: Move to Django 1.5. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/43116c58e5c56f94ef358a5a17fb13a252e02531?hp=f17e66aa4210a226669dd96e26295d6f58b94703 Move to Django 1.5. Remove filebrowser, use jquery-fileupload. Remove compress, add django-pipeline. Remove bundled django_cas, use stock one. --- diff --git a/apps/catalogue/templates/catalogue/activity.html b/apps/catalogue/templates/catalogue/activity.html index 9c2eac51..c88b5388 100755 --- a/apps/catalogue/templates/catalogue/activity.html +++ b/apps/catalogue/templates/catalogue/activity.html @@ -1,6 +1,5 @@ {% extends "catalogue/base.html" %} {% load i18n %} -{% load url from future %} {% load wall %} diff --git a/apps/catalogue/templates/catalogue/base.html b/apps/catalogue/templates/catalogue/base.html index 949b5f29..d2af462b 100644 --- a/apps/catalogue/templates/catalogue/base.html +++ b/apps/catalogue/templates/catalogue/base.html @@ -12,7 +12,7 @@
- + diff --git a/apps/catalogue/templates/catalogue/book_detail.html b/apps/catalogue/templates/catalogue/book_detail.html index 6ea683a7..7f339bc1 100755 --- a/apps/catalogue/templates/catalogue/book_detail.html +++ b/apps/catalogue/templates/catalogue/book_detail.html @@ -16,9 +16,10 @@ {% if editable %}{% endif %} - {% if editable %} -

{% trans "Append to other book" %}

+

{% trans "Edit gallery" %}

+ +

{% trans "Append to other book" %}

{% endif %} @@ -42,7 +43,7 @@

{% trans "Publication" %}

- + {% if book.dc_cover_image %} {{ book.dc_cover_image }} {% endif %} @@ -58,11 +59,11 @@ {% if publishable %}

- {% trans "Full XML" %}
- {% trans "HTML version" %}
- {% trans "TXT version" %}
- {% trans "PDF version" %}
- {% trans "EPUB version" %}
+ {% trans "Full XML" %}
+ {% trans "HTML version" %}
+ {% trans "TXT version" %}
+ {% trans "PDF version" %}
+ {% trans "EPUB version" %}

{% if user.is_authenticated %} @@ -72,14 +73,14 @@ mira66 (http://www.flickr.com/photos/21804434@N02/) / CC BY 2.0 (http://creativecommons.org/licenses/by/2.0/) --> -
{% csrf_token %} + {% csrf_token %}
{% else %} - {% trans "Log in to publish." %} + {% trans "Log in to publish." %} {% endif %} {% else %}

{% trans "This book can't be published yet, because:" %}

diff --git a/apps/catalogue/templates/catalogue/book_list/book.html b/apps/catalogue/templates/catalogue/book_list/book.html index 1e025e39..658d009c 100755 --- a/apps/catalogue/templates/catalogue/book_list/book.html +++ b/apps/catalogue/templates/catalogue/book_list/book.html @@ -4,16 +4,16 @@ {% with book.0 as chunk %} - [B] - [c] + [B] + [c] + href="{% url 'wiki_editor' book.slug %}"> {{ book.title }} {% if chunk.stage %} {{ chunk.stage }} {% else %}– {% endif %} - {% if chunk.user %}{{ chunk.user.first_name }} {{ chunk.user.last_name }}{% endif %} + {% if chunk.user %}{{ chunk.user.first_name }} {{ chunk.user.last_name }}{% endif %} {% if chunk.published %}P{% endif %} {% if book.new_publishable %}p{% endif %} @@ -24,7 +24,7 @@ {% else %} - [B] + [B] {{ book.title }} diff --git a/apps/catalogue/templates/catalogue/book_list/book_list.html b/apps/catalogue/templates/catalogue/book_list/book_list.html index c2f5e7c8..40237235 100755 --- a/apps/catalogue/templates/catalogue/book_list/book_list.html +++ b/apps/catalogue/templates/catalogue/book_list/book_list.html @@ -82,7 +82,7 @@

{% trans "No books found." %}

{% endif %} -