From 664160d42c048675e6b4633fa821224c67836738 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Wed, 19 Feb 2014 10:57:30 +0100 Subject: [PATCH] Editor update - status bar, more responsive toolbar, new backspace/delete rules --- apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo | Bin 2611 -> 5573 bytes apps/wiki/locale/pl/LC_MESSAGES/djangojs.po | 234 ++++++++++++++++++-- apps/wiki/static/wiki/editor | 2 +- apps/wiki/templates/wiki/bootstrap.html | 32 ++- 4 files changed, 240 insertions(+), 28 deletions(-) diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo index f6b828da1b6cd201c39e3f447d2637408ea79b70..9377d89f8476ee8de030270f4eed18ab3a8dfa5e 100644 GIT binary patch literal 5573 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 C2>#Rn delta 1010 zcmYMyO=uHA6u|MR{me&An-t;0A5iff3P!KQG|J$xQF#Frt*_rqD?X=D`6ZPGA$5TZc zrw`H3w<$G=Hx6;3^|UM1i6QL57)CIKQ5?f#IEiC;9S>s}<-K(bVFP8o!4BNSZl&t# zdGKHh`JyB)o}9e2Hm%hw_U) zVO_rTJ2$e?9?sxzlz=l#N`mt^iXTum{)tkl{a`%EVyV;!QW!rN{A*H`zfH~v%lt;t zbw48+$;MJP2`roOvHpLRFBqmv#?p?`sl0y%jw8pzuL?Q)Nv2TBJwlfQElm!hBrMgG z!z$-YTG;wN3Ank`pKm4cf0syj`+b`Y$+?^$f2R*>m~cuv;b?!Ro(@zZ7_-bl1w>78c2^~hEK lH!>Ro3r`XcO?Ps_TuP26bhc{s6Qcg=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: static/wiki/build/rng.js:6 +#: static/wiki/build/rng.js:6 static/wiki/editor/build/rng.js:2759 #: static/wiki/editor/src/editor/modules/data/data.js:13 msgid "This is an empty document." msgstr "To jest pusty dokument." -#: static/wiki/build/rng.js:6 +#: static/wiki/build/rng.js:6 static/wiki/editor/build/rng.js:2773 #: static/wiki/editor/src/editor/modules/data/data.js:27 msgid "This document contains errors and can't be loaded. :(" msgstr "Ten dokument zawiera błędy i nie może być załadowany. :(" -#: static/wiki/build/rng.js:6 +#: static/wiki/build/rng.js:6 static/wiki/editor/build/rng.js:2838 #: static/wiki/editor/src/editor/modules/data/data.js:92 msgid "Save Document" msgstr "Zapisz dokument" -#: static/wiki/build/rng.js:6 +#: static/wiki/build/rng.js:6 static/wiki/editor/build/rng.js:2839 #: static/wiki/editor/src/editor/modules/data/data.js:93 msgid "Save" msgstr "Zapisz" -#: static/wiki/build/rng.js:6 +#: static/wiki/build/rng.js:6 static/wiki/editor/build/rng.js:2894 #: static/wiki/editor/src/editor/modules/data/data.js:148 msgid "Restore Version" msgstr "Przywracanie wersji" -#: static/wiki/build/rng.js:6 +#: static/wiki/build/rng.js:6 static/wiki/editor/build/rng.js:2895 #: static/wiki/editor/src/editor/modules/data/data.js:149 msgid "Restore" msgstr "Przywróć" +#: static/wiki/editor/src/editor/modules/data/document.js:28 +msgid "Error" +msgstr "Błąd" #: static/wiki/editor/src/editor/modules/documentCanvas/commands.js:141 msgid "Create link" msgstr "Utwórz link" @@ -74,43 +77,57 @@ msgstr "Wyjdź" #: static/wiki/editor/src/editor/modules/nodePane/template.html:3 msgid "Current node" msgstr "Bieżący węzeł" - -#: static/wiki/build/rng.js:6 -#: static/wiki/editor/src/editor/modules/rng/rng.js:63 +#: static/wiki/build/rng.js:6 static/wiki/editor/build/rng.js:3172 +#: static/wiki/editor/src/editor/modules/rng/rng.js:73 msgid "Editor" msgstr "Edytor" -#: static/wiki/build/rng.js:6 -#: static/wiki/editor/src/editor/modules/rng/rng.js:64 -#: static/wiki/editor/src/editor/modules/rng/rng.js:79 +#: static/wiki/build/rng.js:6 static/wiki/editor/build/rng.js:3173 +#: static/wiki/editor/build/rng.js:3188 +#: static/wiki/editor/src/editor/modules/rng/rng.js:74 +#: static/wiki/editor/src/editor/modules/rng/rng.js:89 msgid "Source" msgstr "Źródło" -#: static/wiki/build/rng.js:6 -#: static/wiki/editor/src/editor/modules/rng/rng.js:65 +#: static/wiki/build/rng.js:6 static/wiki/editor/build/rng.js:3174 +#: static/wiki/editor/src/editor/modules/rng/rng.js:75 msgid "History" msgstr "Historia" -#: static/wiki/build/rng.js:6 -#: static/wiki/editor/src/editor/modules/rng/rng.js:103 +#: static/wiki/editor/src/editor/modules/documentCanvas/canvas/keyboard.js:61 +#: static/wiki/editor/src/editor/modules/documentCanvas/canvas/keyboard.js:86 +#: static/wiki/editor/src/editor/modules/documentCanvas/canvas/keyboard.js:124 +msgid "Splitting text" +msgstr "Rozbicie tekstu" +#: static/wiki/build/rng.js:6 static/wiki/editor/build/rng.js:3212 +#: static/wiki/editor/src/editor/modules/rng/rng.js:113 msgid "Saving..." msgstr "Zapisywanie..." -#: static/wiki/build/rng.js:6 -#: static/wiki/editor/src/editor/modules/rng/rng.js:114 +#: static/wiki/editor/src/editor/modules/documentCanvas/canvas/keyboard.js:309 +msgid "Remove text" +msgstr "Usuń tekst" +#: static/wiki/build/rng.js:6 static/wiki/editor/build/rng.js:3223 +#: static/wiki/editor/src/editor/modules/rng/rng.js:124 msgid "Restoring version " msgstr "Przywracanie wersji" -#: static/wiki/build/rng.js:6 -#: static/wiki/editor/src/editor/modules/rng/rng.js:244 +#: static/wiki/editor/src/editor/modules/documentToolbar/actionView.js:49 +#: static/wiki/editor/src/editor/modules/statusBar/statusBar.js:28 +msgid "error :(" +msgstr "błąd :(" +#: static/wiki/build/rng.js:6 static/wiki/editor/build/rng.js:3353 +#: static/wiki/editor/src/editor/modules/rng/rng.js:247 msgid "editor" msgstr "edytor" -#: static/wiki/editor/src/editor/modules/rng/rng.js:255 +#: static/wiki/editor/build/rng.js:3364 +#: static/wiki/editor/src/editor/modules/rng/rng.js:273 msgid "Do you really want to exit?" msgstr "Czy na pewno chcesz zakończyć pracę?" -#: static/wiki/editor/src/editor/modules/rng/rng.js:257 +#: static/wiki/editor/build/rng.js:3366 +#: static/wiki/editor/src/editor/modules/rng/rng.js:275 msgid "Document contains unsaved changes!" msgstr "Dokument zawiera niezapisane zmiany" @@ -170,3 +187,176 @@ msgstr "brak wersji roboczej" msgid "drop a working draft" msgstr "porzuć wersję roboczą" + +#: static/wiki/editor/src/editor/modules/documentCanvas/canvas/canvas.js:45 +msgid "Changing text" +msgstr "Edycja tekstu" + +#: static/wiki/editor/src/editor/modules/metadataEditor/metadataEditor.js:26 +msgid "Add metadata row" +msgstr "Dodaj wiersz metadanych" + +#: static/wiki/editor/src/editor/modules/metadataEditor/metadataEditor.js:32 +msgid "Remove metadata row" +msgstr "Usuń wiersz metadanych" + +#: static/wiki/editor/src/editor/modules/statusBar/statusBar.js:33 +msgid "Undescribed action" +msgstr "Działanie nieopisane" +#: static/wiki/editor/src/editor/modules/metadataEditor/metadataEditor.js:59 +msgid "Metadata edit" +msgstr "Edycja metadanych" + +#: static/wiki/editor/src/editor/modules/statusBar/statusBar.js:22 +msgid "Action not allowed" +msgstr "Działanie niedozwolone" + +#: static/wiki/editor/src/editor/plugins/core/core.js:63 +msgid "Undo" +msgstr "Cofnij" + +#: static/wiki/editor/src/editor/plugins/core/core.js:63 +msgid "Redo" +msgstr "Powtórz" + +#: static/wiki/editor/src/editor/plugins/core/core.js:64 +msgid "There is nothing to undo" +msgstr "Nie ma nic więcej do cofnięcia" + +#: static/wiki/editor/src/editor/plugins/core/core.js:64 +msgid "There is nothing to redo" +msgstr "Nie ma nic więcej do powtórzenia" + +#: static/wiki/editor/src/editor/plugins/core/core.js:66 +msgid "unknown operation" +msgstr "Nieznana operacja" + +#: static/wiki/editor/src/editor/plugins/core/core.js:126 +msgid "Insert comment after current node" +msgstr "Wstaw komentarz za bieżącym węzłem" + +#: static/wiki/editor/src/editor/plugins/core/core.js:148 +msgid "Hide grid" +msgstr "Schowaj siatkę" + +#: static/wiki/editor/src/editor/plugins/core/core.js:148 +msgid "Show grid" +msgstr "Pokaż siatkę" +#: static/wiki/editor/src/editor/plugins/core/core.js:293 +msgid "link" +msgstr "link" + +#: static/wiki/editor/src/editor/plugins/core/footnote.js:47 +#: static/wiki/editor/src/editor/plugins/core/core.js:306 +msgid "Create link from selection" +msgstr "Utwórz link z zaznaczonego tekstu" + +#: static/wiki/editor/src/editor/plugins/core/core.js:325 +msgid "Mark as emphasized" +msgstr "Oznacz jako wyróżnione" + +#: static/wiki/editor/src/editor/plugins/core/core.js:326 +msgid "Mark as citation" +msgstr "Oznacz jako cytat" +msgid "Create footnote from selection" +msgstr "Utwórz przypis z zaznaczonego tekstu" + +#: static/wiki/editor/src/editor/plugins/core/footnote.js:54 +msgid "Insert footnote after cursor" +msgstr "Wstaw przypis za kursorem" + +#: static/wiki/editor/src/editor/plugins/core/footnote.js:62 +msgid "Cannot insert footnote after root node" +msgstr "Nie można wstawić przypisu za węzłem głównym" + +#: static/wiki/editor/src/editor/plugins/core/footnote.js:67 +msgid "Insert footnote after node" +msgstr "Wstaw przypis za węzłem" + +#: static/wiki/editor/src/editor/plugins/core/lists.js:112 +msgid "bull. list" +msgstr "lista pkt." +#: static/wiki/editor/src/editor/plugins/core/insert.js:60 +msgid "Missing tag name" +msgstr "Nie wybrano tagu" + +#: static/wiki/editor/src/editor/plugins/core/lists.js:112 +msgid "num. list" +msgstr "lista num." +#: static/wiki/editor/src/editor/plugins/core/insert.js:65 +#, c-format +msgid "Wrap text with %s" +msgstr "Obejmij tekst przez %s" + +#: static/wiki/editor/src/editor/plugins/core/insert.js:71 +#, c-format +msgid "Wrap nodes with %s" +msgstr "Obejmij węzły przez %s" + +#: static/wiki/editor/src/editor/plugins/core/insert.js:78 +#, c-format +msgid "Wrap current node with %s" +msgstr "Obejmij bieżący węzeł przez %s" + +#: static/wiki/editor/src/editor/plugins/core/insert.js:85 +msgid "Cannot insert after root node" +msgstr "Nie można wstawić węzła za węzłem głównym" + +#: static/wiki/editor/src/editor/plugins/core/insert.js:90 +#, c-format +msgid "Insert %s after current" +msgstr "Wstaw %s za bieżący węzeł" + +#: static/wiki/editor/src/editor/plugins/core/lists.js:91 +#, c-format +msgid "Change list type to %s" +msgstr "Zmień typ listy na %s" + +#: static/wiki/editor/src/editor/plugins/core/lists.js:98 +msgid "Remove list" +msgstr "Usuń listę" + +#: static/wiki/editor/src/editor/plugins/core/lists.js:107 +#, c-format +msgid "Make %s fragment(s) into list" +msgstr "Stwórz listę z %s fragmentów" + +#: static/wiki/editor/src/editor/plugins/core/switch.js:68 +msgid "header" +msgstr "nagłówek" +#: static/wiki/editor/src/editor/plugins/core/lists.js:122 +#: static/wiki/editor/src/editor/plugins/core/lists.js:123 +msgid "list item up" +msgstr "Element listy do góry" + +#: static/wiki/editor/src/editor/plugins/core/remove.js:21 +msgid "Unwrap with siblings" +msgstr "Odpakuj wraz sąsiadami" + +#: static/wiki/editor/src/editor/plugins/core/remove.js:21 +msgid "Cannot unwrap children of a root node" +msgstr "Nie można odpakować dzieci głównego węzła" + +#: static/wiki/editor/src/editor/plugins/core/remove.js:49 +msgid "Cannot remove root node" +msgstr "Nie można usunąć głównego węzła" + +#: static/wiki/editor/src/editor/plugins/core/switch.js:69 +msgid "paragraf" +msgstr "akapit" +#: static/wiki/editor/src/editor/plugins/core/remove.js:54 +msgid "Remove node" +msgstr "Usuń węzeł" + +#: static/wiki/editor/src/editor/plugins/core/templates.js:27 +msgid "No template selected" +msgstr "Nie wybrano template'u" + +#: static/wiki/editor/src/editor/plugins/core/templates.js:32 +msgid "Wrong node selected" +msgstr "Wybrany niepoprawny węzeł" + +#: static/wiki/editor/src/editor/plugins/core/templates.js:37 +#, c-format +msgid "Insert template %s after %s" +msgstr "Wstaw template %s za %s" diff --git a/apps/wiki/static/wiki/editor b/apps/wiki/static/wiki/editor index 732705c8..f098ff98 160000 --- a/apps/wiki/static/wiki/editor +++ b/apps/wiki/static/wiki/editor @@ -1 +1 @@ -Subproject commit 732705c82a02743c942fd792e5b4438b045cf9f1 +Subproject commit f098ff9873de73d1fd6d71ce64b83ae318e8bd7e diff --git a/apps/wiki/templates/wiki/bootstrap.html b/apps/wiki/templates/wiki/bootstrap.html index db1acde9..098df286 100644 --- a/apps/wiki/templates/wiki/bootstrap.html +++ b/apps/wiki/templates/wiki/bootstrap.html @@ -54,13 +54,14 @@ }, 'console': { level: 'debug', - handler: 'console' + handler: 'console', + formatter: 'simple' } }, loggers: { '': { level: 'debug', - handlers: ['sentry', 'console'] + handlers: ['console', 'sentry'] } } }, @@ -258,6 +259,29 @@ {name: 'assignment', label: '{% trans 'Assignment' %}'} ] }, + + plugins: { + core: {templates: {{serialized_templates|safe}}} + }, + + toolbar: [ + ['core.undo', 'core.redo'], + + [ + {actionName: 'core.switchToHeader', actionConfig: {label: 'nagłówek'}}, + {actionName: 'core.switchToParagraph', actionConfig: {label: 'paragraf'}}, + 'core.toggleBulletList', 'core.toggleEnumList' + ], + + [ + {actionName: 'core.emphasis', actionConfig: {label: 'wyróżnienie'}}, + {actionName: 'core.cite', actionConfig: {label: 'cytat'}}, + {actionName: 'core.link'} + ], + + ['core.template'], + ['core.comment'], + ], documentSaveUrl: function(id) { return '/editor/text/' + id + '/'; }, documentHistoryUrl: function(id) { return '/editor/history/' + id + '/'}, @@ -304,13 +328,11 @@ {% endif %} {% autoescape off%} - var data = {{serialized_document_data}}, - templates = {{serialized_templates}} + var data = {{serialized_document_data}}; {%endautoescape%} var editor_init = function(Editor) { Editor.setBootstrappedData('data', data); - Editor.setBootstrappedData('documentToolbar', templates); Editor.start(config); }; -- 2.20.1