Poprawienie diva dla FlashView, tak żeby nie zasłaniał przycisków.

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

diff --git a/project/templates/explorer/editor.html b/project/templates/explorer/editor.html
index f7e827f..eecfb57 100644 (file)
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -1,29 +1,34 @@
 {% extends "base.html" %}
 
 {% block extrahead %}
 {% extends "base.html" %}
 
 {% block extrahead %}

+       <link rel="stylesheet" href="{{STATIC_URL}}css/jquery.modal.css" type="text/css" media="screen" title="no title" charset="utf-8">
+       <link rel="stylesheet" href="{{STATIC_URL}}css/html.css" type="text/css" media="screen" title="no title" charset="utf-8">
+       

        <script type="text/javascript" charset="utf-8">
                var fileId = '{{ fileid }}';
        </script>
        <script type="text/javascript" charset="utf-8">
                var fileId = '{{ fileid }}';
        </script>

-    <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/lib/jquery.lazyload.js" type="text/javascript" charset="utf-8"></script>
+       
+       {# Libraries #}

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

-    <script src="{{STATIC_URL}}js/lib/jquery.wtooltip.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>
+       <script src="{{STATIC_URL}}js/lib/jquery.modal.js" type="text/javascript" charset="utf-8"></script>
+       {# Scriptlets #}
+       <script src="http://localhost:8000/api/toolbar/scriptlets" type="text/javascript" charset="utf-8"></script>

        
        {# App and views #}
        <script src="{{STATIC_URL}}js/app.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/messages.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/view.js" type="text/javascript" charset="utf-8"></script>

+       <script src="{{STATIC_URL}}js/views/flash.js" type="text/javascript" charset="utf-8"></script>
+       <script src="{{STATIC_URL}}js/views/editor.js" type="text/javascript" charset="utf-8"></script>
+       <script src="{{STATIC_URL}}js/views/button_toolbar.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/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/gallery.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/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>
-
+       <script src="{{STATIC_URL}}js/models.js" type="text/javascript" charset="utf-8"></script>
+       

        {# JavaScript templates #}
        <script type="text/html" charset="utf-8" id="panel-container-view-template">
                <select>
        {# JavaScript templates #}
        <script type="text/html" charset="utf-8" id="panel-container-view-template">
                <select>


@@ -35,12 +40,79 @@
        </script>
        
        <script type="text/html" charset="utf-8" id="xml-view-template">
        </script>
        
        <script type="text/html" charset="utf-8" id="xml-view-template">

+               <div class="xmlview-toolbar"></div>

                <div class="xmlview">
                <div class="xmlview">

+                       

                </div>
        </script>
        
        <script type="text/html" charset="utf-8" id="html-view-template">
                </div>
        </script>
        
        <script type="text/html" charset="utf-8" id="html-view-template">

-               <p>Hej! Jestem widokiem HTML!</p>
+               <div class="htmlview">
+               </div>
+       </script>
+
+       <script type="text/html" charset="utf-8" id="flash-view-template">
+               <div class="flashview">
+               <% if (shownMessage) { %>
+                       <p style="margin: 0; padding: 0.2em 0.5em; line-height: 1.8em; background-color: yellow" class="<%= shownMessage.type %>"><%= shownMessage.text %></p>
+               <% } %>
+               </div>
+       </script>
+       
+    <script type="text/html" charset="utf-8" id="image-gallery-view-template">
+       <div class="image-gallery-view-template">
+
+        <div class="image-gallery-header">
+        <p>
+        <button type="button" class="image-gallery-prev-button">Previous</button>
+        <input type="input" class="image-gallery-current-page"
+            size="6"
+            value="<%= (currentPage + 1) %>" />
+        <button type="button" class="image-gallery-jump-button">Go</button>
+        <button type="button" class="image-gallery-next-button">Next</button>
+
+        <button type="button" class="image-gallery-zoom-in">+</button>
+        <select class="image-gallery-current-zoom">
+            <option>50%</option>
+            <option selected="selected">100%</option>
+            <option>150%</option>
+            <option>200%</option>
+        </select>
+        <button type="button" class="image-gallery-zoom-out">-</button>
+        </p>
+        </div>
+
+        <div class="image-gallery-page-list">
+            <% for(var i=0; i < model.data.length; i++) { %>
+                <div class="image-gallery-page-container" ui:model="<%= model.data[i] %>">
+                </div>
+            <% }; %>
+       </div>
+        
+        </div>
+       </script>
+       
+       <script type="text/html" charset="utf-8" id="button-toolbar-view-template">
+               <div class="buttontoolbarview">
+                       <div class="buttontoolbarview-tabs">
+                       <% for (var i=0; i < buttons.length; i++) { %>
+                               <a href="#" class="buttontoolbarview-tab" ui:groupindex="<%= i %>"><%= buttons[i].name %></a>
+                       <% }; %>
+                       </div>
+                       <div class="buttontoolbarview-groups">
+                       <% for (var i=0; i < buttons.length; i++) { %>
+                               <div class="buttontoolbarview-group" ui:groupIndex="<%= i %>" style="display: none">
+                                       <% for (var j=0; j < buttons[i].buttons.length; j++) { %>
+                                               <% if (buttons[i].buttons[j].scriptlet_id) { %>
+                                               <a href="#" class="buttontoolbarview-button" ui:groupindex="<%= i %>" ui:buttonindex="<%= j %>">
+                                                       <%= buttons[i].buttons[j].label %>
+                                               </a>
+                                               <% } %>
+                                       <% } %>
+                               </div>
+                       <% }; %>
+                       </div>
+               </div>

        </script>
 {% endblock extrahead %}
 
        </script>
 {% endblock extrahead %}
 


@@ -60,6 +132,10 @@
     
 {% endblock %}
 
     
 {% endblock %}
 

+{% block header-toolbar %}
+       <button id="action-merge">Merge</button> <button id="action-update">Update</button> <button id="action-commit">Commit</button> <button id="action-quick-save">Quick Save</button>
+{% endblock %}
+

 {% block maincontent %}
        <div id="splitview">
                <div id="left-panel-container" class='panel-container'></div>
 {% block maincontent %}
        <div id="splitview">
                <div id="left-panel-container" class='panel-container'></div>


@@ -67,7 +143,7 @@
     </div>
 
 
     </div>
 
 

-    <div id="commit-dialog" class="jqmWindow">
+    <div id="commit-dialog" class="jqmWindow" style="display:none">

         <form action="{% url file_commit fileid %}" method="POST">
             <label for="message">Commit message:</label>
             <textarea cols="60" rows="10" name="message" id="commit-dialog-message"></textarea>
         <form action="{% url file_commit fileid %}" method="POST">
             <label for="message">Commit message:</label>
             <textarea cols="60" rows="10" name="message" id="commit-dialog-message"></textarea>


@@ -86,8 +162,8 @@
             </p>
         </form>
     </div>
             </p>
         </form>
     </div>

-
-    <div id="split-dialog" class="jqmWindow">
+    
+    <div id="split-dialog" class="jqmWindow" style="display:none">

         <div class="container-box"> </div>
         <div class="loading-box" style="display: none;">
             <p>Loading dialog contents...</p>
         <div class="container-box"> </div>
         <div class="loading-box" style="display: none;">
             <p>Loading dialog contents...</p>


@@ -98,4 +174,8 @@
             <p><button type="button" class="dialog-close-button">Close</button></p>
         </div>
     </div>
             <p><button type="button" class="dialog-close-button">Close</button></p>
         </div>
     </div>

-{% endblock maincontent %}    
+{% endblock maincontent %}
+
+{% block extrabody %}
+       <div style="position: absolute; left: 35%; right: 35%; top: 0; height: 20px; z-index: 1000" id="flashview"></div>
+{% endblock %}
\ No newline at end of file