chunk split option comes back,

u-grave in special chars

diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo
index ff6d31c..96e4b32 100644 (file)
Binary files a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo and b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.po b/apps/catalogue/locale/pl/LC_MESSAGES/django.po
index 7439ee2..22708f4 100644 (file)
--- a/apps/catalogue/locale/pl/LC_MESSAGES/django.po
+++ b/apps/catalogue/locale/pl/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Platforma Redakcyjna\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: Platforma Redakcyjna\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2011-10-13 17:15+0200\n"
-"PO-Revision-Date: 2011-10-13 17:16+0100\n"
+"POT-Creation-Date: 2011-10-21 15:53+0200\n"
+"PO-Revision-Date: 2011-10-21 15:53+0100\n"

 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>\n"
 "Language: pl\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>\n"
 "Language: pl\n"


@@ -25,29 +25,29 @@ msgstr "Plik ZIP"
 msgid "Directories are documents in chunks"
 msgstr "Katalogi zawierają dokumenty w częściach"
 
 msgid "Directories are documents in chunks"
 msgstr "Katalogi zawierają dokumenty w częściach"
 

-#: forms.py:74
+#: forms.py:71

 msgid "Assigned to"
 msgstr "Przypisane do"
 
 msgid "Assigned to"
 msgstr "Przypisane do"
 

-#: forms.py:94
-#: forms.py:108
+#: forms.py:91
+#: forms.py:105

 msgid "Chunk with this slug already exists"
 msgstr "Część z tym slugiem już istnieje"
 
 msgid "Chunk with this slug already exists"
 msgstr "Część z tym slugiem już istnieje"
 

-#: forms.py:117
+#: forms.py:114

 msgid "Append to"
 msgstr "Dołącz do"
 
 msgid "Append to"
 msgstr "Dołącz do"
 

-#: views.py:143
+#: views.py:148

 #, python-format
 msgid "Slug already used for %s"
 msgstr "Slug taki sam jak dla pliku %s"
 
 #, python-format
 msgid "Slug already used for %s"
 msgstr "Slug taki sam jak dla pliku %s"
 

-#: views.py:145
+#: views.py:150

 msgid "Slug already used in repository."
 msgstr "Dokument o tym slugu już istnieje w repozytorium."
 
 msgid "Slug already used in repository."
 msgstr "Dokument o tym slugu już istnieje w repozytorium."
 

-#: views.py:151
+#: views.py:156

 msgid "File should be UTF-8 encoded."
 msgstr "Plik powinien mieć kodowanie UTF-8."
 
 msgid "File should be UTF-8 encoded."
 msgstr "Plik powinien mieć kodowanie UTF-8."
 


@@ -162,7 +162,7 @@ msgstr "Dołącz książkę"
 
 #: templates/catalogue/book_detail.html:14
 #: templates/catalogue/book_edit.html:9
 
 #: templates/catalogue/book_detail.html:14
 #: templates/catalogue/book_edit.html:9

-#: templates/catalogue/chunk_edit.html:12
+#: templates/catalogue/chunk_edit.html:13

 msgid "Save"
 msgstr "Zapisz"
 
 msgid "Save"
 msgstr "Zapisz"
 


@@ -212,17 +212,25 @@ msgid "Comments"
 msgstr "Komentarze"
 
 #: templates/catalogue/chunk_add.html:5
 msgstr "Komentarze"
 
 #: templates/catalogue/chunk_add.html:5

-#: templates/catalogue/chunk_add.html:11
+#: templates/catalogue/chunk_edit.html:19
+msgid "Split chunk"
+msgstr "Podziel część"
+
+#: templates/catalogue/chunk_add.html:10
+msgid "Insert empty chunk after"
+msgstr "Wstaw pustą część po"
+
+#: templates/catalogue/chunk_add.html:13

 msgid "Add chunk"
 msgstr "Dodaj część"
 
 msgid "Add chunk"
 msgstr "Dodaj część"
 

-#: templates/catalogue/chunk_edit.html:5
+#: templates/catalogue/chunk_edit.html:6

 #: templates/catalogue/book_list/book.html:7
 #: templates/catalogue/book_list/chunk.html:5
 msgid "Chunk settings"
 msgstr "Ustawienia części"
 
 #: templates/catalogue/book_list/book.html:7
 #: templates/catalogue/book_list/chunk.html:5
 msgid "Chunk settings"
 msgstr "Ustawienia części"
 

-#: templates/catalogue/chunk_edit.html:10
+#: templates/catalogue/chunk_edit.html:11

 msgid "Book"
 msgstr "Książka"
 
 msgid "Book"
 msgstr "Książka"
 


@@ -239,7 +247,7 @@ msgid "Please submit a ZIP with UTF-8 encoded XML files. Files not ending with <
 msgstr "Proszę wskazać archiwum ZIP z plikami XML w kodowaniu UTF-8. Pliki nie kończące się na <code>.xml</code> zostaną zignorowane."
 
 #: templates/catalogue/document_upload.html:17
 msgstr "Proszę wskazać archiwum ZIP z plikami XML w kodowaniu UTF-8. Pliki nie kończące się na <code>.xml</code> zostaną zignorowane."
 
 #: templates/catalogue/document_upload.html:17

-#: templatetags/catalogue.py:34
+#: templatetags/catalogue.py:35

 msgid "Upload"
 msgstr "Załaduj"
 
 msgid "Upload"
 msgstr "Załaduj"
 


@@ -281,7 +289,7 @@ msgid "Recent activity for"
 msgstr "Ostatnia aktywność dla:"
 
 #: templates/catalogue/user_list.html:7
 msgstr "Ostatnia aktywność dla:"
 
 #: templates/catalogue/user_list.html:7

-#: templatetags/catalogue.py:32
+#: templatetags/catalogue.py:31

 msgid "Users"
 msgstr "Użytkownicy"
 
 msgid "Users"
 msgstr "Użytkownicy"
 


@@ -347,23 +355,23 @@ msgstr "nie opublikowane"
 msgid "empty"
 msgstr "puste"
 
 msgid "empty"
 msgstr "puste"
 

-#: templatetags/catalogue.py:28
+#: templatetags/catalogue.py:27

 msgid "My page"
 msgstr "Moja strona"
 
 msgid "My page"
 msgstr "Moja strona"
 

-#: templatetags/catalogue.py:30
+#: templatetags/catalogue.py:29

 msgid "Activity"
 msgstr "Aktywność"
 
 msgid "Activity"
 msgstr "Aktywność"
 

-#: templatetags/catalogue.py:31
+#: templatetags/catalogue.py:30

 msgid "All"
 msgstr "Wszystkie"
 
 msgid "All"
 msgstr "Wszystkie"
 

-#: templatetags/catalogue.py:33
+#: templatetags/catalogue.py:34

 msgid "Add"
 msgstr "Dodaj"
 
 msgid "Add"
 msgstr "Dodaj"
 

-#: templatetags/catalogue.py:37
+#: templatetags/catalogue.py:38

 msgid "Admin"
 msgstr "Administracja"
 
 msgid "Admin"
 msgstr "Administracja"
 


@@ -603,6 +611,3 @@ msgstr "Komentarz"
 
 #~ msgid "Refresh"
 #~ msgstr "Odśwież"
 
 #~ msgid "Refresh"
 #~ msgstr "Odśwież"

-
-#~ msgid "Insert special character"
-#~ msgstr "Wstaw znak specjalny"

diff --git a/apps/catalogue/templates/catalogue/chunk_add.html b/apps/catalogue/templates/catalogue/chunk_add.html
index 558fc9f..b287479 100755 (executable)
--- a/apps/catalogue/templates/catalogue/chunk_add.html
+++ b/apps/catalogue/templates/catalogue/chunk_add.html
@@ -2,12 +2,15 @@
 {% load i18n %}
 
 {% block content %}
 {% load i18n %}
 
 {% block content %}

-    <h1>{% trans "Add chunk" %}</h1>
+    <h1>{% trans "Split chunk" %}</h1>

 
 

-       <form enctype="multipart/form-data" method="POST" action="">
+       <form enctype="multipart/form-data" method="POST">

     {% csrf_token %}
     {% csrf_token %}

-       {{ form.as_p }}
-
-       <p><button type="submit">{% trans "Add chunk" %}</button></p>
+    <table class='editable'>
+        <tr><th>{% trans "Insert empty chunk after" %}:</th>
+            <td><a href="{{ chunk.get_absolute_url }}">{{ chunk.pretty_name }}</a></td></tr>
+        {{ form.as_table }}
+        <tr><td></td><td><button type="submit">{% trans "Add chunk" %}</button></td></tr>
+    </table>

        </form>
 {% endblock content %}
        </form>
 {% endblock content %}

diff --git a/apps/catalogue/templates/catalogue/chunk_edit.html b/apps/catalogue/templates/catalogue/chunk_edit.html
index 20e8657..bdacd02 100755 (executable)
--- a/apps/catalogue/templates/catalogue/chunk_edit.html
+++ b/apps/catalogue/templates/catalogue/chunk_edit.html
@@ -1,4 +1,5 @@
 {% extends "catalogue/base.html" %}
 {% extends "catalogue/base.html" %}

+{% load url from future %}

 {% load i18n %}
 
 {% block content %}
 {% load i18n %}
 
 {% block content %}


@@ -7,10 +8,14 @@
        <form enctype="multipart/form-data" method="POST" action="{% if go_next %}?next={{ go_next }}{% endif %}">
     {% csrf_token %}
     <table class='editable'>
        <form enctype="multipart/form-data" method="POST" action="{% if go_next %}?next={{ go_next }}{% endif %}">
     {% csrf_token %}
     <table class='editable'>

-        <tr><th>{% trans "Book" %}</th><td>{{ chunk.book }} ({{ chunk.number }}/{{ chunk.book|length }})</td></tr>
+        <tr><th>{% trans "Book" %}:</th><td>{{ chunk.book }} ({{ chunk.number }}/{{ chunk.book|length }})</td></tr>

         {{ form.as_table}}
         <tr><td></td><td><button type="submit">{% trans "Save" %}</button></td></tr>
     </table>
 
        </form>
         {{ form.as_table}}
         <tr><td></td><td><button type="submit">{% trans "Save" %}</button></td></tr>
     </table>
 
        </form>

+
+
+    <p><a href="{% url "catalogue_chunk_add" chunk.book.slug chunk.slug %}">{% trans "Split chunk" %}</a></p>
+

 {% endblock content %}
 {% endblock content %}

diff --git a/redakcja/static/js/wiki/view_editor_wysiwyg.js b/redakcja/static/js/wiki/view_editor_wysiwyg.js
index 0179f40..3ccaea7 100644 (file)
--- a/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -203,7 +203,7 @@
             'Ê','ê','Ë','ë','Ē','ē','Ě','ě','Ġ','ġ','Ħ','ħ','Í','í','Î','î',
             'Ī','ī','Ĭ','ĭ','Ľ','ľ','Ñ','ñ','Ň','ň','Ó','ó','Ö','ö',
             'Ô','ô','Ō','ō','Ǒ','ǒ','Œ','œ','Ø','ø','Ř','ř','Š',
             'Ê','ê','Ë','ë','Ē','ē','Ě','ě','Ġ','ġ','Ħ','ħ','Í','í','Î','î',
             'Ī','ī','Ĭ','ĭ','Ľ','ľ','Ñ','ñ','Ň','ň','Ó','ó','Ö','ö',
             'Ô','ô','Ō','ō','Ǒ','ǒ','Œ','œ','Ø','ø','Ř','ř','Š',

-            'š','Ş','ş','Ť','ť','Ţ','ţ','Ű','ű','Ú','ú',
+            'š','Ş','ş','Ť','ť','Ţ','ţ','Ű','ű','Ú','ú','Ù','ù',

             'Ü','ü','Ů','ů','Ū','ū','Û','û','Ŭ','ŭ',
             'Ý','ý','Ž','ž','ß','Ð','ð','Þ','þ','А','а','Б',
             'б','В','в','Г','г','Д','д','Е','е','Ё','ё','Ж',
             'Ü','ü','Ů','ů','Ū','ū','Û','û','Ŭ','ŭ',
             'Ý','ý','Ž','ž','ß','Ð','ð','Þ','þ','А','а','Б',
             'б','В','в','Г','г','Д','д','Е','е','Ё','ё','Ж',