Mark published revisions in history.

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/django.mo b/apps/wiki/locale/pl/LC_MESSAGES/django.mo
index 7245146..f052501 100644 (file)
Binary files a/apps/wiki/locale/pl/LC_MESSAGES/django.mo and b/apps/wiki/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/django.po b/apps/wiki/locale/pl/LC_MESSAGES/django.po
index be7832e..1dd02fc 100644 (file)
--- a/apps/wiki/locale/pl/LC_MESSAGES/django.po
+++ b/apps/wiki/locale/pl/LC_MESSAGES/django.po
@@ -7,43 +7,37 @@ 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: 2013-03-19 15:50+0100\n"
-"PO-Revision-Date: 2012-02-03 15:09+0100\n"
+"POT-Creation-Date: 2013-07-10 16:58+0200\n"
+"PO-Revision-Date: 2013-07-10 16:58+0100\n"

 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"

-"Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org.pl>\n"
-"Language: \n"
+"Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org."
+"pl>\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

+"X-Generator: Poedit 1.5.4\n"

 
 

-#: forms.py:19
-#: forms.py:63
-#: views.py:279
+#: forms.py:19 forms.py:63 views.py:279

 msgid "Publishable"
 msgstr "Gotowe do publikacji"
 
 msgid "Publishable"
 msgstr "Gotowe do publikacji"
 

-#: forms.py:38
-#: forms.py:89
+#: forms.py:38 forms.py:89

 msgid "Author"
 msgstr "Autor"
 
 msgid "Author"
 msgstr "Autor"
 

-#: forms.py:39
-#: forms.py:90
+#: forms.py:39 forms.py:90

 msgid "Your name"
 msgstr "Imię i nazwisko"
 
 msgid "Your name"
 msgstr "Imię i nazwisko"
 

-#: forms.py:44
-#: forms.py:95
+#: forms.py:44 forms.py:95

 msgid "Author's email"
 msgstr "E-mail autora"
 
 msgid "Author's email"
 msgstr "E-mail autora"
 

-#: forms.py:45
-#: forms.py:96
+#: forms.py:45 forms.py:96

 msgid "Your email address, so we can show a gravatar :)"
 msgstr "Adres e-mail, żebyśmy mogli pokazać gravatar :)"
 
 msgid "Your email address, so we can show a gravatar :)"
 msgstr "Adres e-mail, żebyśmy mogli pokazać gravatar :)"
 

-#: forms.py:51
-#: forms.py:102
+#: forms.py:51 forms.py:102

 msgid "Your comments"
 msgstr "Twój komentarz"
 
 msgid "Your comments"
 msgstr "Twój komentarz"
 


@@ -79,15 +73,19 @@ msgstr "motyw"
 msgid "themes"
 msgstr "motywy"
 
 msgid "themes"
 msgstr "motywy"
 

-#: views.py:299
+#: views.py:281
+msgid "Published"
+msgstr "Opublikowano"
+
+#: views.py:302

 msgid "Revision marked"
 msgstr "Wersja oznaczona"
 
 msgid "Revision marked"
 msgstr "Wersja oznaczona"
 

-#: views.py:301
+#: views.py:304

 msgid "Nothing changed"
 msgstr "Nic nie uległo zmianie"
 
 msgid "Nothing changed"
 msgstr "Nic nie uległo zmianie"
 

-#: templates/admin/wiki/theme/change_list.html:21
+#: templates/admin/wiki/theme/change_list.html:22

 msgid "Table for Redmine wiki"
 msgstr "Tabela do wiki na Redmine"
 
 msgid "Table for Redmine wiki"
 msgstr "Tabela do wiki na Redmine"
 


@@ -128,8 +126,7 @@ msgstr "Trwa zapisywanie"
 msgid "There is a newer version of this document!"
 msgstr "Istnieje nowsza wersja tego dokumentu!"
 
 msgid "There is a newer version of this document!"
 msgstr "Istnieje nowsza wersja tego dokumentu!"
 

-#: templates/wiki/pubmark_dialog.html:17
-#: templates/wiki/revert_dialog.html:40
+#: templates/wiki/pubmark_dialog.html:17 templates/wiki/revert_dialog.html:40

 msgid "Cancel"
 msgstr "Anuluj"
 
 msgid "Cancel"
 msgstr "Anuluj"
 


@@ -222,43 +219,43 @@ msgstr "Znajdź i zamień"
 msgid "Source code"
 msgstr "Kod źródłowy"
 
 msgid "Source code"
 msgstr "Kod źródłowy"
 

-#: templates/wiki/tabs/summary_view.html:9
+#: templates/wiki/tabs/summary_view.html:13

 msgid "Refresh from working copy"
 msgstr "Odśwież z edytowanej wersji"
 
 msgid "Refresh from working copy"
 msgstr "Odśwież z edytowanej wersji"
 

-#: templates/wiki/tabs/summary_view.html:13
+#: templates/wiki/tabs/summary_view.html:17

 msgid "Title"
 msgstr "Tytuł"
 
 msgid "Title"
 msgstr "Tytuł"
 

-#: templates/wiki/tabs/summary_view.html:17
+#: templates/wiki/tabs/summary_view.html:21

 msgid "Go to the book's page"
 msgstr "Przejdź do strony książki"
 
 msgid "Go to the book's page"
 msgstr "Przejdź do strony książki"
 

-#: templates/wiki/tabs/summary_view.html:20
+#: templates/wiki/tabs/summary_view.html:24

 msgid "Document ID"
 msgstr "ID dokumentu"
 
 msgid "Document ID"
 msgstr "ID dokumentu"
 

-#: templates/wiki/tabs/summary_view.html:24
+#: templates/wiki/tabs/summary_view.html:28

 msgid "Current version"
 msgstr "Aktualna wersja"
 
 msgid "Current version"
 msgstr "Aktualna wersja"
 

-#: templates/wiki/tabs/summary_view.html:27
+#: templates/wiki/tabs/summary_view.html:31

 msgid "Last edited by"
 msgstr "Ostatnio edytowane przez"
 
 msgid "Last edited by"
 msgstr "Ostatnio edytowane przez"
 

-#: templates/wiki/tabs/summary_view.html:31
+#: templates/wiki/tabs/summary_view.html:35

 msgid "Link to gallery"
 msgstr "Link do galerii"
 
 msgid "Link to gallery"
 msgstr "Link do galerii"
 

-#: templates/wiki/tabs/summary_view.html:36
+#: templates/wiki/tabs/summary_view.html:40

 msgid "Characters in document"
 msgstr "Znaków w dokumencie"
 
 msgid "Characters in document"
 msgstr "Znaków w dokumencie"
 

-#: templates/wiki/tabs/summary_view.html:37
+#: templates/wiki/tabs/summary_view.html:41

 msgid "pages"
 msgstr "stron maszynopisu"
 
 msgid "pages"
 msgstr "stron maszynopisu"
 

-#: templates/wiki/tabs/summary_view.html:37
+#: templates/wiki/tabs/summary_view.html:41

 msgid "untagged"
 msgstr "nieotagowane"
 
 msgid "untagged"
 msgstr "nieotagowane"
 


@@ -278,9 +275,6 @@ msgstr "Wstaw przypis"
 msgid "Visual editor"
 msgstr "Edytor wizualny"
 
 msgid "Visual editor"
 msgstr "Edytor wizualny"
 

-#~ msgid "Publish"
-#~ msgstr "Opublikuj"
-

 #~ msgid "ZIP file"
 #~ msgstr "Plik ZIP"
 
 #~ msgid "ZIP file"
 #~ msgstr "Plik ZIP"
 

diff --git a/apps/wiki/templates/wiki/tabs/history_view.html b/apps/wiki/templates/wiki/tabs/history_view.html
index 3edfcc8..93b0bb6 100644 (file)
--- a/apps/wiki/templates/wiki/tabs/history_view.html
+++ b/apps/wiki/templates/wiki/tabs/history_view.html
@@ -31,6 +31,7 @@
                        </td>
                        <td>
                 <div data-stub-value="publishable"></div>
                        </td>
                        <td>
                 <div data-stub-value="publishable"></div>

+                <div data-stub-value="published"></div>

                 <div data-stub-value="tag"></div>
                        </td>
                </tr>
                 <div data-stub-value="tag"></div>
                        </td>
                </tr>

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 46da212..f959426 100644 (file)
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -278,6 +278,9 @@ def history(request, chunk_id):
                 "date": localize(change.created_at),
                 "publishable": _("Publishable") + "\n" if change.publishable else "",
                 "tag": ',\n'.join(unicode(tag) for tag in change.tags.all()),
                 "date": localize(change.created_at),
                 "publishable": _("Publishable") + "\n" if change.publishable else "",
                 "tag": ',\n'.join(unicode(tag) for tag in change.tags.all()),

+                "published": _("Published") + ": " + \
+                    localize(change.publish_log.order_by('-book_record__timestamp')[0].book_record.timestamp) \
+                    if change.publish_log.exists() else "",

             })
     return JSONResponse(changes)
 
             })
     return JSONResponse(changes)
 

diff --git a/redakcja/static/css/history.css b/redakcja/static/css/history.css
index acd9f93..cbc5c52 100644 (file)
--- a/redakcja/static/css/history.css
+++ b/redakcja/static/css/history.css
@@ -89,6 +89,11 @@ table#changes-list-container {
     white-space: pre-line;
 }
 
     white-space: pre-line;
 }
 

+#changes-list *[data-stub-value = 'published'] {
+    font-size: .7em;
+    color: gray;
+}
+

 /*
  * Graphical DIFF view
  *
 /*
  * Graphical DIFF view
  *


@@ -151,4 +156,4 @@ table#changes-list-container {
 
 .diff_mark_changed {
     background-color: yellow;
 
 .diff_mark_changed {
     background-color: yellow;

-}
\ No newline at end of file
+}