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

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

diff --git a/platforma/templates/explorer/editor.html b/platforma/templates/explorer/editor.html
index 0dcc06b..a2ec61f 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 %}',
-                toolbarURL: '{% url toolbar_buttons %}',
-                renderURL: '{% url api.views.render %}',
-                               staticURL: '{{ STATIC_URL }}'
+                toolbarURL: '{% url toolbar_buttons %}',                
+               staticURL: '{{ STATIC_URL }}'
             }          
                 
        </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>
+                    <button class="html-add-theme" type="button">Oznacz fragment motywem</button>
+                    <button class="html-add-annotation" type="button">Dodaj przypis</button>
                 </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">
@@ -140,11 +129,11 @@
             {% 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>
-       </script>
+        </script>
        
        <script type="text/html" charset="utf-8" id="button-toolbar-view-template">
                <div class="buttontoolbarview panel-toolbar">
@@ -195,9 +184,11 @@
     <div id="commit-dialog" class="jqmWindow" style="display:none">
         <form action="" method="POST">
             <label for="message">Commit message:</label>
-            <textarea cols="60" rows="10" name="message" id="commit-dialog-message"></textarea>
-            <p id="commit-dialog-error-empty-message">Wiadomość nie może być pusta.</p>                
-            <fieldset id="commit-dialog-related-issues" ui:ajax-src="{{REDMINE_URL}}/publications/issues/{{fileid}}">
+            
+            <textarea cols="60" rows="10" name="message" class="commit-message"></textarea>
+            <div class="error-messages-box"> </div>
+
+            <fieldset class="related-issues-fields" >
                 <legend>Related issues</legend>
                 <div class="loading-box" style="display: none;">
                     <p>Loading related issues...</p>
@@ -205,11 +196,50 @@
                 <div class="container-box">No related issues.</div>
             </fieldset>
             <p>
-               <input type="button" value="Save" id="commit-dialog-save-button" />
-               <input type="reset" value="Cancel" id="commit-dialog-cancel-button" />
+               <input type="button" value="Save" class="save-button" />
+               <input type="button" value="Cancel" class="cancel-button" />               
             </p>
         </form>
     </div>
+
+    <div id="theme-edit-dialog" class="jqmWindow" style="display:none">
+        <div class="data-area">        
+        <table class="theme-multi-list">
+            <tbody class="unknown-themes">
+                <tr class="header"><th colspan="5">Unknown themes</th></tr>
+            </tbody>
+            
+            <tbody>
+                <tr><th colspan="5">Themes in the database</th></tr>
+            {% regroup available_themes by first_letter as grouped_themes %}
+
+            {% for letter in grouped_themes %}
+            <tr><th colspan="5" class="letter-heading">{{ letter.grouper }}</th></tr>
+
+            {% for theme in letter.list %}
+            {% if forloop.first %}
+            <tr>
+            {% else %}
+            {% if forloop.counter0|divisibleby:"5" %}
+                </tr><tr>
+            {% endif %}
+            {% endif %}            
+            <td width="18%"><label><input class="theme-list-item" type="checkbox" value="{{theme.name}}"/>{{ theme.name }}</label></td>
+            {% if forloop.last %}
+            </tr>
+            {% endif %}
+            {% endfor %}
+            
+            {% endfor %}
+            </tbody>
+        </table>
+        </div>
+        <p class="action-area">
+            <input type="button" value="Accept" class="save-button" />
+            <input type="button" value="Cancel" class="cancel-button" />
+            <span class="error-messages-inline-box"></span>
+        </p>
+    </div>
     
     <div id="split-dialog" class="jqmWindow" style="display:none">
         <div class="container-box"> </div>