X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/10f48e60a7f7499a6602098fc44298e05d05af50..970685936cdd7b70e3efa2f2506f66198049b16d:/project/templates/explorer/editor.html?ds=sidebyside

diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index 6dce9047..2263f02e 100644
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -2,15 +2,17 @@
 
 {% block extrahead %}
     <link rel="stylesheet" href="{{STATIC_URL}}css/toolbar.css" type="text/css" />
+    <link rel="stylesheet" href="{{STATIC_URL}}css/jquery.modal.css" type="text/css" />
     <script src="{{STATIC_URL}}js/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/codemirror/codemirror.js" type="text/javascript" charset="utf-8"></script>
-    <script src="{{STATIC_URL}}js/jquery.autoscroll.js" type="text/javascript" charset="utf-8"></script>
+    <!--<script src="{{STATIC_URL}}js/jquery.autoscroll.js" type="text/javascript" charset="utf-8"></script>-->
     <script src="{{STATIC_URL}}js/jquery.wtooltip.js" type="text/javascript" charset="utf-8"></script>
-    <script src="{{STATIC_URL}}js/jquery.hpanel.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/jquery.json.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/jquery.cookie.js" type="text/javascript" charset="utf-8"></script>
-    <script src="{{STATIC_URL}}js/editor.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/jquery.modal.js" type="text/javascript" charset="utf-8"></script>
 
+    <script src="{{STATIC_URL}}js/editor.js" type="text/javascript" charset="utf-8"></script>
+    <script src="{{STATIC_URL}}js/editor.ui.js" type="text/javascript" charset="utf-8"></script>
 {% endblock extrahead %}
 
 {% block extrabody %}
@@ -26,17 +28,29 @@
     </script>
 {% endblock extrabody %}
 
-{% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> &gt; plik {{ hash }}{% endblock breadcrumbs %}
+{% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> &gt; plik {{ fileid }}{% endblock breadcrumbs %}
 
 {% block header-toolbar %}
-	<button type="button" class="toolbar-button" id="toolbar-button-commit">Commit</button>
-	<button type="button" class="toolbar-button" id="toolbar-button-save" disabled="disabled">Zapisz</button>
+
+
+<button type="button" class="toolbar-button" id="toolbar-button-commit">Merge</button>
+<button type="button" class="toolbar-button" id="toolbar-button-update"
+        ui:ajax-action="{% url file_update fileid %}">Update</button>
+<button type="button" class="toolbar-button" id="toolbar-button-save" disabled="disabled">Save</button>
 {% endblock %}
 
 {% block message-box %}
-    <div class="msg-success" id="save-successful"><p>Zapisano :)</p><p class="data" /></div>
-    <div class="msg-error" id="save-error"><p>Błąd przy zapisie.</p> <p class="data" /></div>
-    <div class="msg-warning" id="not-implemented"><p>Tej funkcji jeszcze nie ma :(</p><p class="data" /></div>
+    <div class="msg-info" id="save-waiting"><p>Zapisuję dane na serwerze.</p><p class="data"></p></div>
+    <div class="msg-success" id="save-successful"><p>Zapisano :)</p><p class="data"></p></div>
+    <div class="msg-warning" id="save-warn"><p>Zapisano. Uwagi: (</p><p class="data"></p></div>
+    <div class="msg-error" id="save-error"><p>Błąd przy zapisie.</p> <p class="data"></p></div>
+
+    <div class="msg-success" id="generic-yes"><p class="data"></p></div>
+    <div class="msg-info" id="generic-info"><p class="data"></p></div>
+    <div class="msg-error" id="generic-error"><p class="data"></p></div>
+    
+    <div class="msg-warning" id="not-implemented"><p>Tej funkcji jeszcze nie ma :(</p><p class="data"></p></div>
+    
 {% endblock %}
 
 {% block maincontent %}
@@ -44,19 +58,48 @@
             {% for n in panel_list %}
             <div class="panel-wrap{% if forloop.last %} last-panel{% endif %}" id="panel-{{n}}">
                 <div class="panel-toolbar">
-                    <label for="select-{{n}}-panel">{{n|capfirst}} panel:</label>
+                    <p><label>{{n|capfirst}} panel:
                     <select name="select-{{n}}-panel" id="panel-{{n}}-select">
-                        <option value="{% url xmleditor_panel hash %}" name="xmleditor">Edytor XML</option>
-                        <option value="{% url htmleditor_panel hash %}" name="htmleditor">Edytor HTML</option>
-                        <option value="{% url gallery_panel hash %}" name="gallery">Galeria skanów</option>
-                        <option value="{% url dceditor_panel hash %}" name="dceditor">Edytor DublinCore</option>
+                        {% for panel_type in availble_panels %}
+                        <option value="{% url panel_view path=fileid,name=panel_type.id  %}">{{panel_type.display_name}}</option>
+                        {% endfor %}
                     </select>
-                    <button type="button" class="refresh-button">Odśwież</button>
+                    </label>
+                    <span class="toolbar-button-groups-container">
+                    <span class="panel-toolbar-extra" > </span>
+                    </span>
+                    <!-- rethink the refresh button - it doesn't work very well -->
+                    <!-- <button type="button" class="refresh-button">Odśwież</button> -->
+                    {# <a href="{% url print_xml fileid %}" target="_new">Wydruk</a> #}
                     <strong class="change-notification" style="display: none">Widok nieaktualny!</strong>
+                    </p>
                </div>
                <div id="panel-{{n}}-content" class="panel-content"></div>
                <button type="button" class="panel-slider"></button>
             </div>
             {% endfor %}
         </div>
+        <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>
+                <p>
+                   <input type="submit" value="Save" id="commit-dialog-save-button" />
+                   <input type="reset" value="Cancel" id="commit-dialog-cancel-button" />
+                </p>
+            </form>
+        </div>
+
+        <div id="split-dialog" class="jqmWindow">
+            <div class="container-box"> </div>
+            <div class="loading-box" style="display: none;">
+                <p>Wczytuję zawartość okna...</p>
+                <!-- <p><button type="button" class="dialog-close-button">Close</button></p> -->
+            </div>
+            <div class="fatal-error-box" style="display: none;">
+                <p>Server error, while loading dialog :(</p>
+                <p><button type="button" class="dialog-close-button">Close</button></p>
+            </div>
+        </div>
 {% endblock maincontent %}