Poprawione tooltipy i skróty klawiszowe.

[redakcja.git] / apps / toolbar / templates / toolbar / toolbar.html

diff --git a/apps/toolbar/templates/toolbar/toolbar.html b/apps/toolbar/templates/toolbar/toolbar.html
index c6b5ebb..29528c1 100644 (file)
--- a/apps/toolbar/templates/toolbar/toolbar.html
+++ b/apps/toolbar/templates/toolbar/toolbar.html
@@ -1,19 +1,31 @@
 {% load toolbar_tags %}
-<div class="toolbar">
-    <ol class="toolbar-tabs">
+<div class="toolbar" xmlns:ui="http://nowoczesnapolska.org.pl/platforma/ui">
+    
+    <div class="toolbar-tabs-container">
+    <p>
         {% for group in groups %}
-        <li p:button-list="{{ group.slug }}" {% if forloop.first %}class="active"{% endif %}>{{ group.name }}</li>
+        <button ui:group="{{ group.slug }}" {% if forloop.first %}class="active"{% endif %}>
+            {{ group.name }}
+        </button>
         {% endfor %}
-    </ol>
-    <div style="clear: both; height: 0; width: 0">&nbsp;</div>
-    <div class="toolbar-buttons">
-        {% for group in groups %}
-        <ol class="{{ group.slug }}" {% if not forloop.first %}style="display:none"{% endif %}>
+    </p>
+    </div>
+
+    <div class="toolbar-button-groups-container">
+        {% for group in groups %}        
+        <p ui:group="{{group.slug}}" class="toolbar-buttons-container" {% if not forloop.first %}style="display:none;"{% endif %}>
+            {# buttons for this group #}            
             {% for button in group.button_set.all %}
-            <li p:tag="{{ button.tag }}" {% if button.key %}p:key="{{ button.key|keycode }}" title="Alt+{{ button.key|upper }}"{% endif %}>{{ button.label }}</li>
+            <button type="button" 
+                ui:action="{{ button.scriptlet.name }}"
+                ui:action-params="{{ button.params|escape }}"
+                {% if button.key %}ui:hotkey="{{ button.key|keycode }}"{% endif %} 
+                {% if button.tooltip %}ui:tooltip="{{ button.tooltip }}"{% endif %} >
+            {{ button.label }}
+            </button>
             {% endfor %}
-        </ol>
+        </p>
         {% endfor %}
-        <div style="clear: both; height: 0; width: 0">&nbsp;</div>
     </div>
-</div>
\ No newline at end of file
+
+</div>