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 c38dfc4..eecfb57 100644 (file)
--- a/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@ -16,7 +16,9 @@
        
        {# 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/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>


@@ -49,20 +51,41 @@
                </div>
        </script>
 
                </div>
        </script>
 

-        <script type="text/html" charset="utf-8" id="image-gallery-view-template">
+       <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>
        <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" />
+        <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-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>
 
         </p>
         </div>
 

-        <div>
+        <div class="image-gallery-page-list">

             <% for(var i=0; i < model.data.length; i++) { %>
             <% for(var i=0; i < model.data.length; i++) { %>

-                <p class="image-gallery-page-container"><%= model.data[i] %></p>
+                <div class="image-gallery-page-container" ui:model="<%= model.data[i] %>">
+                </div>

             <% }; %>
        </div>
         
             <% }; %>
        </div>
         


@@ -152,3 +175,7 @@
         </div>
     </div>
 {% endblock maincontent %}
         </div>
     </div>
 {% 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