Merge branch 'master' into view-refactor

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

diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index e752286..f7e827f 100644 (file)
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -12,27 +12,30 @@
     <script src="{{STATIC_URL}}js/lib/jquery.json.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/lib/jquery.cookie.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/lib/jquery.modal.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/lib/jquery.json.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/lib/jquery.cookie.js" type="text/javascript" charset="utf-8"></script>
     <script src="{{STATIC_URL}}js/lib/jquery.modal.js" type="text/javascript" charset="utf-8"></script>

+       
+       {# App and views #}

        <script src="{{STATIC_URL}}js/app.js" type="text/javascript" charset="utf-8"></script>
        <script src="{{STATIC_URL}}js/app.js" type="text/javascript" charset="utf-8"></script>

+       <script src="{{STATIC_URL}}js/views/view.js" type="text/javascript" charset="utf-8"></script>

        <script src="{{STATIC_URL}}js/views/split.js" type="text/javascript" charset="utf-8"></script>
        <script src="{{STATIC_URL}}js/views/xml.js" type="text/javascript" charset="utf-8"></script>
        <script src="{{STATIC_URL}}js/views/html.js" type="text/javascript" charset="utf-8"></script>
        <script src="{{STATIC_URL}}js/views/panel_container.js" type="text/javascript" charset="utf-8"></script>
        <script src="{{STATIC_URL}}js/views/split.js" type="text/javascript" charset="utf-8"></script>
        <script src="{{STATIC_URL}}js/views/xml.js" type="text/javascript" charset="utf-8"></script>
        <script src="{{STATIC_URL}}js/views/html.js" type="text/javascript" charset="utf-8"></script>
        <script src="{{STATIC_URL}}js/views/panel_container.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>
 
        {# JavaScript templates #}
        <script type="text/html" charset="utf-8" id="panel-container-view-template">
                <select>
     <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>
 
        {# JavaScript templates #}
        <script type="text/html" charset="utf-8" id="panel-container-view-template">
                <select>

-                       <% for (var i = 0; i < panels.length; i++) { %>
-                       <option value="<%= i %>"><%= panels[i].name %></option>
+                       <% for (panel in panels) { %>
+                       <option value="<%= panel %>"><%= panel %></option>

                        <% }; %>
                </select>
                <div class="content-view"></div>
        </script>
        
        <script type="text/html" charset="utf-8" id="xml-view-template">
                        <% }; %>
                </select>
                <div class="content-view"></div>
        </script>
        
        <script type="text/html" charset="utf-8" id="xml-view-template">

-               <div class="xmlview" style="position: absolute; top: 40px; left:0px; right:0px; bottom: 0px;">
-                       <textarea name="text">Ala ma kota</textarea>
+               <div class="xmlview">

                </div>
        </script>
        
                </div>
        </script>
        


@@ -41,30 +44,7 @@
        </script>
 {% endblock extrahead %}
 
        </script>
 {% endblock extrahead %}
 

-{% block extrabody %}
-    <script type="text/javascript" charset="utf-8">
-    $(function() {
-        {% for scriptlet in scriptlets %}
-        editor.registerScriptlet("{{scriptlet.name}}",
-            function(editor, panel, params) {
-                {{ scriptlet.code|safe }}
-            });
-        {% endfor %}
-     });  
-    </script>
-{% endblock extrabody %}
-
-{% load explorer_tags %}
-
-{% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> &gt; {{ fileid|bookname }}{% endblock breadcrumbs %}
-
-{% block header-toolbar %}
-<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>
-<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 breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a> &gt; {{ fileid }}{% endblock breadcrumbs %}

 
 {% block message-box %}
     <div class="msg-info" id="save-waiting"><p>Zapisuję dane na serwerze.</p><p class="data"></p></div>
 
 {% block message-box %}
     <div class="msg-info" id="save-waiting"><p>Zapisuję dane na serwerze.</p><p class="data"></p></div>