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

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

diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index 4b08914..610a960 100644 (file)
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -31,17 +31,16 @@
     </script>
 {% endblock extrabody %}
 
     </script>
 {% endblock extrabody %}
 

- {% load explorer_tags %}
+{% load explorer_tags %}

 
 {% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> &gt; {{ fileid|bookname }}{% endblock breadcrumbs %}
 
 {% block header-toolbar %}
 
 {% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> &gt; {{ fileid|bookname }}{% endblock breadcrumbs %}
 
 {% block header-toolbar %}

-
-
-<button type="button" class="toolbar-button" id="toolbar-button-commit">Merge</button>
-<button type="button" class="toolbar-button" id="toolbar-button-update"
+<button type="button" class="requires-save toolbar-button" id="toolbar-button-commit">Merge</button>
+<button type="button" class="requires-save toolbar-button" id="toolbar-button-update"

         ui:ajax-action="{% url file_update fileid %}">Update</button>
         ui:ajax-action="{% url file_update fileid %}">Update</button>

-<button type="button" class="toolbar-button" id="toolbar-button-save" disabled="disabled">Save</button>
+<button type="button" class="provides-save toolbar-button" id="toolbar-button-save" disabled="disabled">Commit</button>
+<button type="button" class="provides-save toolbar-button" id="toolbar-button-quick-save" disabled="disabled">Quick Save</button>

 {% endblock %}
 
 {% block message-box %}
 {% endblock %}
 
 {% block message-box %}


@@ -84,13 +83,22 @@
             </div>
             {% endfor %}
         </div>
             </div>
             {% endfor %}
         </div>

+

         <div id="commit-dialog" class="jqmWindow">
             <form action="{% url file_commit fileid %}" method="POST">
                 <label for="message">Commit message:</label>
         <div id="commit-dialog" class="jqmWindow">
             <form action="{% url file_commit fileid %}" method="POST">
                 <label for="message">Commit message:</label>

-                <textarea cols="60" rows="15" name="message" id="commit-dialog-message"></textarea>
-                <p id="commit-dialog-error-empty-message">Wiadomość nie może być pusta.</p>
+                <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="http://localhost:3000/publications/issues/{{fileid}}">
+                    <legend>Related issues</legend>
+                    <div class="loading-box" style="display: none;">
+                        <p>Loading related issues...</p>
+                    </div>
+                    <div class="container-box">No related issues.</div>
+                </fieldset>

                 <p>
                 <p>

-                   <input type="submit" value="Save" id="commit-dialog-save-button" />
+                   <input type="button" value="Save" id="commit-dialog-save-button" />

                    <input type="reset" value="Cancel" id="commit-dialog-cancel-button" />
                 </p>
             </form>
                    <input type="reset" value="Cancel" id="commit-dialog-cancel-button" />
                 </p>
             </form>


@@ -99,7 +107,7 @@
         <div id="split-dialog" class="jqmWindow">
             <div class="container-box"> </div>
             <div class="loading-box" style="display: none;">
         <div id="split-dialog" class="jqmWindow">
             <div class="container-box"> </div>
             <div class="loading-box" style="display: none;">

-                <p>Wczytuję zawartość okna...</p>
+                <p>Loading dialog contents...</p>

                 <!-- <p><button type="button" class="dialog-close-button">Close</button></p> -->
             </div>
             <div class="fatal-error-box" style="display: none;">
                 <!-- <p><button type="button" class="dialog-close-button">Close</button></p> -->
             </div>
             <div class="fatal-error-box" style="display: none;">