Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index 76d0456..ef2a396 100644 (file)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -61,7 +61,7 @@ def file_list(request, repo):
 
     fl = []
     for file in repo.repo[latest_default]:
-        m = re.match(u'^pub_([\\w\\$\\.0-9_-]+).xml$', file.decode('utf-8'), re.UNICODE)
+        m = re.match(u'^pub_([^/]+).xml$', file.decode('utf-8'), re.UNICODE)
         if m is not None:
             fl.append(m.group(1))
             
@@ -307,7 +307,7 @@ def file_commit(request, path, repo):
 @with_repo
 def file_dc(request, path, repo):
     errors = None
-    rpath = file_path(fileid)
+    rpath = file_path(path)
 
     if request.method == 'POST':
         form = forms.DublinCoreForm(request.POST)

diff --git a/apps/toolbar/fixtures/przyciski.xml b/apps/toolbar/fixtures/przyciski.xml
index 2c4fdc0..f359d66 100755 (executable)
--- a/apps/toolbar/fixtures/przyciski.xml
+++ b/apps/toolbar/fixtures/przyciski.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <django-objects version="1.0">
+  <object pk="24" model="toolbar.buttongroup">
+    <field type="CharField" name="name">Dodatkowe przyciski edytora HTML</field>
+    <field type="SlugField" name="slug">htmleditor-extra</field>
+    <field type="IntegerField" name="position">-1</field>
+  </object>
   <object pk="23" model="toolbar.buttongroup">
     <field type="CharField" name="name">Dodatkowe przyciski w XMLEditor</field>
     <field type="SlugField" name="slug">xmleditor-extra-buttons</field>
     <field type="IntegerField" name="position">-1</field>
   </object>
-  <object pk="24" model="toolbar.buttongroup">
-    <field type="CharField" name="name">HTMLEditor Extra</field>
-    <field type="SlugField" name="slug">htmleditor-extra</field>
-    <field type="IntegerField" name="position">-1</field>
-  </object>
   <object pk="14" model="toolbar.buttongroup">
-    <field type="CharField" name="name">Akapity i długie cytaty</field>
-    <field type="SlugField" name="slug">akapity-i-dlugie-cytaty</field>
+    <field type="CharField" name="name">Akapity</field>
+    <field type="SlugField" name="slug">akapity</field>
     <field type="IntegerField" name="position">0</field>
   </object>
   <object pk="2" model="toolbar.buttongroup">
@@ -25,16 +25,16 @@
     <field type="SlugField" name="slug">bloki</field>
     <field type="IntegerField" name="position">0</field>
   </object>
+  <object pk="25" model="toolbar.buttongroup">
+    <field type="CharField" name="name">Dodatkowe przyciski DC</field>
+    <field type="SlugField" name="slug">dc-editor-extra-buttons</field>
+    <field type="IntegerField" name="position">0</field>
+  </object>
   <object pk="12" model="toolbar.buttongroup">
     <field type="CharField" name="name">Dramat wierszowany</field>
     <field type="SlugField" name="slug">dramat-wierszowany</field>
     <field type="IntegerField" name="position">0</field>
   </object>
-  <object pk="18" model="toolbar.buttongroup">
-    <field type="CharField" name="name">Dramat współczesny</field>
-    <field type="SlugField" name="slug">dramat-wspolczesny</field>
-    <field type="IntegerField" name="position">0</field>
-  </object>
   <object pk="13" model="toolbar.buttongroup">
     <field type="CharField" name="name">Elementy początkowe</field>
     <field type="SlugField" name="slug">elementy-poczatkowe</field>
@@ -50,11 +50,21 @@
     <field type="SlugField" name="slug">poczatek-dramatu</field>
     <field type="IntegerField" name="position">0</field>
   </object>
-  <object pk="16" model="toolbar.buttongroup">
+  <object pk="27" model="toolbar.buttongroup">
     <field type="CharField" name="name">Polecenia</field>
     <field type="SlugField" name="slug">polecenia</field>
     <field type="IntegerField" name="position">0</field>
   </object>
+  <object pk="26" model="toolbar.buttongroup">
+    <field type="CharField" name="name">Przypisy</field>
+    <field type="SlugField" name="slug">przypisy</field>
+    <field type="IntegerField" name="position">0</field>
+  </object>
+  <object pk="16" model="toolbar.buttongroup">
+    <field type="CharField" name="name">Separatory</field>
+    <field type="SlugField" name="slug">separatory</field>
+    <field type="IntegerField" name="position">0</field>
+  </object>
   <object pk="11" model="toolbar.buttongroup">
     <field type="CharField" name="name">Strukturalne</field>
     <field type="SlugField" name="slug">strukturalne</field>
@@ -70,202 +80,15 @@
     <field type="SlugField" name="slug">wersy</field>
     <field type="IntegerField" name="position">0</field>
   </object>
-  <object pk="5" model="toolbar.button">
-    <field type="CharField" name="label">A&lt;sup&gt;+&lt;/sup&gt;</field>
-    <field type="SlugField" name="slug">increase_font_size</field>
-    <field type="TextField" name="params">{"change": 2}</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">codemirror_fontsize</field>
-    <field type="CharField" name="link"/>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip">Zwiększ rozmiar czcionki.</field>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="23"/>
-    </field>
-  </object>
-  <object pk="6" model="toolbar.button">
-    <field type="CharField" name="label">A&lt;sup&gt;-&lt;/sup&gt;</field>
-    <field type="SlugField" name="slug">descrease_font_size</field>
-    <field type="TextField" name="params">{"change": -2}</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">codemirror_fontsize</field>
-    <field type="CharField" name="link"/>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip">Zmniejsz rozmiar czcionki.</field>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="23"/>
-    </field>
-  </object>
-  <object pk="7" model="toolbar.button">
-    <field type="CharField" name="label">A&lt;sup&gt;=&lt;/sup&gt;</field>
-    <field type="SlugField" name="slug">reset_font_size</field>
-    <field type="TextField" name="params">{"fontSize": 13}</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">codemirror_fontsize</field>
-    <field type="CharField" name="link"/>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip">Przywróć orginalny rozmiar czcionki.</field>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="23"/>
-    </field>
-  </object>
-  <object pk="76" model="toolbar.button">
-    <field type="CharField" name="label">A&lt;sup&gt;↓&lt;/sup&gt;</field>
-    <field type="SlugField" name="slug">tolowercase</field>
-    <field type="TextField" name="params">[]</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">lowercase</field>
-    <field type="CharField" name="link"/>
-    <field type="CharField" name="key">u</field>
-    <field type="PositiveIntegerField" name="key_mod">1</field>
-    <field type="CharField" name="tooltip">Zamień wielkie litery na małe.</field>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="15"/>
-    </field>
-  </object>
-  <object pk="77" model="toolbar.button">
-    <field type="CharField" name="label">Cudzysłowy (1)</field>
-    <field type="SlugField" name="slug">fix-quotes-inner-arrows</field>
-    <field type="TextField" name="params">{"exprs": [["\u00ab|\u201e", ",,"], ["\u00bb", "\""], ["([^=])\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])", "$1,,$2"], ["^\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])", ",,$1"], ["(,,)\\s+|\\s+(\")", "$1"]]}</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">lineregexp</field>
-    <field type="CharField" name="link"/>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip"/>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="2"/>
-    </field>
-  </object>
-  <object pk="89" model="toolbar.button">
-    <field type="CharField" name="label">Cudzysłowy (2)</field>
-    <field type="SlugField" name="slug">swap-quotes-outer-arrows</field>
-    <field type="TextField" name="params">{"exprs": [["\u00bb|\u201e", ",,"], ["\u00ab", "\""], ["([^=])\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])", "$1,,$2"], ["^\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])", ",,$1"], ["(,,)\\s+|\\s+(\")", "$1"]]}</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">lineregexp</field>
-    <field type="CharField" name="link"/>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip"/>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="2"/>
-    </field>
-  </object>
-  <object pk="4" model="toolbar.button">
-    <field type="CharField" name="label">Podstawowa</field>
-    <field type="SlugField" name="slug">basic_correction</field>
-    <field type="TextField" name="params">[["fulltextregexp", {"exprs": [["\ufeff", ""], ["$[\\s]*\\d+[\\s]*^", ""], ["-\\s*^", ""], ["\\,\\.\\.|\\.\\,\\.|\\.\\.\\,", "..."]]}], ["lineregexp", {"exprs": [["^\\s+|\\s+$", ""], ["\\s+", " "], ["(,,)\\s+|\\s+(\")", "$1"], ["(\\d)[\u2014-](\\d)", "$1--$2"], ["\u2014", "---"], ["&lt;(/?)P([aert])", "&lt;$1p$2"], ["([^\\.])(\\s*)&lt;/p", "$1.$2&lt;/p"]]}]]</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">macro</field>
-    <field type="CharField" name="link"/>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip">Wykonuję operację z novel-pages i poem-pages.</field>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="2"/>
-    </field>
-  </object>
-  <object pk="3" model="toolbar.button">
-    <field type="CharField" name="label">Usuń spację</field>
-    <field type="SlugField" name="slug">strip_whitespace</field>
-    <field type="TextField" name="params">{"exprs": [["^\\s+|\\s+$", ""], ["\\s+", " "], ["(,,)\\s+|\\s+(\")", "$1"]]}</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">lineregexp</field>
-    <field type="CharField" name="link"/>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip">Usuwa zbędne spację z dokumentu.</field>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="2"/>
-    </field>
-  </object>
-  <object pk="84" model="toolbar.button">
-    <field type="CharField" name="label">Wers wcięty</field>
-    <field type="SlugField" name="slug">wers-wciety</field>
-    <field type="TextField" name="params">{"tag": "wers_wciety", "attrs": {"typ": ""}}</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
-    <field type="CharField" name="link"/>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip"/>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="12"/>
-      <object pk="17"/>
-    </field>
-  </object>
-  <object pk="86" model="toolbar.button">
-    <field type="CharField" name="label">Wydrukuj</field>
-    <field type="SlugField" name="slug">print-xml</field>
-    <field type="TextField" name="params">[]</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">
-      <None/>
-    </field>
-    <field type="CharField" name="link">print/xml</field>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip"/>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="23"/>
-    </field>
-  </object>
-  <object pk="87" model="toolbar.button">
-    <field type="CharField" name="label">Wydrukuj</field>
-    <field type="SlugField" name="slug">htmleditor-print</field>
-    <field type="TextField" name="params">[]</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">
-      <None/>
-    </field>
-    <field type="CharField" name="link">print/html</field>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip"/>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="24"/>
-    </field>
-  </object>
-  <object pk="88" model="toolbar.button">
-    <field type="CharField" name="label">Wydziel</field>
-    <field type="SlugField" name="slug">split-text-from-xmleditor</field>
-    <field type="TextField" name="params">[]</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">show_splitmodal</field>
-    <field type="CharField" name="link"/>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip"/>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="23"/>
-    </field>
-  </object>
-  <object pk="90" model="toolbar.button">
-    <field type="CharField" name="label">Wyszukaj</field>
-    <field type="SlugField" name="slug">wyszukaj</field>
-    <field type="TextField" name="params">["#find-dialog"]</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">show_dialog</field>
-    <field type="CharField" name="link"/>
-    <field type="CharField" name="key">f</field>
-    <field type="PositiveIntegerField" name="key_mod">2</field>
-    <field type="CharField" name="tooltip"/>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="23"/>
-    </field>
-  </object>
-  <object pk="2" model="toolbar.button">
-    <field type="CharField" name="label">Zamień dywiz</field>
-    <field type="SlugField" name="slug">zamien_dywiz</field>
-    <field type="TextField" name="params">{"exprs": [["(\\d)[\u2014-](\\d)", "$1--$2"], ["\u2014", "---"]]}</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">lineregexp</field>
-    <field type="CharField" name="link"/>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip">Zamienia '—' na '---', oraz '1—2' na '1--2'.</field>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="2"/>
-    </field>
-  </object>
   <object pk="39" model="toolbar.button">
     <field type="CharField" name="label">akapit</field>
     <field type="SlugField" name="slug">akapit</field>
     <field type="TextField" name="params">{"tag": "akap"}</field>
     <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
     <field type="CharField" name="link"/>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip"/>
+    <field type="CharField" name="key">a</field>
+    <field type="PositiveIntegerField" name="key_mod">1</field>
+    <field type="CharField" name="tooltip">Alt+a</field>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
       <object pk="14"/>
     </field>
@@ -289,9 +112,9 @@
     <field type="TextField" name="params">{"tag": "akap_dialog"}</field>
     <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
     <field type="CharField" name="link"/>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip"/>
+    <field type="CharField" name="key">d</field>
+    <field type="PositiveIntegerField" name="key_mod">1</field>
+    <field type="CharField" name="tooltip">Alt+d</field>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
       <object pk="14"/>
     </field>
@@ -322,6 +145,19 @@
       <object pk="13"/>
     </field>
   </object>
+  <object pk="4" model="toolbar.button">
+    <field type="CharField" name="label">Podstawowa</field>
+    <field type="SlugField" name="slug">basic_correction</field>
+    <field type="TextField" name="params">[["fulltextregexp", {"exprs": [["\ufeff", ""], ["$[\\s]*\\d+[\\s]*^", ""], ["-\\s*^", ""], ["\\,\\.\\.|\\.\\,\\.|\\.\\.\\,", "..."]]}], ["lineregexp", {"exprs": [["^\\s+|\\s+$", ""], ["\\s+", " "], ["(,,)\\s+|\\s+(\")", "$1"], ["(\\d)[\u2014-](\\d)", "$1--$2"], ["\u2014", "---"], ["&lt;(/?)P([aert])", "&lt;$1p$2"], ["([^\\.])(\\s*)&lt;/p", "$1.$2&lt;/p"]]}]]</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">macro</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key"/>
+    <field type="PositiveIntegerField" name="key_mod">0</field>
+    <field type="CharField" name="tooltip">Wykonuję operację z novel-pages i poem-pages.</field>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="2"/>
+    </field>
+  </object>
   <object pk="10" model="toolbar.button">
     <field type="CharField" name="label">część/księga</field>
     <field type="SlugField" name="slug">czesc</field>
@@ -349,6 +185,19 @@
       <object pk="22"/>
     </field>
   </object>
+  <object pk="6" model="toolbar.button">
+    <field type="CharField" name="label">A&lt;sup&gt;-&lt;/sup&gt;</field>
+    <field type="SlugField" name="slug">descrease_font_size</field>
+    <field type="TextField" name="params">{"change": -2}</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">codemirror_fontsize</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key"/>
+    <field type="PositiveIntegerField" name="key_mod">0</field>
+    <field type="CharField" name="tooltip">Zmniejsz rozmiar czcionki.</field>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="23"/>
+    </field>
+  </object>
   <object pk="62" model="toolbar.button">
     <field type="CharField" name="label">didaskalia</field>
     <field type="SlugField" name="slug">didaskalia</field>
@@ -360,7 +209,6 @@
     <field type="CharField" name="tooltip"/>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
       <object pk="12"/>
-      <object pk="18"/>
     </field>
   </object>
   <object pk="79" model="toolbar.button">
@@ -386,8 +234,33 @@
     <field type="PositiveIntegerField" name="key_mod">0</field>
     <field type="CharField" name="tooltip"/>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="18"/>
-      <object pk="15"/>
+      <object pk="12"/>
+    </field>
+  </object>
+  <object pk="67" model="toolbar.button">
+    <field type="CharField" name="label">długi cyt. poet.</field>
+    <field type="SlugField" name="slug">dlugi-cyt-poet</field>
+    <field type="TextField" name="params">{"tag": "poezja_cyt"}</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key"/>
+    <field type="PositiveIntegerField" name="key_mod">0</field>
+    <field type="CharField" name="tooltip"/>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="21"/>
+    </field>
+  </object>
+  <object pk="42" model="toolbar.button">
+    <field type="CharField" name="label">długi cytat</field>
+    <field type="SlugField" name="slug">dlugi-cytat</field>
+    <field type="TextField" name="params">{"tag": "dlugi_cyt"}</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key"/>
+    <field type="PositiveIntegerField" name="key_mod">0</field>
+    <field type="CharField" name="tooltip"/>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="21"/>
     </field>
   </object>
   <object pk="20" model="toolbar.button">
@@ -442,45 +315,43 @@
       <object pk="13"/>
     </field>
   </object>
-  <object pk="67" model="toolbar.button">
-    <field type="CharField" name="label">długi cyt. poet.</field>
-    <field type="SlugField" name="slug">dlugi-cyt-poet</field>
-    <field type="TextField" name="params">{"tag": "poezja_cyt"}</field>
+  <object pk="52" model="toolbar.button">
+    <field type="CharField" name="label">ekstra</field>
+    <field type="SlugField" name="slug">ekstra</field>
+    <field type="TextField" name="params">{"tag": "ekstra"}</field>
     <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
     <field type="CharField" name="link"/>
     <field type="CharField" name="key"/>
     <field type="PositiveIntegerField" name="key_mod">0</field>
     <field type="CharField" name="tooltip"/>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="14"/>
-      <object pk="21"/>
+      <object pk="27"/>
     </field>
   </object>
-  <object pk="42" model="toolbar.button">
-    <field type="CharField" name="label">długi cytat</field>
-    <field type="SlugField" name="slug">dlugi-cytat</field>
-    <field type="TextField" name="params">{"tag": "dlugi_cyt"}</field>
+  <object pk="87" model="toolbar.button">
+    <field type="CharField" name="label">Wydrukuj</field>
+    <field type="SlugField" name="slug">htmleditor-print</field>
+    <field type="TextField" name="params">[]</field>
     <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
-    <field type="CharField" name="link"/>
+    <field type="CharField" name="link">print/html</field>
     <field type="CharField" name="key"/>
     <field type="PositiveIntegerField" name="key_mod">0</field>
     <field type="CharField" name="tooltip"/>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="14"/>
-      <object pk="21"/>
+      <object pk="24"/>
     </field>
   </object>
-  <object pk="52" model="toolbar.button">
-    <field type="CharField" name="label">ekstra</field>
-    <field type="SlugField" name="slug">ekstra</field>
-    <field type="TextField" name="params">{"tag": "ekstra"}</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
+  <object pk="5" model="toolbar.button">
+    <field type="CharField" name="label">A&lt;sup&gt;+&lt;/sup&gt;</field>
+    <field type="SlugField" name="slug">increase_font_size</field>
+    <field type="TextField" name="params">{"change": 2}</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">codemirror_fontsize</field>
     <field type="CharField" name="link"/>
     <field type="CharField" name="key"/>
     <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip"/>
+    <field type="CharField" name="tooltip">Zwiększ rozmiar czcionki.</field>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="15"/>
+      <object pk="23"/>
     </field>
   </object>
   <object pk="82" model="toolbar.button">
@@ -489,12 +360,11 @@
     <field type="TextField" name="params">{"tag": "kwestia"}</field>
     <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
     <field type="CharField" name="link"/>
-    <field type="CharField" name="key"/>
-    <field type="PositiveIntegerField" name="key_mod">0</field>
-    <field type="CharField" name="tooltip"/>
+    <field type="CharField" name="key">k</field>
+    <field type="PositiveIntegerField" name="key_mod">1</field>
+    <field type="CharField" name="tooltip">Alt+k</field>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
       <object pk="12"/>
-      <object pk="18"/>
     </field>
   </object>
   <object pk="23" model="toolbar.button">
@@ -574,6 +444,7 @@
     <field type="CharField" name="tooltip"/>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
       <object pk="13"/>
+      <object pk="22"/>
     </field>
   </object>
   <object pk="16" model="toolbar.button">
@@ -589,6 +460,19 @@
       <object pk="1"/>
     </field>
   </object>
+  <object pk="33" model="toolbar.button">
+    <field type="CharField" name="label">nazwa utworu</field>
+    <field type="SlugField" name="slug">nazwa-utworu</field>
+    <field type="TextField" name="params">{"tag": "nazwa_utworu"}</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key"/>
+    <field type="PositiveIntegerField" name="key_mod">0</field>
+    <field type="CharField" name="tooltip"/>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="13"/>
+    </field>
+  </object>
   <object pk="35" model="toolbar.button">
     <field type="CharField" name="label">nota</field>
     <field type="SlugField" name="slug">nota</field>
@@ -621,12 +505,26 @@
     <field type="TextField" name="params">{"tag": "osoba"}</field>
     <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
     <field type="CharField" name="link"/>
+    <field type="CharField" name="key">b</field>
+    <field type="PositiveIntegerField" name="key_mod">1</field>
+    <field type="CharField" name="tooltip">Alt+b</field>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="12"/>
+    </field>
+  </object>
+  <object pk="90" model="toolbar.button">
+    <field type="CharField" name="label">Odśwież</field>
+    <field type="SlugField" name="slug">panel-refresh</field>
+    <field type="TextField" name="params">[]</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">refresh_panel</field>
+    <field type="CharField" name="link"/>
     <field type="CharField" name="key"/>
     <field type="PositiveIntegerField" name="key_mod">0</field>
     <field type="CharField" name="tooltip"/>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="18"/>
-      <object pk="15"/>
+      <object pk="24"/>
+      <object pk="23"/>
+      <object pk="25"/>
     </field>
   </object>
   <object pk="12" model="toolbar.button">
@@ -668,6 +566,19 @@
       <object pk="11"/>
     </field>
   </object>
+  <object pk="86" model="toolbar.button">
+    <field type="CharField" name="label">Wydrukuj</field>
+    <field type="SlugField" name="slug">print-xml</field>
+    <field type="TextField" name="params">[]</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
+    <field type="CharField" name="link">print/xml</field>
+    <field type="CharField" name="key"/>
+    <field type="PositiveIntegerField" name="key_mod">0</field>
+    <field type="CharField" name="tooltip"/>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="23"/>
+    </field>
+  </object>
   <object pk="68" model="toolbar.button">
     <field type="CharField" name="label">przypis autorski</field>
     <field type="SlugField" name="slug">przypis-autorski</field>
@@ -678,7 +589,7 @@
     <field type="PositiveIntegerField" name="key_mod">0</field>
     <field type="CharField" name="tooltip"/>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="21"/>
+      <object pk="26"/>
     </field>
   </object>
   <object pk="71" model="toolbar.button">
@@ -691,7 +602,7 @@
     <field type="PositiveIntegerField" name="key_mod">0</field>
     <field type="CharField" name="tooltip"/>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="21"/>
+      <object pk="26"/>
     </field>
   </object>
   <object pk="70" model="toolbar.button">
@@ -704,7 +615,7 @@
     <field type="PositiveIntegerField" name="key_mod">0</field>
     <field type="CharField" name="tooltip"/>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="21"/>
+      <object pk="26"/>
     </field>
   </object>
   <object pk="69" model="toolbar.button">
@@ -717,7 +628,20 @@
     <field type="PositiveIntegerField" name="key_mod">0</field>
     <field type="CharField" name="tooltip"/>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="21"/>
+      <object pk="26"/>
+    </field>
+  </object>
+  <object pk="7" model="toolbar.button">
+    <field type="CharField" name="label">A&lt;sup&gt;=&lt;/sup&gt;</field>
+    <field type="SlugField" name="slug">reset_font_size</field>
+    <field type="TextField" name="params">{"fontSize": 13}</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">codemirror_fontsize</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key"/>
+    <field type="PositiveIntegerField" name="key_mod">0</field>
+    <field type="CharField" name="tooltip">Przywróć orginalny rozmiar czcionki.</field>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="23"/>
     </field>
   </object>
   <object pk="11" model="toolbar.button">
@@ -785,20 +709,6 @@
       <object pk="16"/>
     </field>
   </object>
-  <object pk="81" model="toolbar.button">
-    <field type="CharField" name="label">strofa</field>
-    <field type="SlugField" name="slug">strofa</field>
-    <field type="TextField" name="params">{"tag": "strofa"}</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_stanza</field>
-    <field type="CharField" name="link"/>
-    <field type="CharField" name="key">s</field>
-    <field type="PositiveIntegerField" name="key_mod">1</field>
-    <field type="CharField" name="tooltip"/>
-    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="12"/>
-      <object pk="17"/>
-    </field>
-  </object>
   <object pk="46" model="toolbar.button">
     <field type="CharField" name="label">słowo obce</field>
     <field type="SlugField" name="slug">slowo-obce</field>
@@ -812,6 +722,59 @@
       <object pk="15"/>
     </field>
   </object>
+  <object pk="88" model="toolbar.button">
+    <field type="CharField" name="label">Wydziel</field>
+    <field type="SlugField" name="slug">split-text-from-xmleditor</field>
+    <field type="TextField" name="params">[]</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">show_splitmodal</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key"/>
+    <field type="PositiveIntegerField" name="key_mod">0</field>
+    <field type="CharField" name="tooltip"/>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="23"/>
+    </field>
+  </object>
+  <object pk="13" model="toolbar.button">
+    <field type="CharField" name="label">śródtytuł</field>
+    <field type="SlugField" name="slug">srodtytul</field>
+    <field type="TextField" name="params">{"tag": "srodtytul"}</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key"/>
+    <field type="PositiveIntegerField" name="key_mod">0</field>
+    <field type="CharField" name="tooltip"/>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="1"/>
+    </field>
+  </object>
+  <object pk="3" model="toolbar.button">
+    <field type="CharField" name="label">Usuń spację</field>
+    <field type="SlugField" name="slug">strip_whitespace</field>
+    <field type="TextField" name="params">{"exprs": [["^\\s+|\\s+$", ""], ["\\s+", " "], ["(,,)\\s+|\\s+(\")", "$1"]]}</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">lineregexp</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key"/>
+    <field type="PositiveIntegerField" name="key_mod">0</field>
+    <field type="CharField" name="tooltip">Usuwa zbędne spację z dokumentu.</field>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="2"/>
+    </field>
+  </object>
+  <object pk="81" model="toolbar.button">
+    <field type="CharField" name="label">strofa</field>
+    <field type="SlugField" name="slug">strofa</field>
+    <field type="TextField" name="params">{"tag": "strofa"}</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_stanza</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key">s</field>
+    <field type="PositiveIntegerField" name="key_mod">1</field>
+    <field type="CharField" name="tooltip"> </field>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="12"/>
+      <object pk="17"/>
+    </field>
+  </object>
   <object pk="17" model="toolbar.button">
     <field type="CharField" name="label">tagi główne</field>
     <field type="SlugField" name="slug">tagi-glowne</field>
@@ -825,22 +788,35 @@
       <object pk="11"/>
     </field>
   </object>
-  <object pk="33" model="toolbar.button">
-    <field type="CharField" name="label">tytuł</field>
-    <field type="SlugField" name="slug">tytul</field>
-    <field type="TextField" name="params">{"tag": "nazwa_utworu"}</field>
+  <object pk="76" model="toolbar.button">
+    <field type="CharField" name="label">A&lt;sup&gt;↓&lt;/sup&gt;</field>
+    <field type="SlugField" name="slug">tolowercase</field>
+    <field type="TextField" name="params">[]</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">lowercase</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key">u</field>
+    <field type="PositiveIntegerField" name="key_mod">5</field>
+    <field type="CharField" name="tooltip">Zamień wielkie litery na małe.</field>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="15"/>
+    </field>
+  </object>
+  <object pk="92" model="toolbar.button">
+    <field type="CharField" name="label">tytuł dzieła</field>
+    <field type="SlugField" name="slug">tytul-dziela</field>
+    <field type="TextField" name="params">{"tag": "tytul_dziela"}</field>
     <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
     <field type="CharField" name="link"/>
     <field type="CharField" name="key"/>
     <field type="PositiveIntegerField" name="key_mod">0</field>
     <field type="CharField" name="tooltip"/>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="13"/>
+      <object pk="15"/>
     </field>
   </object>
   <object pk="45" model="toolbar.button">
-    <field type="CharField" name="label">tytuł dzieła</field>
-    <field type="SlugField" name="slug">tytul-dziela</field>
+    <field type="CharField" name="label">tytuł dzieła typ 1</field>
+    <field type="SlugField" name="slug">tytul-dziela-typ</field>
     <field type="TextField" name="params">{"tag": "tytul_dziela", "attrs": {"typ": "1"}}</field>
     <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
     <field type="CharField" name="link"/>
@@ -861,7 +837,7 @@
     <field type="PositiveIntegerField" name="key_mod">0</field>
     <field type="CharField" name="tooltip"/>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="15"/>
+      <object pk="27"/>
     </field>
   </object>
   <object pk="83" model="toolbar.button">
@@ -892,6 +868,34 @@
       <object pk="17"/>
     </field>
   </object>
+  <object pk="84" model="toolbar.button">
+    <field type="CharField" name="label">wers m. wcięty</field>
+    <field type="SlugField" name="slug">wers-mocno-wciety</field>
+    <field type="TextField" name="params">{"tag": "wers_wciety", "attrs": {"typ": ""}}</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key">w</field>
+    <field type="PositiveIntegerField" name="key_mod">1</field>
+    <field type="CharField" name="tooltip">Alt+w</field>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="12"/>
+      <object pk="17"/>
+    </field>
+  </object>
+  <object pk="91" model="toolbar.button">
+    <field type="CharField" name="label">wers wcięty</field>
+    <field type="SlugField" name="slug">wers-wciety</field>
+    <field type="TextField" name="params">{"tag": "wers-wciety"}</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key">q</field>
+    <field type="PositiveIntegerField" name="key_mod">1</field>
+    <field type="CharField" name="tooltip">Alt+q</field>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="12"/>
+      <object pk="17"/>
+    </field>
+  </object>
   <object pk="48" model="toolbar.button">
     <field type="CharField" name="label">www</field>
     <field type="SlugField" name="slug">www</field>
@@ -957,30 +961,56 @@
       <object pk="21"/>
     </field>
   </object>
-  <object pk="56" model="toolbar.button">
-    <field type="CharField" name="label">zastępnik wersu</field>
-    <field type="SlugField" name="slug">zastepnik-wersu</field>
-    <field type="TextField" name="params">{"tag": "zastepnik_wersu"}</field>
-    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
+  <object pk="89" model="toolbar.button">
+    <field type="CharField" name="label">Zamień Cudzysłów PT</field>
+    <field type="SlugField" name="slug">zamien-cudzyslow-pt</field>
+    <field type="TextField" name="params">{"exprs": [["\u00ab|\u201e", ",,"], ["\u00bb", "\""], ["([^=])\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])", "$1,,$2"], ["^\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])", ",,$1"], ["(,,)\\s+|\\s+(\")", "$1"]]}</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">lineregexp</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key"/>
+    <field type="PositiveIntegerField" name="key_mod">0</field>
+    <field type="CharField" name="tooltip">Zamienia cudzysłowy (Pan Tadeusz Style)</field>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="2"/>
+    </field>
+  </object>
+  <object pk="77" model="toolbar.button">
+    <field type="CharField" name="label">Zamień cudzysłowy</field>
+    <field type="SlugField" name="slug">zamien-cudzyslowy</field>
+    <field type="TextField" name="params">{"exprs": [["\u00bb|\u201e", ",,"], ["\u00ab", "\""], ["([^=])\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])", "$1,,$2"], ["^\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])", ",,$1"], ["(,,)\\s+|\\s+(\")", "$1"]]}</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">lineregexp</field>
     <field type="CharField" name="link"/>
     <field type="CharField" name="key"/>
     <field type="PositiveIntegerField" name="key_mod">0</field>
     <field type="CharField" name="tooltip"/>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="16"/>
+      <object pk="2"/>
     </field>
   </object>
-  <object pk="13" model="toolbar.button">
-    <field type="CharField" name="label">śródtytuł</field>
-    <field type="SlugField" name="slug">srodtytul</field>
-    <field type="TextField" name="params">{"tag": "srodtytul"}</field>
+  <object pk="2" model="toolbar.button">
+    <field type="CharField" name="label">Zamień dywiz</field>
+    <field type="SlugField" name="slug">zamien_dywiz</field>
+    <field type="TextField" name="params">{"exprs": [["(\\s)-(\\s)", "$1---$2"], ["^(\\s*)-(\\s)", "$1---$2"], ["(\\s)-(\\s*)$", "$1---$2"], ["(\\d)[\u2014-](\\d)", "$1--$2"], ["\u2014", "---"]]}</field>
+    <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">lineregexp</field>
+    <field type="CharField" name="link"/>
+    <field type="CharField" name="key"/>
+    <field type="PositiveIntegerField" name="key_mod">0</field>
+    <field type="CharField" name="tooltip">Zamienia '—' na '---', oraz '1—2' na '1--2'.</field>
+    <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
+      <object pk="2"/>
+    </field>
+  </object>
+  <object pk="56" model="toolbar.button">
+    <field type="CharField" name="label">zastępnik wersu</field>
+    <field type="SlugField" name="slug">zastepnik-wersu</field>
+    <field type="TextField" name="params">{"tag": "zastepnik_wersu"}</field>
     <field to="toolbar.scriptlet" name="scriptlet" rel="ManyToOneRel">insert_tag</field>
     <field type="CharField" name="link"/>
     <field type="CharField" name="key"/>
     <field type="PositiveIntegerField" name="key_mod">0</field>
     <field type="CharField" name="tooltip"/>
     <field to="toolbar.buttongroup" name="group" rel="ManyToManyRel">
-      <object pk="1"/>
+      <object pk="16"/>
     </field>
   </object>
   <object pk="insert_tag" model="toolbar.scriptlet">
@@ -1255,4 +1285,7 @@ $('#split-dialog').jqmShow({
   <object pk="show_dialog" model="toolbar.scriptlet">
     <field type="TextField" name="code">$(params[0]).jqmShow({editor: editor, panel: panel, params: params});</field>
   </object>
+  <object pk="refresh_panel" model="toolbar.scriptlet">
+    <field type="TextField" name="code">panel.refresh();</field>
+  </object>
 </django-objects>

diff --git a/apps/toolbar/models.py b/apps/toolbar/models.py
index 8d123fd..d1f4952 100644 (file)
--- a/apps/toolbar/models.py
+++ b/apps/toolbar/models.py
@@ -33,7 +33,7 @@ class Button(models.Model):
     group = models.ManyToManyField(ButtonGroup)
     
     class Meta:
-        ordering = ('label',)
+        ordering = ('slug',)
         verbose_name, verbose_name_plural = _('button'), _('buttons')
 
     def hotkey_code(self):

diff --git a/project/static/js/editor.js b/project/static/js/editor.js
index 0cbb934..f94d33c 100644 (file)
--- a/project/static/js/editor.js
+++ b/project/static/js/editor.js
@@ -425,7 +425,7 @@ Editor.prototype.saveToBranch = function(msg)
                 if(self.autosaveTimer) {
                     clearTimeout(self.autosaveTimer);
                 }
-                if (data.warnings === null) {
+                if (data.warnings === null || data.warning === undefined) {
                     self.showPopup('save-successful');
                 } else {
                     self.showPopup('save-warn', data.warnings[0]);

diff --git a/project/templates/explorer/file_list.html b/project/templates/explorer/file_list.html
index b4e31e6..7612a71 100644 (file)
--- a/project/templates/explorer/file_list.html
+++ b/project/templates/explorer/file_list.html
@@ -48,7 +48,7 @@ $(function() {
        
        $.each(options.recentFiles, function(index) {
                var fileId = options.recentFiles[index].fileId;
-               $('#recent-file-list ul').append('<li><a href="/editor/' + fileId + '/">' + fileId + '</a></li>');
+               $('#recent-file-list ul').append('<li><a href="{% url editor_base %}'+fileId+'">' + fileId + '</a></li>');
        });
 });
 </script>

diff --git a/project/templates/explorer/panels/parse_error.html b/project/templates/explorer/panels/parse_error.html
index ac28fcb..027e8b4 100644 (file)
--- a/project/templates/explorer/panels/parse_error.html
+++ b/project/templates/explorer/panels/parse_error.html
@@ -2,8 +2,17 @@
 <p><b>{{ exception_type }}</b></p>
 <p>{{ exception.message }}</p>
 
+<button id="try-again-button" type="button">Try Again</button>
+
 <script type="text/javascript" charset="utf-8">
 panel_hooks = {
+    load: function() {
+        var self = this;
+
+        $('#try-again-button').click(function() {
+            self.load(self.current_url);
+        });      
+    },
     refresh: function() {
         return true; // error page is static
     },

diff --git a/project/urls.py b/project/urls.py
index a9fad54..2c1fab7 100644 (file)
--- a/project/urls.py
+++ b/project/urls.py
@@ -22,6 +22,7 @@ urlpatterns = patterns('',
     # Editor panels
     url(r'^editor/'+PATH_SEC+'/panel/(?P<name>[a-z]+)/$', 'explorer.views.panel_view', name='panel_view'),
     url(r'^editor/'+PATH_END, 'explorer.views.display_editor', name='editor_view'),
+    url(r'^editor/$', 'explorer.views.file_list', name='editor_base'),
 
     url(r'^editor/'+PATH_SEC+'/split$', 'explorer.views.split_text'),
     url(r'^editor/'+PATH_SEC+'/split-success',