Lepsze obsługiwanie nieudanych merge oraz podawanie w vstorage.all_pages() jedynie...

[redakcja.git] / platforma / templates / wiki / document_details.html

diff --git a/platforma/templates/wiki/document_details.html b/platforma/templates/wiki/document_details.html
index 5aac2e6..1296dd9 100644 (file)
--- a/platforma/templates/wiki/document_details.html
+++ b/platforma/templates/wiki/document_details.html
@@ -4,6 +4,9 @@
 {% block extrahead %}
     <link rel="stylesheet" href="{{STATIC_URL}}css/master.css" type="text/css" media="screen" charset="utf-8" />
     <link rel="stylesheet" href="{{STATIC_URL}}css/html.css" type="text/css" media="screen" charset="utf-8" />
 {% block extrahead %}
     <link rel="stylesheet" href="{{STATIC_URL}}css/master.css" type="text/css" media="screen" charset="utf-8" />
     <link rel="stylesheet" href="{{STATIC_URL}}css/html.css" type="text/css" media="screen" charset="utf-8" />

+    <script type="text/javascript" charset="utf-8">
+        var STATIC_URL = '{{STATIC_URL}}';
+    </script>

     <script src="{{STATIC_URL}}js/lib/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/jquery.blockui.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/button_scripts.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/lib/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/jquery.blockui.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/button_scripts.js" type="text/javascript" charset="utf-8"></script>


@@ -59,7 +62,7 @@
                 <div class="toolbar" id="change-gallery-toolbar">
                     <input type="text" value="" class="chosen-gallery" />
                     <button class="change-gallery-ok">Zmień galerię</button>
                 <div class="toolbar" id="change-gallery-toolbar">
                     <input type="text" value="" class="chosen-gallery" />
                     <button class="change-gallery-ok">Zmień galerię</button>

-                    <button class="change-gallery-ok">Anuluj</button>
+                    <button class="change-gallery-cancel">Anuluj</button>

                     <div class="toolbar-end"> </div>    
                 </div>
                 <div class="gallery-image">
                     <div class="toolbar-end"> </div>    
                 </div>
                 <div class="gallery-image">