Merge branch 'master' into lqc-trunk

[redakcja.git] / platforma / templates / explorer / editor.html

diff --git a/platforma/templates/explorer/editor.html b/platforma/templates/explorer/editor.html
index 0dcc06b..2e8a6b4 100755 (executable)
--- a/platforma/templates/explorer/editor.html
+++ b/platforma/templates/explorer/editor.html
@@ -12,9 +12,8 @@
                 docID: '{{ fileid }}',
                 userID: '{{ euser }}',
                 docURL: '{% url document_view fileid %}{% if euser %}?user={{ euser|urlencode }}{% endif %}',
                 docID: '{{ fileid }}',
                 userID: '{{ euser }}',
                 docURL: '{% url document_view fileid %}{% if euser %}?user={{ euser|urlencode }}{% endif %}',

-                toolbarURL: '{% url toolbar_buttons %}',
-                renderURL: '{% url api.views.render %}',
-                               staticURL: '{{ STATIC_URL }}'
+                toolbarURL: '{% url toolbar_buttons %}',                
+               staticURL: '{{ STATIC_URL }}'

             }          
                 
        </script>
             }          
                 
        </script>


@@ -65,23 +64,13 @@
        <script type="text/html" charset="utf-8" id="html-view-template">
                 <div class="htmlview-toolbar">
                     <a class="html-print-link" href="print" ui:baseref="{% url file_print fileid %}" target="_new">{% trans "Print version"  %}</a>
        <script type="text/html" charset="utf-8" id="html-view-template">
                 <div class="htmlview-toolbar">
                     <a class="html-print-link" href="print" ui:baseref="{% url file_print fileid %}" target="_new">{% trans "Print version"  %}</a>

+                    <button class="html-add-motive" type="button">Dodaj motyw</button>
+                    <button class="html-serialize" type="button">Serializuj</button>

                 </div>
                 
                <div class="htmlview">
                </div>
        </script>       
                 </div>
                 
                <div class="htmlview">
                </div>
        </script>       

-        
-        <script type="text/html" charset="utf-8" id="html-view-frag-menu-template">
-            <span class="default-menu context-menu">
-                <span class="edit-button">Edytuj</span>                
-            </span>
-            <span class="edit-menu context-menu">
-                <span class="accept-button">OK</span>
-                <span class="reject-button">Anuluj</span>
-            </span>
-        </script>
-
-

 
        <script type="text/html" charset="utf-8" id="flash-view-template">
                <div class="flashview">
 
        <script type="text/html" charset="utf-8" id="flash-view-template">
                <div class="flashview">


@@ -140,7 +129,7 @@
             {% if user.is_superuser %}
             <div class="choose-gallery">
                 <p>Dołącz galerię do dokumentu:</p>
             {% if user.is_superuser %}
             <div class="choose-gallery">
                 <p>Dołącz galerię do dokumentu:</p>

-                <p>{{ gallery_form.subpath }} <input id="choose-gallery" type="submit" value="Dołącz"></p>
+                <p>{{ gallery_form.subpath }} <input class="choose-gallery-button" type="submit" value="Dołącz"></p>

             </div>
             {% endif %}
         </div>
             </div>
             {% endif %}
         </div>