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
old mode 100644 (file)
new mode 100755 (executable)
index 67c357d..7db4f44
--- a/platforma/templates/explorer/editor.html
+++ b/platforma/templates/explorer/editor.html
@@ -65,11 +65,24 @@
        <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>

                 </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">


@@ -153,10 +166,10 @@
 
 {% block header-toolbar %}
     <a href="http://stigma.nowoczesnapolska.org.pl/platforma-hg/ksiazki/log/tip/{{ fileid }}.xml" target="_new" >{% trans 'History'  %}</a>
 
 {% block header-toolbar %}
     <a href="http://stigma.nowoczesnapolska.org.pl/platforma-hg/ksiazki/log/tip/{{ fileid }}.xml" target="_new" >{% trans 'History'  %}</a>

-       <button id="action-merge">{% trans 'Push'  %}</button>
-        <button id="action-update">{% trans 'Pull'  %}</button>
-        <button id="action-commit">{% trans 'Save'  %}</button>
-        <button id="action-quick-save">{% trans 'Quick save'  %}</button>
+       <button id="action-merge">{% trans 'Push' %}</button>
+        <button id="action-update">{% trans 'Pull' %}</button>
+        <button id="action-commit">{% trans 'Save' %}</button>
+        <button id="action-quick-save">{% trans 'Quick save' %}</button>

 {% endblock %}
 
 {% block maincontent %}    
 {% endblock %}
 
 {% block maincontent %}