From 1c8de9a0fa5d7adb8dc595e1935704da088ee2dd Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 10 Jul 2013 16:59:42 +0200 Subject: [PATCH 1/1] Mark published revisions in history. --- apps/wiki/locale/pl/LC_MESSAGES/django.mo | Bin 3813 -> 3867 bytes apps/wiki/locale/pl/LC_MESSAGES/django.po | 64 ++++++++---------- .../templates/wiki/tabs/history_view.html | 1 + apps/wiki/views.py | 3 + redakcja/static/css/history.css | 7 +- 5 files changed, 39 insertions(+), 36 deletions(-) diff --git a/apps/wiki/locale/pl/LC_MESSAGES/django.mo b/apps/wiki/locale/pl/LC_MESSAGES/django.mo index 7245146732b110a20a0b376ee1194dccb2c25cb8..f052501fbadf7934068bfa59518249d04e38f785 100644 GIT binary patch delta 1461 zcmYM!OGs2v9LMo9)2NL)R*w0|*Hk`Aoze0AC@Tp=f{<#FE&{~?MbR`P4P-V6ZK7mw zQ4(Yrgu5DWVT)WCBDFE7MT?5kMG#346%^6;Hy-J7|Mzpxx#ynqKj)sAjog{M@Vivk zwBa~G+C~@cHh#d}_y^tS;pJVJf%~u+ z4;T|RE!=2;kaZXnC{JJ>PU2piL*=w+pFhKL$}6}Be_}Gad07djqXsNQFV-Lfnl{vU z1L$IWGscY?PS^)Gk<;AavJ+=*{XA+W3z&sV$Z6hk(ZC;(9Ly%FzaQ3kI#J^3n2Fh_ zcGZ~5_@;>)WpoC4$8@5WvKvcq99cy(XP?hopP&X_L=Uc5UtJ@uI*d7Q%bST??SG*L{)=j#%q()zi)k1{EqN} zr~#)?iOpgF7m`_jHQbYxQR^EO*Pi=3u|i{9_Gj$tL` z8>j@Hq9*zh^?vw`t$2@`>1R|To3`wrHw~D8N+<={3b9oJQ$-XL^(t^QY!SQWb8RL{ z34I2AI`w^&s3z#DHMX236zu;^>^nA6K0+KLv@euE0ilewv$dq!SUU9i{E^45{K%5a zq|(?)EF)1AUi!Lp{-l311zaI)AXj7p!fpsV}XljNEr;daC>t|0^TU z-7}H?#Llb>{!^jB&`8(l&`6`NeJIq^H|h%pY68{K<-|^B(k1oUKXkQga44GNS#|sa DqVI(! delta 1423 zcmXxkOGs2v9LMo9(~OUC?4g-yKE||{cJt2YSTpt*vPG*bsf8qj3qe6^(SusZ6x6~( zC`Kc)g%Csu)nXPQMi@aEF0w!^{ij$@{~4~s9~i{Hs06cki6$(37WIQL-tZU`xBb_F<>%g^CZ0t-{~gP59@k?I^;N0MQF|bP+%m^d z73x4$pf`{DYqKO7(27RvjfberCs5!16>4*SLM8eemEa=Qqn{rup(rwBT2Li#MNQa^ zO6(%;!a>w?&x6#T#hEDvitz(-nt3jo=npFMCCsdhS+vq}RD#W@`z_WZsFk&&R^E%M zP`~Y8wf$k#roES>p$wm(CVqk1WYf46=TI*QvZb}+LR7yDIZZVe{XSwnh!Og2s06N| z7I+)=`%&9}gj!%SO+%TC+kt7+1n*G^eMGiEraF*$xf0v04#%ElGS^D3`-oaX<<}?E zyY~_egc4O1cM$g9OH<~1#29EM_7mC-)(2=rLQtIQ-Fb?e-)>jsXtI&EDSdd~KoIqe+kJl7QuMci=2aXB0GoEuAh b%^gWOfgEo\n" -"Language-Team: Fundacja Nowoczesna Polska \n" -"Language: \n" +"Language-Team: Fundacja Nowoczesna Polska \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" -#: forms.py:38 -#: forms.py:89 +#: forms.py:38 forms.py:89 msgid "Author" msgstr "Autor" -#: forms.py:39 -#: forms.py:90 +#: forms.py:39 forms.py:90 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" -#: 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 :)" -#: forms.py:51 -#: forms.py:102 +#: forms.py:51 forms.py:102 msgid "Your comments" msgstr "Twój komentarz" @@ -79,15 +73,19 @@ msgstr "motyw" msgid "themes" msgstr "motywy" -#: views.py:299 +#: views.py:281 +msgid "Published" +msgstr "Opublikowano" + +#: views.py:302 msgid "Revision marked" msgstr "Wersja oznaczona" -#: views.py:301 +#: views.py:304 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" @@ -128,8 +126,7 @@ msgstr "Trwa zapisywanie" 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" @@ -222,43 +219,43 @@ msgstr "Znajdź i zamień" 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" -#: templates/wiki/tabs/summary_view.html:13 +#: templates/wiki/tabs/summary_view.html:17 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" -#: templates/wiki/tabs/summary_view.html:20 +#: templates/wiki/tabs/summary_view.html:24 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" -#: templates/wiki/tabs/summary_view.html:27 +#: templates/wiki/tabs/summary_view.html:31 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" -#: templates/wiki/tabs/summary_view.html:36 +#: templates/wiki/tabs/summary_view.html:40 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" -#: templates/wiki/tabs/summary_view.html:37 +#: templates/wiki/tabs/summary_view.html:41 msgid "untagged" msgstr "nieotagowane" @@ -278,9 +275,6 @@ msgstr "Wstaw przypis" msgid "Visual editor" msgstr "Edytor wizualny" -#~ msgid "Publish" -#~ msgstr "Opublikuj" - #~ 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 3edfcc85..93b0bb64 100644 --- a/apps/wiki/templates/wiki/tabs/history_view.html +++ b/apps/wiki/templates/wiki/tabs/history_view.html @@ -31,6 +31,7 @@
+
diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 46da212a..f9594261 100644 --- 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()), + "published": _("Published") + ": " + \ + localize(change.publish_log.order_by('-book_record__timestamp')[0].book_record.timestamp) \ + if change.publish_log.exists() else "", }) return JSONResponse(changes) diff --git a/redakcja/static/css/history.css b/redakcja/static/css/history.css index acd9f933..cbc5c52d 100644 --- a/redakcja/static/css/history.css +++ b/redakcja/static/css/history.css @@ -89,6 +89,11 @@ table#changes-list-container { white-space: pre-line; } +#changes-list *[data-stub-value = 'published'] { + font-size: .7em; + color: gray; +} + /* * Graphical DIFF view * @@ -151,4 +156,4 @@ table#changes-list-container { .diff_mark_changed { background-color: yellow; -} \ No newline at end of file +} -- 2.20.1