From 2c85a46e149380dccf5a69694402bd2519e80203 Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Wed, 29 Mar 2017 13:53:01 +0200
Subject: [PATCH 01/16] rewizja -> wersja

---
 .../catalogue/locale/pl/LC_MESSAGES/django.mo | Bin 8261 -> 8255 bytes
 .../catalogue/locale/pl/LC_MESSAGES/django.po |  12 ++++++------
 apps/dvcs/locale/pl/LC_MESSAGES/django.mo     | Bin 1002 -> 999 bytes
 apps/dvcs/locale/pl/LC_MESSAGES/django.po     |   6 +++---
 redakcja/static/js/wiki/wikiapi.js            |   2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo
index 747ae0a98b695c554896b2ffe6268a11eaef9a42..7766c0c9ee0d7cc0bac796798d203a8c4f679e97 100644
GIT binary patch
delta 621
zcmXZZF-SsD6oBD_X=-Vu5~gO^P!xqwMA%SSLNr9s5VS=@gFy~OL{JFLZ4v}6(JW-V
zXp<UBXb7DQ8YChR+Owdg|M(tU?sxCG@4oZSc~8mvWFg;@9TAa2P-Gn6(1V^H(-5|^
zA3_ICU@IojhjZAAtGI$0>%541?-9LNL59?rj`0U)a6cs3W<n!mCU`&>2PJf38Qbs`
zyYa({{~|*qED}(#6XR&dS<4h^K}$G=YnZ`PT*SX{mMT~*L`25$1hv9z?8iIQ1Xa|E
zzHk{Ec!?>>Pv9rcV>BwVgBy5(FF1<nJ`skTF=@wd@epfS7FzK-+4v~gMBXh&=*Dx)
zE7T9mTYCfbUeVf@P=8ScyReGd`Z{U{zESVnVrGZj*us9G!wUFOF9uO79Y$^ar19)<
u`RxZ=yL(187_l{1xkjk$)X;W1p1bh|a_?cEbr2pjpN&Q8b~EIOP5%Ryeo@Z=

delta 634
zcmXxhO(?@*9Ki8kv(3CLX3OlqjZu=9mY0$#`8#Nm99*2-P*YxVAWHw7++21e<>unB
zwH-(iCCR}{DYfLVlTu0!ngid*9`*Emp6B`X{D05y_dhc)&D3Fu)g~e-zepG6uoB&M
zMGdTA-+~V8K_|x0gC>S>0>^Pt$4^n+yF@qMBST)8Ht-7va3vttU&3slnBW{;1g@|Y
z@30)7uom<Bynqa`86sW`VHI|w9Zl^ps)9zb7bkHEw=s@Ch9xq{A|4d!z%5i2X0ZWJ
zP$kHrs^}fZ@EiAWg!23F6^F1XEHaPNxQh?ijtli74B267#baE<yv0IQJViDhC9}x4
zWfRMAPkVssVQIZTLUr##?{853qDQR89IDp8q3S>ZRYyxB#ST?r3HwH$KBz-=F^sCx
zD5}=?XRaNt8pra?YGOU}=nvY8%j9R^*7bKdmxw0QZg2A0@aWKo(fl8Z5b|ZZgLifv
Hb4Fsn=&o0$

diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.po b/apps/catalogue/locale/pl/LC_MESSAGES/django.po
index 724c3d72..35a38dd3 100644
--- a/apps/catalogue/locale/pl/LC_MESSAGES/django.po
+++ b/apps/catalogue/locale/pl/LC_MESSAGES/django.po
@@ -66,7 +66,7 @@ msgstr "dokumenty"
 
 #: models/publish_log.py:16
 msgid "revision"
-msgstr "rewizja"
+msgstr "wersja"
 
 #: models/publish_log.py:17
 msgid "time"
@@ -227,7 +227,7 @@ msgid ""
 "This is a preview of a specific revision of <a href=\"%(url)s\">this "
 "resource</a>."
 msgstr ""
-"To jest podgląd konkretnej rewizji  <a href=\"%(url)s\">tego zasobu</a>."
+"To jest podgląd konkretnej wersji  <a href=\"%(url)s\">tego zasobu</a>."
 
 #: templates/catalogue/book_text.html:72
 #, python-format
@@ -235,8 +235,8 @@ msgid ""
 "There have been some changes since this revision. <a href=\"%(url)s\">See "
 "the current revision.</a>"
 msgstr ""
-"W dokumencie są zmiany nowsze od aktualnie oglądanej rewizji. <a href="
-"\"%(url)s\">Zobacz aktualną rewizję.</a>"
+"W dokumencie są zmiany nowsze od aktualnie oglądanej wersji. <a href="
+"\"%(url)s\">Zobacz aktualną wersję.</a>"
 
 #: templates/catalogue/book_text.html:78
 #, python-format
@@ -249,7 +249,7 @@ msgstr "Ten zasób nie został jeszcze opublikowany."
 
 #: templates/catalogue/book_text.html:87
 msgid "Do you really want to publish this revision?"
-msgstr "Na pewno chcesz opublikować tę rewizję?"
+msgstr "Na pewno chcesz opublikować tę wersję?"
 
 #: templates/catalogue/book_text.html:92
 msgid ""
@@ -260,7 +260,7 @@ msgstr ""
 
 #: templates/catalogue/book_text.html:93
 msgid "Publish this revision"
-msgstr "Opublikuj tę rewizję"
+msgstr "Opublikuj tę wersję"
 
 #: templates/catalogue/book_text.html:97
 msgid "Do you really want to undo publishing this resource?"
diff --git a/apps/dvcs/locale/pl/LC_MESSAGES/django.mo b/apps/dvcs/locale/pl/LC_MESSAGES/django.mo
index 2f58de7da043315a2b936fca4e90aa79993b3230..5d092dc8c063ba3cf9fdbd071a529ce7d5fcc16c 100644
GIT binary patch
delta 112
zcmaFG{+xY6jjtdB149%u1A{t{&H>V_Kza(0<^|HTfV4P}UIC<8fb;<%%>$&50%<lN
jeF;k6gwhW-o}9?U5}sOAJUO1Zny(zl$Vy}YQ>hF9x^5KD

delta 115
zcmaFP{)&A<jjs>`149%u1A{t{&IQt}Kzb^W<^|HTfwVY~UJ0aGfb>Bi%>$&50ckcM
neHloz1L<2(`q9Rd6PZ|pQp+=|CdV;X3lxD^S&0k~I+Xzc0m&9F

diff --git a/apps/dvcs/locale/pl/LC_MESSAGES/django.po b/apps/dvcs/locale/pl/LC_MESSAGES/django.po
index 2370968c..d110c0e1 100644
--- a/apps/dvcs/locale/pl/LC_MESSAGES/django.po
+++ b/apps/dvcs/locale/pl/LC_MESSAGES/django.po
@@ -48,15 +48,15 @@ msgstr "opis"
 
 #: models.py:56 models.py:169
 msgid "revision"
-msgstr "rewizja"
+msgstr "wersja"
 
 #: models.py:57
 msgid "revisions"
-msgstr "rewizje"
+msgstr "wersje"
 
 #: models.py:170
 msgid "The document's revision."
-msgstr "Rewizja dokumentu."
+msgstr "Wersja dokumentu."
 
 #~ msgid "name"
 #~ msgstr "nazwa"
diff --git a/redakcja/static/js/wiki/wikiapi.js b/redakcja/static/js/wiki/wikiapi.js
index d9a183c4..c6aa0d7f 100644
--- a/redakcja/static/js/wiki/wikiapi.js
+++ b/redakcja/static/js/wiki/wikiapi.js
@@ -296,7 +296,7 @@
         params = $.extend({}, noops, params);
 
         if (params.revision >= this.revision) {
-            params.failure(self, 'Proszę wybrać rewizję starszą niż aktualna.');
+            params.failure(self, 'Proszę wybrać wersję starszą niż aktualna.');
             return;
         }
 
-- 
2.20.1


From 94b8b2f9bdaa5d2c42abfab87297aa690b572123 Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Wed, 29 Mar 2017 13:55:33 +0200
Subject: [PATCH 02/16] "mouse" cursor

---
 apps/wiki/locale/pl/LC_MESSAGES/django.mo | Bin 7461 -> 7448 bytes
 apps/wiki/locale/pl/LC_MESSAGES/django.po |   4 ++--
 apps/wiki/templates/wiki/bootstrap.html   |   2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/django.mo b/apps/wiki/locale/pl/LC_MESSAGES/django.mo
index 666266d14a95ac6265e0004309ec5e4134fc9f75..a0821dbbea33e11d8b08483824e22e0fe3429cd9 100644
GIT binary patch
delta 810
zcmXZa%}W(g7{~G7#qp|FyK0*6QYxs_CUj#1?MifUX(2>`E(#=4R8UY_bVp0^B|>Q+
z3<^b*YY?GKS)ibcXwkxjL5S{J^iM?4_hHUuxSu)CoH^%to-<qis=w2a2-YQiES3uK
zPKi{6_pksTB9AnLT$<!BiO;bem(at=#lPZ3#)r6wCz!?l3(^Ljqpg=sOZm8zR-h_w
zRtR)p4sGKzY{B2iJ4%+uR^oNW&1i}Cq0JvaD_{`wa1<@EaTlL*<7vD~d=9q~(oSh0
zjS#q7E^XpBw1pm1hGjaAmT49(ky*43yuvzsgWdQEf8bx7!0#1tC;UpOk#Pnu<1jwM
z7ns6ya4D{!7OxR#!bh0FdHjqw@Fs0Cr!c}@WDgBi$B8{bOL*QHqIGBuIR(8(D`XF?
z&;!h2@SrB1SX3KNtUzn&6{HzzN6XZA@!RM#&Y*Q-!MTh!|23}RHon6i+H{0}kgh9N
zA0N#ZWJ;g|ZaR7J3vIzvgVc)UXfJeO8TMcs-bedpX3#2Jb#6F6IQP(w><H~!IL2G}
q6FGXZ9lx;3n@lu?FTJsZqJQ3gGVD#)MW@AYOTwr1sc5cd-TMzo&sNm{

delta 818
zcmXZaPe@cz6vy%3qu2DuaWwyorc)|GBZ?483ujgIZ=cK}5f=q&48s&tqLDoiNh}m&
zC=3jtnl_OJQ;C0&=+8p2O{<`d(Z;=Nq3`M4;W3|g&%5v5bIyHpsbcDV!VBI=S}c<e
zV>&7w!G1i1L&ziDLN49sFM?CpinHkBii>Yx731$Xg}?9tUN4tk;vcm2CSuY-oQ)|^
zoSSC^I`JLa#yfZlcae7#tq5(vGmKl&61|2t{{~tC89ab@&=MPQ@i8}kh;76lW6_g7
zRRmI&K;JRxHEy9Tl%ovGbObHa3A98Wp><#m8*l+H<0@{US1sjn8wu%LjdTKgunBMD
zI6lFnSQFHS6*OTxfg}!M4^HA5cH;%wWR778mytb`sS6Ve&=Q_@K1b_N5jh1dp%t=@
zR_GU8#9**KoESeIPHaYNX$R5_okh#^ii=;x6ysjBPCRwaqs@PX3-}RVV4604#yzC#
z`p_62%{OF9piOSNc<>i(!McQW8c(9Va0x3hjY%9p`(|eFe}&E^=Zf<y+L8T0`xbuV
zMchG-UTnv&5ch{Y6{h{1*HYT|*CKv4cQ;=+A4`;emd!^a+0p#H%*|4^{;mHHe=b}K

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/django.po b/apps/wiki/locale/pl/LC_MESSAGES/django.po
index f9761061..9c7b13fe 100644
--- a/apps/wiki/locale/pl/LC_MESSAGES/django.po
+++ b/apps/wiki/locale/pl/LC_MESSAGES/django.po
@@ -96,11 +96,11 @@ msgstr "Tutaj możesz prześledzić historię zmian w dokumencie."
 
 #: templates/wiki/bootstrap.html:180
 msgid ""
-"Place the mouse cursor at the end of the line after which you want to add a "
+"Place the cursor at the end of the line after which you want to add a "
 "new header, and press Enter. Click “header” to switch the new paragraph into "
 "a header."
 msgstr ""
-"Ustaw kursor myszki na końcu wiersza, pod którym chcesz dodać nowy nagłówek "
+"Ustaw kursor na końcu wiersza, pod którym chcesz dodać nowy nagłówek "
 "i wciśnij Enter. Kliknij „nagłówek”, aby edytować wiersz i zamienić go w "
 "nagłówek."
 
diff --git a/apps/wiki/templates/wiki/bootstrap.html b/apps/wiki/templates/wiki/bootstrap.html
index 4e4e9479..5fa6d57e 100644
--- a/apps/wiki/templates/wiki/bootstrap.html
+++ b/apps/wiki/templates/wiki/bootstrap.html
@@ -177,7 +177,7 @@
                     {name: 'editor', text: '{% trans "Edit your document text." %}'},
                     {name: 'sourceEditor', text: '{% trans "View the xml code of your document." %}'},
                     {name: 'history', text: '{% trans "Here you can view the change history." %}'},
-                    {name: 'switchToHeader', text: '{% trans "Place the mouse cursor at the end of the line after which you want to add a new header, and press Enter. Click “header” to switch the new paragraph into a header." %}'},
+                    {name: 'switchToHeader', text: '{% trans "Place the cursor at the end of the line after which you want to add a new header, and press Enter. Click “header” to switch the new paragraph into a header." %}'},
                     {name: 'switchToParagraph', text: '{% trans "Use this option to switch a header to a paragraph." %}'},
                     {name: 'switchToImage', text: '{% trans "Add graphics to your document. Click “image” to make a frame, then click this frame to insert an image file (JPG, PNG, GIF, SVG)." %}'},
                     {name: 'switchToVideo', text: '{% trans "Add a video material to your document to make it more attractive. Paste the http link from a YouTube channel." %}'},
-- 
2.20.1


From f0114e5a98422c573e9389688cfa51a257c00f0d Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Wed, 29 Mar 2017 15:25:16 +0200
Subject: [PATCH 03/16] update fnp-django-pagination

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index d8d3bf5b..ecfa9a0a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,7 +17,7 @@ fnpdjango>=0.2,<0.3
 django-pipeline>=1.6,<1.7
 sorl-thumbnail>=12.3,<13
 #django-maintenancemode>=0.9
-fnp-django-pagination
+fnp-django-pagination>=2.2.1
 django-gravatar2
 python-slugify
 django-forms-bootstrap
-- 
2.20.1


From 490dd5af5eec011c23f05b6eb747b7a792c14520 Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Thu, 30 Mar 2017 11:08:54 +0200
Subject: [PATCH 04/16] tutorial placement

---
 apps/catalogue/templates/catalogue/document_create_missing.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/catalogue/templates/catalogue/document_create_missing.html b/apps/catalogue/templates/catalogue/document_create_missing.html
index eff24fea..affd7977 100644
--- a/apps/catalogue/templates/catalogue/document_create_missing.html
+++ b/apps/catalogue/templates/catalogue/document_create_missing.html
@@ -71,7 +71,7 @@
         <label for="description">{% trans "Summary" %}</label>
             {{ form.description.errors }}
             <textarea class="form-control" name="description" id="description"
-                data-toggle="tutorial" data-tutorial="4" data-placement="bottom"
+                data-toggle="tutorial" data-tutorial="4" data-placement="top"
                 data-content="{% trans 'You can provide a short description of the document here.' %}"
             >{{ form.description.value|default:"" }}</textarea>
         {% comment %}
-- 
2.20.1


From 0a92dff0038fdf2c3931f8dee78594e17cb14efe Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Thu, 30 Mar 2017 11:17:05 +0200
Subject: [PATCH 05/16] add prev button in tutorial mode + cleanup

---
 redakcja/static/js/catalogue/catalogue.js | 51 ++++++++++++++---------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/redakcja/static/js/catalogue/catalogue.js b/redakcja/static/js/catalogue/catalogue.js
index fa3f5f2b..796e3e8b 100755
--- a/redakcja/static/js/catalogue/catalogue.js
+++ b/redakcja/static/js/catalogue/catalogue.js
@@ -36,8 +36,8 @@
                 weekStart: 1,
                 onRender: function(date) {
                     return date.valueOf() < now.valueOf() ? 'disabled' : '';
-                },
-            }).on('changeDate', function(ev) {
+                }
+            }).on('changeDate', function() {
                 checkout.hide();
             }).data('datepicker');
         });
@@ -47,20 +47,21 @@
             var helpdiv = $(this).next();
             if (helpdiv.hasClass('help-text')) {
                 var helptext = $("option:selected", this).attr('data-help');
-                helpdiv.html($("option:selected", this).attr('data-help') || '');
+                helpdiv.html(helptext || '');
             }
         });
 
 
 
         // tutorial mode
-        var tutorial;
+        var tutorial, tutorial_no;
         var start;
 
         var first_reset = true;
         function tutreset() {
             if (start) $(start).popover('hide');
             start = null;
+            tutorial_no = null;
             var all_tutorial = $('[data-toggle="tutorial"]');
 
             function sortKey(a) {
@@ -70,21 +71,19 @@
                 function(a, b) {return sortKey(a) < sortKey(b) ? -1 : 1}
             ));
 
-            console.log($(tutorial[0]).data('popover'));
-            console.log($(tutorial[16]).data('popover'));
             if (first_reset) {
                 $.each(tutorial, function(i, e) {
-                    var but = (i < tutorial.length - 1) ? '>>' : 'OK';
+                    var but = (i < tutorial.length - 1) ? '>>' : 'OK',
+                        but_prev_html = i === 0 ? '' : '<a class="btn btn-default tutorial-prev" href="#-" id="pv'+i+'">&lt;&lt;</a></div></div>';
                     $(e).popover({
                         title: '<a class="btn btn-default tutorial-off" href="#-" id="tutoff'+i+'" style="float:right; padding:0 8px 4px 8px; position:relative; top:-6px; right:-10px;">&times;</a>Tutorial',
                         trigger: 'focus',
                         html: 'true',
-                        template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div><div><a style="float:right" class="btn btn-default tutorial-next" href="#-" id="nt'+i+'">' + but + '</a></div></div>'
+                        template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div><div><a style="float:right" class="btn btn-default tutorial-next" href="#-" id="nt'+i+'">' + but + '</a>' + but_prev_html + '</div></div>'
                     });
+                    $(e).popover('disable');
                 });
                 first_reset = false;
-            } else {
-                all_tutorial.popover('enable');
             }
         }
         
@@ -93,7 +92,7 @@
             tutreset();
             var $tutModal = $('#tutModal');
             if($tutModal.length === 0) {
-                tut();
+                tutnext();
             } else {
                 $tutModal.modal('show');
             }
@@ -107,28 +106,42 @@
             $('[data-toggle="tutorial"]').popover('disable');
             return false;
         }
-        function tut() {
+        function tut(next) {
             if (start) {
                 $(start).popover('hide').popover('disable');
             }
-            if (tutorial.length) {
-                start = tutorial.shift();
-                $(start).popover('show');
+            if (tutorial_no === null)
+                tutorial_no = 0;
+            else if (next)
+                tutorial_no++;
+            else
+                tutorial_no--;
+            if (tutorial_no < tutorial.length && tutorial_no >= 0) {
+                start = tutorial[tutorial_no];
+                $(start).popover('enable').popover('show');
             }
             else {
+                tutorial_no = null;
                 start = null;
             }
             return false;
         }
-        $('#tutModal').on('hidden.bs.modal', tut);
+        function tutnext() {
+            tut(true);
+        }
+        function tutprev() {
+            tut(false);
+        }
+        $('#tutModal').on('hidden.bs.modal', tutnext);
 
-        if (sessionStorage.getItem("tutorial") == "on" && $('#tuton').length == 0) {
+        if (sessionStorage.getItem("tutorial") === "on" && $('#tuton').length === 0) {
             tutreset();
-            tut();
+            tutnext();
         }
         $(document).on('click', '#tuton', tuton);
         $(document).on('click', '.tutorial-off', tutoff);
-        $(document).on('click', '.tutorial-next', tut);
+        $(document).on('click', '.tutorial-next', tutnext);
+        $(document).on('click', '.tutorial-prev', tutprev);
     });
 })(jQuery);
 
-- 
2.20.1


From f9007415b6e2bd378770518658c78bd054a4ff6c Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Thu, 30 Mar 2017 11:47:51 +0200
Subject: [PATCH 06/16] add info to continue tutorial

---
 redakcja/locale/pl/LC_MESSAGES/django.mo      | Bin 6301 -> 6084 bytes
 redakcja/locale/pl/LC_MESSAGES/django.po      |  12 +++++++++---
 .../templates/registration/head_login.html    |   2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/redakcja/locale/pl/LC_MESSAGES/django.mo b/redakcja/locale/pl/LC_MESSAGES/django.mo
index 6a4c429bc2e3371a9f6926a3aa3920119ccdad70..4440eb2ff0e1ea5a241d1e9d78e9776e4dc9b4a8 100644
GIT binary patch
delta 1275
zcmYk+OGs2v9LMp$Hab4ioYCxI+GvwnTF!MwD<Oz7dMr{}xCo63k{%Qj<;H?*MbTrW
zk_F|~pcY0$3!#XhMH1~IdQ3vJ2!aY1wF#o{@6HK2+;czooHO^H^Z%d2OnT4T{JCi8
zhEX<BS5UKgW<7Xk0XNFqkl7i0hg)$^ff<*LI&Wfx_9QOCX)MC07{wRp;Rh_lGHwg8
z3K{pUKKEcLEMZ^=#&9oI;b|PiD|i-v;1nJY=O&Ian-&nqV(dhQYzy*J+v&!8T>Bs{
zq5lX*ncqfS$2e9na38h8$F4o=+V8Q9{x3L)KarrUpIOWC5YlC*uos72`z3POYi{*8
zhoh)yhnU~Sc+iK7O3nJP8kM>eco9cXFNRpvb!@~n_z)F&7B}N}WS6X!k7*$u4zQhF
zs4cw3Dz&v`>=Qq=0rVBYF&-9U8oBH;H)Uc1wXnOG!bhl-enmwzkJ_T&sD)JUlD^k~
zI!n!{@$GmL_u&N2;u|~=A^&=D1K}#-UEH+te$-hwjG8EoOK}*rx8qogx3Lmua3#J%
zzHQ%-q}d<WF5yRN*EpN-9PMN!`By3)&{2m^P!VRa7eAx+Hboff--fGkH(tUtUc+Cg
ziO-Y9{WylaYV)WqET|?(yowj_8OE{O=O}7rM{yGlp(36}Wnc!`!r*0PKxHje(W`jW
zn&2t7MIG*$^#qwzv(5D_cQztB76jtwyH24A6V&z8RaBK_IV_2t?pbIXSerFb6{*s{
zj;aHw!>X*2{UDfTRF(-k$dV4PvQ6m=(yBw#PSv4N(V_cS$e=a2hW?~<Ui9D8LT#lg
odok+&C7$^hn##+3Dy$8cCKEBw>q>RBB-%5@<@fS4brC=O7mi<Nr2qf`

delta 1512
zcmYk+U5rd;9LMqh>e_9wEb86z)Y29$W?8I+i;W8!QAw$n*fwW&k2<@vGt4<-GE0nL
z<L!nGn;_D(ktNdhX2KP5(ODNn)|G0SY}2$CMB++Z`~G&$mM8N+pXX)HJkRrg&YAM^
zYl-6Ul<G@HX(8qk|5cfNjlX=rh4Q@GEW#Jqir<Yj<6}R?-oVMUf5l07A3ww)oPy6V
zfiJNJ8@Nosg~)i(5|xT=#BmJlM2AUi!xQ*1{)7AQ4Iaj}TC)NC6SaV2%qsivBfO3b
z*>A`#b|)Uc7q^FS2J_ofDq88Qkq)ye?yjdj3$@ZEaeGbN-h_4Z??5f69od{c#EJL>
z`6>Gwx8d`+-NNpuS}T5nTkrz&TbfD^ZG7d258<~oPofs~7oNaZs2j7a>KtCg#pqa#
zcK#Kv$GymD*%j16e#AD8^(N{lYd9wz@nI}#hmWXe2hVUC4kI6X%|)50=EA);4Od|!
zDy6$nJNh1VL;-3cM^V3b9`#K1V<(nS-<!vm(ztRm`R}LlGaXN{h3)DG>ZewAz5um@
zW+X|r0X5-foQdC{&Nzh)7$G0)<1!xykU8xEl05q(ZvPv%Ur#0f8ql(izywrA&fq-k
zNA2`BZo|8%Gp-{|>Ys~?un~K4GoHmE)WmzH^TuEoGN(O69px~t!DMlU*>NgYa3MCZ
zEiI@O^-69<?f5h*1AWL*+FD{3p|X_FVpW<5rCeETCRP(FtY;*Xs;|(6GKbLfXP*%|
z?@x&_#Awlk31T^+#i`7$F!CH|2ct#Dz}oC{f+U$EmJxao7ZA#tGN8>YCX{9Nyl*5;
zOK9l4RFqadJSz#Esfr%H(L&~|F>WYBdPDSI^#$=Iq3r1`dA}?wJ+2<8+Plfm`mT`4
zxppt@!pO@;&hH4KApL{$T-wjOtRH4_*>>M$vhGko2Vc(q-y1qF-Qm1c${olhQ$e`j
z?|3&>I#@Hmc6`$+muOzsw07x=MCoeXtue*zxyb8u-I>9=e%RxBy!M`QZ}}9{7NShv
zqn6I(3-pJ-my#}(OS*hv@M=Erqg23Pn9p?j8qFjNE^zs<rw~S6f$xGaN(X*txtFz8
dhL_n^`VV;BLHTmzb-VpuIC$JE?XK^teG9h8!;k;~

diff --git a/redakcja/locale/pl/LC_MESSAGES/django.po b/redakcja/locale/pl/LC_MESSAGES/django.po
index 365e99ee..1a278746 100644
--- a/redakcja/locale/pl/LC_MESSAGES/django.po
+++ b/redakcja/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-24 15:28+0100\n"
+"POT-Creation-Date: 2017-03-30 11:45+0200\n"
 "PO-Revision-Date: 2011-10-18 11:19+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -210,12 +210,18 @@ msgid "You are not a member of any organizations"
 msgstr "Nie należysz do żadnej organizacji"
 
 #: templates/registration/head_login.html:43
+#, fuzzy
+#| msgid ""
+#| "Here you can start editing a new resource or view your resources and all "
+#| "published resources."
 msgid ""
 "Here you can start editing a new resource or view your resources and all "
-"published resources."
+"published resources. To continue this tutorial, go to “New resource” or open "
+"an existing resource."
 msgstr ""
 "Tutaj możesz zacząć edytować nowy zasób lub wyświetlić swoje zasoby i "
-"wszystkie istniejące zasoby."
+"wszystkie istniejące zasoby. Aby kontynuować tutorial, przejdź do „Nowy "
+"zasób” lub otwórz istniejący zasób."
 
 #: templates/registration/head_login.html:46
 msgid "Resources"
diff --git a/redakcja/templates/registration/head_login.html b/redakcja/templates/registration/head_login.html
index 0c13ac8a..9ffb36b9 100644
--- a/redakcja/templates/registration/head_login.html
+++ b/redakcja/templates/registration/head_login.html
@@ -40,7 +40,7 @@
 </li>
 <li class="dropdown" {% if request.path == '/' %}
     data-toggle="tutorial" data-tutorial="2" data-placement="bottom"
-    data-content='{% trans "Here you can start editing a new resource or view your resources and all published resources." %}'
+    data-content='{% trans "Here you can start editing a new resource or view your resources and all published resources. To continue this tutorial, go to “New resource” or open an existing resource." %}'
     {% endif %}>
     <a href="#" class="dropdown-toggle" type="button" data-toggle="dropdown" style="color: white">
         {% trans "Resources" %}
-- 
2.20.1


From 8aa768e4480f62eed277c3d530cfbc1c8961765e Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Thu, 30 Mar 2017 13:31:54 +0200
Subject: [PATCH 07/16] even more tutorial in editor (status bar, undo, redo)

---
 apps/wiki/templates/wiki/bootstrap.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/wiki/templates/wiki/bootstrap.html b/apps/wiki/templates/wiki/bootstrap.html
index 5fa6d57e..1a380b46 100644
--- a/apps/wiki/templates/wiki/bootstrap.html
+++ b/apps/wiki/templates/wiki/bootstrap.html
@@ -177,6 +177,9 @@
                     {name: 'editor', text: '{% trans "Edit your document text." %}'},
                     {name: 'sourceEditor', text: '{% trans "View the xml code of your document." %}'},
                     {name: 'history', text: '{% trans "Here you can view the change history." %}'},
+                    {name: 'statusBar', text: '{% trans "The status bar shows helpful messages when you place the mouse cursor over toolbar buttons." %}'},
+                    {name: 'undo', text: '{% trans "Click Undo to revert recent changes." %}'},
+                    {name: 'redo', text: '{% trans "Redo will reapply undone changes." %}'},
                     {name: 'switchToHeader', text: '{% trans "Place the cursor at the end of the line after which you want to add a new header, and press Enter. Click “header” to switch the new paragraph into a header." %}'},
                     {name: 'switchToParagraph', text: '{% trans "Use this option to switch a header to a paragraph." %}'},
                     {name: 'switchToImage', text: '{% trans "Add graphics to your document. Click “image” to make a frame, then click this frame to insert an image file (JPG, PNG, GIF, SVG)." %}'},
-- 
2.20.1


From 972798eca6a4dc8e9c7e5bc7cb86cf242a9f3d72 Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Thu, 30 Mar 2017 13:34:46 +0200
Subject: [PATCH 08/16] update editor

---
 apps/wiki/static/wiki/editor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wiki/static/wiki/editor b/apps/wiki/static/wiki/editor
index 24e1f421..a49547b7 160000
--- a/apps/wiki/static/wiki/editor
+++ b/apps/wiki/static/wiki/editor
@@ -1 +1 @@
-Subproject commit 24e1f42110e9836448816a3297c3fb291dda5cea
+Subproject commit a49547b7a4bef633bb92bee9cf97fdcfe67c76aa
-- 
2.20.1


From 4e7aaa55651ce32fed3e729ff6b8da680a30fd36 Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Thu, 30 Mar 2017 16:18:55 +0200
Subject: [PATCH 09/16] fix permissions

---
 apps/catalogue/views.py | 19 ++++++++++++-------
 apps/wiki/views.py      |  8 ++++++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index a11eadb9..1021c878 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -16,7 +16,7 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.sites.models import Site
 from django.core.urlresolvers import reverse
 from django import http
-from django.http import Http404, HttpResponse
+from django.http import Http404, HttpResponse, HttpResponseForbidden
 from django.shortcuts import get_object_or_404, render, redirect
 from django.utils.encoding import force_str
 from django.utils.http import urlquote_plus
@@ -319,6 +319,8 @@ def book_mobi(request, pk, rev_pk):
 @login_required
 def book_schedule(request, pk):
     book = get_object_or_404(Document, pk=pk, deleted=False)
+    if not book.can_edit(request.user):
+        return HttpResponseForbidden("Not authorized.")
     if request.method == 'POST':
         Plan.objects.filter(document=book).delete()
         for i, (s, name) in enumerate(STAGES):
@@ -349,6 +351,8 @@ def book_schedule(request, pk):
 @login_required
 def book_owner(request, pk):
     doc = get_object_or_404(Document, pk=pk, deleted=False)
+    if not doc.can_edit(request.user):
+        return HttpResponseForbidden("Not authorized.")
     user_is_owner = doc.owner_organization and doc.owner_organization.is_member(request.user)
     if not (doc.owner_user == request.user or user_is_owner):
         raise Http404
@@ -382,8 +386,8 @@ def book_owner(request, pk):
 @login_required
 def book_delete(request, pk):
     doc = get_object_or_404(Document, pk=pk, deleted=False)
-    if not (doc.owner_user == request.user or doc.owner_organization.is_member(request.user)):
-        raise Http404
+    if not doc.can_edit(request.user):
+        return HttpResponseForbidden("Not authorized.")
 
     if request.method == 'POST':
         doc.deleted = True
@@ -402,9 +406,9 @@ def publish(request, pk):
     from .models import PublishRecord
     from dvcs.models import Revision
 
-    # FIXME: check permissions
-
     doc = get_object_or_404(Document, pk=pk, deleted=False)
+    if not doc.can_edit(request.user):
+        return HttpResponseForbidden("Not authorized.")
     form = forms.DocumentTextPublishForm(request.POST, prefix="textpublish")
     if form.is_valid():
         rev = Revision.objects.get(pk=form.cleaned_data['revision'])
@@ -439,9 +443,10 @@ MIL/PEER team.''' % (doc.meta()['title'], site.domain, reverse('catalogue_html',
 @require_POST
 @login_required
 def unpublish(request, pk):
-    # FIXME: check permissions
-
     doc = get_object_or_404(Document, pk=pk, deleted=False)
+    if not doc.can_edit(request.user):
+        return HttpResponseForbidden("Not authorized.")
+
     doc.publish_log.all().delete()
     if request.is_ajax():
         return http.HttpResponse('ok')
diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 461f1109..6a5f2ac5 100644
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -55,6 +55,8 @@ def get_history(document):
 @never_cache
 def editor(request, pk, template_name='wiki/bootstrap.html'):
     doc = get_object_or_404(Document, pk=pk, deleted=False)
+    if not doc.can_edit(request.user):
+        return HttpResponseForbidden("Not authorized.")
 
     save_form = forms.DocumentTextSaveForm(user=request.user, prefix="textsave")
     text = doc.materialize()
@@ -88,10 +90,10 @@ def editor(request, pk, template_name='wiki/bootstrap.html'):
 @decorator_from_middleware(GZipMiddleware)
 def text(request, doc_id):
     doc = get_object_or_404(Document, pk=doc_id, deleted=False)
-    # if not doc.book.accessible(request):
-    #     return HttpResponseForbidden("Not authorized.")
 
     if request.method == 'POST':
+        if not doc.can_edit(request.user):
+            return HttpResponseForbidden("Not authorized.")
         form = forms.DocumentTextSaveForm(request.POST, user=request.user, prefix="textsave")
         if form.is_valid():
             if request.user.is_authenticated():
@@ -156,6 +158,8 @@ def revert(request, doc_id):
     form = forms.DocumentTextRevertForm(request.POST, prefix="textrevert")
     if form.is_valid():
         doc = get_object_or_404(Document, pk=doc_id, deleted=False)
+        if not doc.can_edit(request.user):
+            return HttpResponseForbidden("Not authorized.")
         rev = get_object_or_404(Revision, pk=form.cleaned_data['revision'])
 
         comment = form.cleaned_data['comment']
-- 
2.20.1


From 7a406f1d8796bbe87390f5d7879318957e425150 Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Thu, 30 Mar 2017 17:38:50 +0200
Subject: [PATCH 10/16] update translation

---
 .../catalogue/locale/pl/LC_MESSAGES/django.mo | Bin 8255 -> 8332 bytes
 .../catalogue/locale/pl/LC_MESSAGES/django.po |  12 ++--
 apps/wiki/locale/pl/LC_MESSAGES/django.mo     | Bin 7448 -> 7871 bytes
 apps/wiki/locale/pl/LC_MESSAGES/django.po     |  60 +++++++++++-------
 4 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.mo b/apps/catalogue/locale/pl/LC_MESSAGES/django.mo
index 7766c0c9ee0d7cc0bac796798d203a8c4f679e97..ed75935d40e49922be4d855c2aa68e96f125cfa3 100644
GIT binary patch
delta 1752
zcmXxkYiJZ#7{>8;buZCuOx-orXiU}{)h3#3jABYwji{(ZYvUSkT_lMiUCkPa(HLl0
zqT*dB9WRLB1;Gy%MH@@8pe2ZfDk6oJLJ^^&n6!RTP+M%(|C1e;nfaYLbLO1$zUR#T
zIQLL>`a#Hh)c7Sh3pl-l&C>YP$Aw>Cz-$%vV>VW2nQ_=sE`F@TASUo*+=v`@luIt2
z!Zy5w4LEK{rk~xIr=h;0@F5S*<3zlU9QKflI(Ukj*ne1p`9sZea3N}-IBFsZoPZlp
z?e<{>eurxRm+L>M3Hyo0r%=Nbyj0|42n+E8jN%fUhZ^WG>cwL?49{U0zs2qN6VApM
zjg-7EQ4`yVdVfE1*w<WWYNs(zss4t7BJRa8cn3AW6I2H;Q62n`>ex>>tcC@#6h~k^
z&d23=9;@&bPR0s4(|ZXVi;bv2yD_Z+j!;;GCsCW>1xE28`Jao|aWlTb6PO}BQ!p^x
zEP_$2#9Gu^A3{y|Eh<A<j5Y!bknCF&^}H%X{xyLGR4Aev_dy($kpyby&B)l6LV~g`
zR0<EG+8sxAcox<E0<w?oGHPkBx?V%Qcf-BE9U}i^)$UOd9AtJMH*(+4bTv?%Evk+i
zP!rvRilhz8aW5*OAKdy|*vb7Ln8Y|cn=b7JDign8K0d|>zD-lm1R^6dYd#gnb6<sX
za6M`wr%@BQhyxK}G56O{OYs<^m^&)dU$yHpRK)9WAd{$mQpoC9x}AbPuRXX7&$$hr
zqh9<MH31*frf6a8!V-+(1ylfir~zJ}GWHs^q~6h)3<Z&-*hp0URHRATW>8RSK1Ho@
zBPznJt~*czbm2@qfZB|`xDd<uWR$56EWz(l5kA5q{2SGOHc={|BCNq;JfrV_2ZdQw
z<nwJ*V=boe2%f}2g_%^JLJqslMJeycP7E`OB0h}F$&Mjo+7;C1yzBZqYGQx7_kEa^
zrsBC<@fwvvUnH|>vQd9Tg{UPcMP(v}>SzfnQ=g%Bd!2i~)^$DV{SBzdx1ly`H+oQg
zI=}h~Jgc2&zEaORXPp0|$~r1pmx0t(pni)u*K$tcT+XTJR&tU!Tg=Jcv(KGwe{o)d
z()*vj6D`;pr`JEnv%>KNN^@4de~57>7TD{l?YR}$H#9f3t))G=rKKs-_(f~7vB{|k
zRSvFi-s<cMrL(7(MWQo5DW6_kR^F2n{y7-xNH(>!Zfa|7-`pAL=xn&z)8_nE6!W&%
LHz%Fpk!kM$?kKq_

delta 1665
zcmXxkd29?}7{~Ev(OudqyVOzIE=sG1YHg|&tF4MFDy~vWq>Y3+8X81VD{j$<m^5)F
zNbm;<NyQ%$AtJ6+_(zFQA#VOtSBUuj?AXlA=bd+E-uHQ)d1sqSua!jF16`VpUlsd6
z_Kr?w5p0d&!0(RFY#!dlI2_c~jLmX5c(DNEF^riw71?YZhaR{E>v2EUpr>1OoF$m3
zsaDhI!-ZX#hR2c3Zg9{5t*F4BVK)B6?l>$qI#CD}NEnCU1k`=YFoeyh`|r6vK?VF4
zW0dL_8eQo4i2?kBJ<(6PQ*kgVqgAK}*JA>1$6k04*W(!+hsoTe;w?l4R)c!J7TK(x
z1GicP6IJScG)T%$;s88{n&38SfHu?s&rt)vMc#&e#$4>cYD^=|8Mq6_;$zIf-VCPa
z!kCO@s6?wVq6ya0n2(!Ki{TOG;R@<sg2%BA+wm}#Q=Z}Y4uk0Tn-yU`>Rqoy1^fb4
zq4(Gue<Q^;KeOxlzyS4E07L0eM%nI#5UL_!ROFLT@30(Ix+?ejQq(|eQ1@-b&bSrz
zN_U{{-|L<?BgL{Kl7)UYK>e4~af$FWK`Kj91LmLtD?mja#(bQG%3!D4e*haeKaI7R
z%1UNz+l$Kl81~1D7{q(106rl_wjU81gK7BsniXRvDv;%<05+g9iC`A)K$ZR?=HXM+
zfbspJ_D5wr3{{bQ)HsDm^{p87HO<877^!n_xQcr4CMtl3$Y$*v8u2@ZaUJPs!WPs7
z*HIO_g?fb#P!)QN6vbY-{XdY+EGb%<BxE^7Yy=HuIL@^UHNj*ozzWpjYr={63stG{
zd@9+v4VB>qOvTHn(zl@!`iRr;8=k;2(l5l<SgP+onQvkh9gFcO-ba<XHpPt1nmMTC
zm#_ibQ5jb<8?jh5GPZ3-E!sn_r%-{Nch6f;&s}xTZ(+<FIv&!{A5I&p^zTp=_=*~!
zQ!rYgZm89r;GPFi&-F!Rnt>{P$oUYH?wRNKy}6$GPN_G&sDfS<p8@~<CxT68uVf#}
zK7(B;C>pJfDeNpPTi~4ZW+hh9`v23%ptoYqOK-7fmNUqg+kNi;i#Xd^<lF7BmN&jV
mu})*4(76(5j2l@L%o{ysR48j?Ud#AicjKLu;8<sIFy}9vx26pM

diff --git a/apps/catalogue/locale/pl/LC_MESSAGES/django.po b/apps/catalogue/locale/pl/LC_MESSAGES/django.po
index 35a38dd3..1f17ff25 100644
--- a/apps/catalogue/locale/pl/LC_MESSAGES/django.po
+++ b/apps/catalogue/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Platforma Redakcyjna\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-09 17:34+0100\n"
+"POT-Creation-Date: 2017-03-30 16:23+0200\n"
 "PO-Revision-Date: 2014-04-01 11:29+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org."
@@ -52,15 +52,15 @@ msgstr "Plik ZIP"
 msgid "Directories are documents in chunks"
 msgstr "Katalogi zawierają dokumenty w częściach"
 
-#: models/document.py:25
+#: models/document.py:26
 msgid "stage"
 msgstr "etap"
 
-#: models/document.py:36 models/publish_log.py:15
+#: models/document.py:37 models/publish_log.py:15
 msgid "document"
 msgstr "dokument"
 
-#: models/document.py:37
+#: models/document.py:38
 msgid "documents"
 msgstr "dokumenty"
 
@@ -90,7 +90,7 @@ msgstr "kategoria"
 
 #: models/tag.py:15
 msgid "multiple choice"
-msgstr ""
+msgstr "wielokrotny wybór"
 
 #: models/tag.py:21
 msgid "categories"
@@ -102,7 +102,7 @@ msgstr "tag"
 
 #: models/tag.py:36
 msgid "tags"
-msgstr ""
+msgstr "tagi"
 
 #: templates/catalogue/book_delete.html:5
 #: templates/catalogue/book_owner.html:5
diff --git a/apps/wiki/locale/pl/LC_MESSAGES/django.mo b/apps/wiki/locale/pl/LC_MESSAGES/django.mo
index a0821dbbea33e11d8b08483824e22e0fe3429cd9..5c5b3ede20cd7d0d8db6f107ddf13443824eea62 100644
GIT binary patch
delta 1869
zcmYM!Uu+ab9Ki9p!WE@Rp+zj9y`j<y<t*1$5RTGHp(JQRL?qS_6SmjA-rk?x%k8b_
zZGuPCrfBp@i28sQqc%}_&<oZFP$DJ%dGW!-$csi^@I`$hCI*e)-`-XxH}{#Do1H(u
znY}lYU+$^>+_v<LB8`&oCC8hTdK!n8@<p1BDpkO9IE}5%O10n_TrTa%M}5rKO00+V
zufqDbxQX_ka4-IYU*O0xrLs!Z)V~zg(_r19R2RO49XN+F@nw_=`|ebVt}2P0IEoW!
zp!8e7ZX94${Wy-N@fBQ$F$P(UyKn_QhAqsm#wo~VCxZqSf-;eZvf~pti%WQlwW#-y
zxzu^wi1R4@uOVI4ugFLJ&KH|if8%D1+|`(;7o~k0wlTljLE&XQh|l8>_%1#{JY~R}
z7{y4dQfqM;9>Y!?Kp$lR=kb2LfDECoh2Fpf^_wUQ?^)I8pTL^zXeWgwxECc7V<_#9
zhV>)ZOMM*Qk0|vb7N~D&BO3SyO8=qu#)8LC7JL|GAy1*~*hD$%JU)ms?Zp28g$p!%
zhquthuh$S7+<muF_u(OoVIE(=SCL~?t%O5%z8<$?7f#_JoWaj<7Y^Uk@Hwng{}h=@
zr8|hftkCDiNvKbSo<<4PEXrAah_a)3lpSBfIh^2TNx$W6OZu(BVcdwau;VC~E`zdQ
zKWv}IB=y&76eKj?gnp0mz>oM2{)T7q)CQ$4V-N2r$Ea?g9MxYaxBC{RaV_B*#1kmv
zeu6#tIm&atAg8DP#0Rh@?-Ef`n^AT$5_&N7Na!;tk(xr8*u(wkBUd8$?|29`St5}n
zOWHynA#WqgWqpJ!iO1w<Yl@=|&Ta?Fnaispw^+g_NnWwVBrBHP$U@~@`^d7}F7haO
zG0ElPh=V_z#kNHsrqCT$67v4X!it=~goa4}pXAodamd+8lsJtb3J_eNVU+Mo8fp-P
zc_(GLFWl4MUvWD&krz{(!X~LmsQSqg(%r8gj<!elQ0k~#(XmM9QG3$SWk;9HXU$R>
zQl?$jsf=MynQmWwuK7|lMvsb>&-0^EEat1);~Cq$-N{&Spy}9?8B@DuqwKkQ!YFAs
z<5XOoG4sW=m)8Z;bqxm8m5gcYs^jTm-bk6c%tHmoa~aGlxlTzttb*k@c^PBEE0-Oc
zReZ4Wc%)@8q5B7ugWI<z2I{L<ebm&w&q>=>Hm;3{s;*R1PTE+Q(T=RawoL68EW@t$
z)$46e^N=n&1t+yIt*@Va`*Fv<Qm<S;d6t>4UNl`_7fXJ%Qo2%4Sq#89wzcq9`Su90
zb@NTN{Z8Jl>Z0MAIR?uazLzx{qY??rPCKQ7k;<BJowLlzs<w@+Iq6$6dM?<RS<r>5
w>&q{}d@0M#SwY2cbDrjzRMzTKN3UM2W_8)jYNtp;T(h^5;}`3HZ0L>r2WKG|r2qf`

delta 1438
zcmYk+O-PhM9LMp$tE>5vuUn>Nsb!f~y1tZdne<|Kk)R-wib$|X>CGT1%FRqHI}}=>
zhcKj2DWZ7HI#_y$4jwub1SJ(jbqKn4>C*SN&m%bO%x7kHc4y{4^E^{E1EKKO^q4zF
zswFQY2YhCYm=r@nI_)<*foHHAzhNRa$C@RmANkltie&8a+I?Po5Vz4kim&lEw%}Nt
zS+-f&0t?LY=_tV^xCb?1D{7)o$XNS{%kd93VN$$1?i3c#{(?b_W>vSb60>jy)9?o-
z;a}AMMpMKvzok%7M}R^T<)U_4i1+acGN<k4*UVx2QRAABudD_6*f|O|XI)r`y{I5M
zUjIu>r#*$&@jZ4hza3m?HjJ~VKkOimMA>?AG2X&596?R|8CT+W<R=!J;u^qG+WDx3
z?nRA1gxWweM&n7;!rCybFWSA1%UDFa8y`lQJw+YGKH~QP-=M}HXB%2*8)~5)sD)fb
zMW7EkTN}h(IF2*;56|M;3^x*?0P)YEqak3n0$cG4-awAYk{7u<$iiaUd3X#Pum_)G
zHP#R&*^UlAL*}sNOm|`DQ48+z>_<gtD3kbe3^qoGb~1t5=_HQe5pJXg#&eT2E&~<P
zT-2p1L@hMr_19sDb^|IB*F0~c#^1#u9L0NBA0|%IRDL1Rwvnao*}Oo;*d&(YN7NrC
z@Qkj;G}QPiOvQR!gN>*=(}`O6fakF1W6ufHk%gzJ=rX*+o%jJcdSkvw(y=IXo7`q(
zk}cHNlXcl@ynY=cKaGTaEo#x)u@<YxTTxTWjg)Rtpyz)Tb**$Gc^x@O&Lh{7=aSA|
zyV^R}G0%#5^$pbZj!@FEC_=i3b4ib-qNT*uA;JgTb5#eI(>9a!5>l#miM-V+sq21l
zFC$?qLmzoA6;aV6sZ>H%M63Ec{TY7UhD>MBUl-*>$4&U1*`ysl=R(TisKm00++cYq
cSXx{fbbh2h@;R?Ej>bAo+2cOvQqK0M|9*ge&;S4c

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/django.po b/apps/wiki/locale/pl/LC_MESSAGES/django.po
index 9c7b13fe..c4808f41 100644
--- a/apps/wiki/locale/pl/LC_MESSAGES/django.po
+++ b/apps/wiki/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-24 13:10+0100\n"
+"POT-Creation-Date: 2017-03-30 13:35+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -96,19 +96,35 @@ msgstr "Tutaj możesz prześledzić historię zmian w dokumencie."
 
 #: templates/wiki/bootstrap.html:180
 msgid ""
-"Place the cursor at the end of the line after which you want to add a "
-"new header, and press Enter. Click “header” to switch the new paragraph into "
-"a header."
+"The status bar shows helpful messages when you place the mouse cursor over "
+"toolbar buttons."
 msgstr ""
-"Ustaw kursor na końcu wiersza, pod którym chcesz dodać nowy nagłówek "
-"i wciśnij Enter. Kliknij „nagłówek”, aby edytować wiersz i zamienić go w "
-"nagłówek."
+"Dolny pasek pokazuje pomocne informacje, kiedy najedziesz kursorem myszy na "
+"przyciski na pasku edycji."
 
 #: templates/wiki/bootstrap.html:181
+msgid "Click Undo to revert recent changes."
+msgstr "Kliknij Cofnij, aby wycofać ostatnie zmiany."
+
+#: templates/wiki/bootstrap.html:182
+msgid "Redo will reapply undone changes."
+msgstr "Za pomocą „Ponów” możesz przywrócić cofnięte zmiany."
+
+#: templates/wiki/bootstrap.html:183
+msgid ""
+"Place the cursor at the end of the line after which you want to add a new "
+"header, and press Enter. Click “header” to switch the new paragraph into a "
+"header."
+msgstr ""
+"Ustaw kursor na końcu wiersza, pod którym chcesz dodać nowy nagłówek i "
+"wciśnij Enter. Kliknij „nagłówek”, aby edytować wiersz i zamienić go w "
+"nagłówek."
+
+#: templates/wiki/bootstrap.html:184
 msgid "Use this option to switch a header to a paragraph."
 msgstr "Użyj tej opcji, by rozpocząć nowy akapit tekstu."
 
-#: templates/wiki/bootstrap.html:182
+#: templates/wiki/bootstrap.html:185
 msgid ""
 "Add graphics to your document. Click “image” to make a frame, then click "
 "this frame to insert an image file (JPG, PNG, GIF, SVG)."
@@ -117,7 +133,7 @@ msgstr ""
 "ramka, następnie kliknij w ramkę by dodać nowy plik graficzny (JPG, PNG, "
 "GIF, SVG)."
 
-#: templates/wiki/bootstrap.html:183
+#: templates/wiki/bootstrap.html:186
 msgid ""
 "Add a video material to your document to make it more attractive. Paste the "
 "http link from a YouTube channel."
@@ -125,7 +141,7 @@ msgstr ""
 "Dodaj materiał video, by Twój dokument był jeszcze bardziej atrakcyjny. "
 "Wklej link http z kanału YouTube."
 
-#: templates/wiki/bootstrap.html:184
+#: templates/wiki/bootstrap.html:187
 msgid ""
 "Select this option to create a bullet list. Press Enter to add another item. "
 "To end the list, place the cursor at the end of the last item, and press "
@@ -135,7 +151,7 @@ msgstr ""
 "kolejny punkt listy. Aby zakończyć listę ustaw kursor na końcu ostatniego "
 "punktu i dwa razy wciśnij Enter."
 
-#: templates/wiki/bootstrap.html:185
+#: templates/wiki/bootstrap.html:188
 msgid ""
 "Create numbered lists. To end the list, set the cursor at the end of the "
 "last item, and press Enter twice."
@@ -143,7 +159,7 @@ msgstr ""
 "Twórz listy numerowane. Aby zakończyć listę ustaw kursor na końcu ostatniego "
 "punktu i dwa razy wciśnij Enter."
 
-#: templates/wiki/bootstrap.html:186
+#: templates/wiki/bootstrap.html:189
 msgid ""
 "Emphasize some text by using boldface. To turn it off, click the specific "
 "word and then click “emphasis”."
@@ -151,7 +167,7 @@ msgstr ""
 "Wyróżnij fragment tekstu używając pogrubienia. Aby je wyłączyć, kliknij w "
 "dane słowo po czym wciśnij „wyróżnienie”."
 
-#: templates/wiki/bootstrap.html:187
+#: templates/wiki/bootstrap.html:190
 msgid ""
 "Select some text and click “cite” to make it italic. To turn it off, set the "
 "cursor on the specific word then click “cite” again."
@@ -159,7 +175,7 @@ msgstr ""
 "Zaznacz fragment i kliknij „cytowanie”, by włączyć kursywę. Aby ją wyłączyć "
 "ustaw kursor na danym słowie po czym kliknij przycisk „cytowanie”."
 
-#: templates/wiki/bootstrap.html:188
+#: templates/wiki/bootstrap.html:191
 msgid ""
 "Paste the link and select it, or select text and click “link” to add a "
 "hyperlink or to link additional materials (ODT, DOC, PDF)."
@@ -168,7 +184,7 @@ msgstr ""
 "„link”, by dodać hiperłącze lub aby podlinkować materiały dodatkowe (ODT, "
 "DOC, PDF)."
 
-#: templates/wiki/bootstrap.html:189
+#: templates/wiki/bootstrap.html:192
 msgid ""
 "Here you can review and edit metadata. In “Attachments” you can add or "
 "change the cover of your document."
@@ -176,11 +192,11 @@ msgstr ""
 "Tutaj możesz przeglądać i edytować metadane. W części „załączniki” możesz "
 "dodać lub zmienić okładkę Twojego dokumentu."
 
-#: templates/wiki/bootstrap.html:190
+#: templates/wiki/bootstrap.html:193
 msgid "Review your document before publication."
 msgstr "Zobacz, jak wygląda Twój dokument zanim go opublikujesz."
 
-#: templates/wiki/bootstrap.html:191
+#: templates/wiki/bootstrap.html:194
 msgid ""
 "Here you can add other important materials to this document (audio files, "
 "JPG, PNG, ODT, PDF etc.)"
@@ -188,7 +204,7 @@ msgstr ""
 "Tu możesz dodać inne ważne materiały do tego projektu (plik dźwiękowe, JPG, "
 "PNG, ODT, PDF i inne)"
 
-#: templates/wiki/bootstrap.html:192
+#: templates/wiki/bootstrap.html:195
 msgid ""
 "Select this option if you do not like your unsaved changes. Warning! Dropped "
 "changes will be lost and they cannot be restored."
@@ -196,7 +212,7 @@ msgstr ""
 "Wybierz tę opcję, jeżeli nie podobają Ci się wprowadzone i niezapisane "
 "zmiany. Uwaga! Zmiany te zostaną utracone i nie będzie można ich przywrócić."
 
-#: templates/wiki/bootstrap.html:193
+#: templates/wiki/bootstrap.html:196
 msgid ""
 "If you work on a document with a group, you can leave comments on each line "
 "of the document. Your comment will appear as a “bubble” on the left."
@@ -205,7 +221,7 @@ msgstr ""
 "każdym wierszu dokumentu. Komentarz wyświetli się w postaci „dymku” po lewej "
 "stronie  wiersza."
 
-#: templates/wiki/bootstrap.html:194
+#: templates/wiki/bootstrap.html:197
 msgid ""
 "Click “Save” to save all the changes in your document. Remember to select "
 "the appropriate stage of the work on the document (Draft, Comments, Comments "
@@ -215,11 +231,11 @@ msgstr ""
 "wybrać odpowiedni etap pracy nad dokumentem (Wersja robocza, Komentarze, "
 "Przegląd komentarzy, Korekta, Publikacja)."
 
-#: templates/wiki/bootstrap.html:195
+#: templates/wiki/bootstrap.html:198
 msgid "Click on the MIL/PEER logo to open the home page in a new window."
 msgstr "Kliknij w logo MIL/PEER, by otworzyć stronę główną w nowym oknie."
 
-#: templates/wiki/bootstrap.html:196
+#: templates/wiki/bootstrap.html:199
 msgid "“Exit” will take you to the main page."
 msgstr "Przycisk „Wyjdź” przeniesie Cię na stronę główną MIL/PEER."
 
-- 
2.20.1


From 4fbd1c359e6f2b8b15536179021a6cb0bc3e390c Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Fri, 31 Mar 2017 10:17:50 +0200
Subject: [PATCH 11/16] minor cleanup

---
 apps/catalogue/templatetags/document_list.py | 6 +-----
 apps/catalogue/views.py                      | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/apps/catalogue/templatetags/document_list.py b/apps/catalogue/templatetags/document_list.py
index f9de2d6e..470839a8 100755
--- a/apps/catalogue/templatetags/document_list.py
+++ b/apps/catalogue/templatetags/document_list.py
@@ -64,11 +64,7 @@ def document_list(context, user=None, organization=None):
 @register.inclusion_tag('catalogue/book_list/book.html', takes_context=True)
 def document_short_html(context, doc):
     user = context['request'].user
-    if doc.owner_organization is not None:
-        am_owner = doc.owner_organization.is_member(user)
-    else:
-        am_owner = doc.owner_user == user
     return {
-        'am_owner': am_owner,
+        'am_owner':doc.can_edit(user),
         'book': doc,
     }
diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 1021c878..2e82dfa3 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -353,9 +353,6 @@ def book_owner(request, pk):
     doc = get_object_or_404(Document, pk=pk, deleted=False)
     if not doc.can_edit(request.user):
         return HttpResponseForbidden("Not authorized.")
-    user_is_owner = doc.owner_organization and doc.owner_organization.is_member(request.user)
-    if not (doc.owner_user == request.user or user_is_owner):
-        raise Http404
 
     error = ''
 
-- 
2.20.1


From 5e942ab9a9a217a8482a324c3e61fdd83c1c4247 Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Fri, 31 Mar 2017 12:05:57 +0200
Subject: [PATCH 12/16] convert attachment filenames to ascii

---
 apps/catalogue/views.py  | 6 +++++-
 apps/fileupload/views.py | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 2e82dfa3..cf1ec128 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -21,6 +21,7 @@ from django.shortcuts import get_object_or_404, render, redirect
 from django.utils.encoding import force_str
 from django.utils.http import urlquote_plus
 from django.views.decorators.http import require_POST
+from unidecode import unidecode
 
 from catalogue import forms
 from catalogue.forms import TagMultipleForm, TagSingleForm
@@ -99,7 +100,10 @@ def create_missing(request):
                 path = settings.MEDIA_ROOT + uppath
                 if not os.path.isdir(path):
                     os.makedirs(path)
-                dest_path = path + cover.name   # UNSAFE
+                cover.name = unidecode(cover.name)
+                dest_path = path + cover.name
+                if not os.path.abspath(dest_path).startswith(os.path.abspath(path)):
+                    raise Http404
                 with open(dest_path, 'w') as destination:
                     for chunk in cover.chunks():
                         destination.write(chunk)
diff --git a/apps/fileupload/views.py b/apps/fileupload/views.py
index 35e0a7ae..c7b93187 100644
--- a/apps/fileupload/views.py
+++ b/apps/fileupload/views.py
@@ -11,6 +11,8 @@ from django.http import HttpResponse, Http404
 from django.utils.decorators import method_decorator
 from django.views.decorators.vary import vary_on_headers
 from django.views.generic import FormView
+from unidecode import unidecode
+
 from .forms import UploadForm
 
 
@@ -139,6 +141,7 @@ class UploadView(UploadViewMixin, FormView):
             os.makedirs(path)
         data = []
         for f in flist:
+            f.name = unidecode(f.name)
             with open(self.get_safe_path(f.name), 'w') as destination:
                 for chunk in f.chunks():
                     destination.write(chunk)
-- 
2.20.1


From 0ba24b411f3a582d7688d591c451f307434a2c3a Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Fri, 31 Mar 2017 12:57:57 +0200
Subject: [PATCH 13/16] administrative cleanup

---
 lib/librarian                      | 2 +-
 redakcja/templates/500.html        | 5 ++---
 redakcja/templates/503.html        | 4 ++--
 redakcja/templates/error_base.html | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/librarian b/lib/librarian
index 8287173d..7feccce4 160000
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit 8287173da88bfaa3a8b90a39768198dceba2e25f
+Subproject commit 7feccce4659f48b0f9a131d8de0d983075a33378
diff --git a/redakcja/templates/500.html b/redakcja/templates/500.html
index 05c0bc36..8653f4dd 100644
--- a/redakcja/templates/500.html
+++ b/redakcja/templates/500.html
@@ -1,11 +1,10 @@
 {% extends "error_base.html" %}
 
-{% block "content" %}
+{% block content %}
 
 <h1>Internal Server Error</h1>
 
 <p>Unfortunately our WWW server was unable to deliver the page you asked for. We're sorry for the inconvenience.</p>
-<p>The administrator has been already notified of the error, but if you'd like to provide more information, write to <a href="mailto:radekczajka@mdrn.pl">our e-mail</a>.</p>
-</div>
+<p>The administrator has been already notified of the error, but if you'd like to provide more information, write to <a href="mailto:janszejko@mdrn.pl">our e-mail</a>.</p>
 
 {% endblock %}
diff --git a/redakcja/templates/503.html b/redakcja/templates/503.html
index e85bc797..27171960 100644
--- a/redakcja/templates/503.html
+++ b/redakcja/templates/503.html
@@ -1,6 +1,6 @@
 {% extends "error_base.html" %}
 
-{% block "content" %}
+{% block content %}
 
 <h1>Service temporarily unavailable</h1>
 
@@ -10,4 +10,4 @@ The service is unavailable due to maintanance.
 
 <p>Please try again later.</p>
 
-{% endblock "content" %}
+{% endblock content %}
diff --git a/redakcja/templates/error_base.html b/redakcja/templates/error_base.html
index 4c3a5ae4..721a0773 100755
--- a/redakcja/templates/error_base.html
+++ b/redakcja/templates/error_base.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 
-{% block "content" %}
+{% block content %}
 {% endblock %}
 
 
-- 
2.20.1


From 6eb09805dd1b6a4a3a7305eff38449ebcf5154db Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Fri, 31 Mar 2017 13:13:00 +0200
Subject: [PATCH 14/16] fix for django 1.10 (get_available_name)

---
 apps/dvcs/storage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dvcs/storage.py b/apps/dvcs/storage.py
index 080e7077..045b780a 100755
--- a/apps/dvcs/storage.py
+++ b/apps/dvcs/storage.py
@@ -36,7 +36,7 @@ class GzipFileSystemStorage(FileSystemStorage):
         content = ContentFile(compress(content.read()))
         return super(GzipFileSystemStorage, self)._save(name, content)
 
-    def get_available_name(self, name):
+    def get_available_name(self, name, max_length=None):
         if self.exists(name):
             self.delete(name)
         return name
-- 
2.20.1


From 03ac012472fcaa2c0d8011ff8e71a2d861d75575 Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Fri, 31 Mar 2017 13:27:56 +0200
Subject: [PATCH 15/16] optparse -> argparse

---
 apps/build/management/commands/build.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/apps/build/management/commands/build.py b/apps/build/management/commands/build.py
index f0d1df8f..6c4b2765 100644
--- a/apps/build/management/commands/build.py
+++ b/apps/build/management/commands/build.py
@@ -12,37 +12,36 @@ from django.core.management import call_command
 
 
 class Command(BaseCommand):
-    
-    option_list = BaseCommand.option_list + (
-        make_option(
+
+    def add_arguments(self, parser):
+        parser.add_argument(
             '--node-bin-path',
             action='store',
             dest='node_bin_path',
             type='string',
             default=None,
-            help='Path to node binary'),
-        make_option(
+            help='Path to node binary')
+        parser.add_argument(
             '--npm-bin',
             action='store',
             dest='npm_bin',
             type='string',
             default='npm',
-            help='Path to npm binary'),
-        make_option(
+            help='Path to npm binary')
+        parser.add_argument(
             '--editor-npm-env',
             action='store',
             dest='editor_npm_env',
             type='string',
             default=None,
-            help='Destination path of npm environment, defaults to ./node_modules'),
-        make_option(
+            help='Destination path of npm environment, defaults to ./node_modules')
+        parser.add_argument(
             '--editor-optimize',
             action='store',
             dest='editor_optimize',
             type='string',
             default=None,
-            help='Optimization strategy for editor build'),
-        )
+            help='Optimization strategy for editor build')
 
     def handle(self, **options):
         wiki_base_dir = os.path.join(os.getcwd(), 'apps', 'wiki', 'static', 'wiki')
-- 
2.20.1


From 0a9fde379ec7a998a64f0fb2d157fe8e94903869 Mon Sep 17 00:00:00 2001
From: Jan Szejko <janek37@gmail.com>
Date: Fri, 31 Mar 2017 13:36:50 +0200
Subject: [PATCH 16/16] fix argument types in build command

---
 apps/build/management/commands/build.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/build/management/commands/build.py b/apps/build/management/commands/build.py
index 6c4b2765..9afc2498 100644
--- a/apps/build/management/commands/build.py
+++ b/apps/build/management/commands/build.py
@@ -18,28 +18,24 @@ class Command(BaseCommand):
             '--node-bin-path',
             action='store',
             dest='node_bin_path',
-            type='string',
             default=None,
             help='Path to node binary')
         parser.add_argument(
             '--npm-bin',
             action='store',
             dest='npm_bin',
-            type='string',
             default='npm',
             help='Path to npm binary')
         parser.add_argument(
             '--editor-npm-env',
             action='store',
             dest='editor_npm_env',
-            type='string',
             default=None,
             help='Destination path of npm environment, defaults to ./node_modules')
         parser.add_argument(
             '--editor-optimize',
             action='store',
             dest='editor_optimize',
-            type='string',
             default=None,
             help='Optimization strategy for editor build')
 
-- 
2.20.1