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

diff --combined project/templates/explorer/editor.html
index ff37c24,b51af17..23641f9
--- 1/project/templates/explorer/editor.html
--- 2/project/templates/explorer/editor.html
+++ b/project/templates/explorer/editor.html
@@@ -16,9 -16,7 +16,9 @@@
        
        {# 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/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>
@@@ -51,28 -49,33 +51,41 @@@
                </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" style="position: relative; margin-left: auto; margin-right: auto; width: 400px; background-color: yellow">
 +              <% if (shownMessage) { %>
 +                      <p style="margin: 0; padding: 0.2em 0.5em; line-height: 1.8em" 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" />
+         <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>
+         <div class="image-gallery-page-list">
              <% 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>
          
@@@ -162,7 -165,3 +175,7 @@@
          </div>
      </div>
  {% endblock maincontent %}
 +
 +{% block extrabody %}
 +      <div style="position: absolute; left: 0; right: 0; top: 0; height: 20px; z-index: 1000" id="flashview"></div>
 +{% endblock %}