Shortcut menu: can now choose between simple and advanced menu

2 files changed, 51 insertions, 14 deletions

diff --git a/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html
new file mode 100644
index 000000000..91f99f294
--- /dev/null
+++ b/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html
@@ -0,0 +1,38 @@
+{% load i18n %}
+{% load url from future%}
+{% if menu %}
+<form method="post" action="{% url 'update-current-item' %}">
+<fieldset>
+<div class="short-menu-buttons btn-group" role="group">
+  <button type="button" class="btn" id='short-menu-simple'>{% trans "simple" %}</button>
+  <button type="button" class="btn btn-selected" id='short-menu-advanced'>{% trans "advanced" %}</button>
+</div>
+<div id='action_current_items'>
+<p><i class="icon fa fa-thumb-tack fa-2x" aria-hidden="true" title="{% trans 'Pin an item in order to constrain default searches with this item. By default only your items are displayed. New created and modified items are auto-pin.' %}"></i></p>
+<p>
+<a href='' onclick='return activate_own_search();' class='activate_own_search{% if SHORTCUT_SEARCH == 'all' %} disabled{% endif %}'><i class="icon fa fa-user" aria-hidden="true" title="{% trans 'Search within my items' %}"></i></a>
+<a href='' class='activate_all_search{% if SHORTCUT_SEARCH == 'own' %} disabled{% endif %}' onclick='return activate_all_search();'><i class="icon fa fa-users" aria-hidden="true" title="{% trans 'Search within all items' %}"></i></a>
+</p>
+<p>
+<a href='' onclick='return load_shortcut_menu();' class='disabled'><i class="icon fa fa-2x fa-refresh" aria-hidden="true" title="{% trans 'Refresh menu' %}"></i></a>
+</p>
+</div>
+<table id='current_items'>
+{% for lbl, model_name, current, widget in menu %}
+<tr>
+    <td><label for="current_{{model_name}}">{{lbl}}</label></td>
+    <td>
+        {{widget|safe}}
+    </td>{% with 'show-'|add:model_name as model_url%}
+    <td><a href='#' onclick='load_current_window("{% url model_url current %}", "{{model_name}}");' class='display_details'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td>
+    <td><span class='disabled pin-action' onclick='$.get("{% url 'unpin' model_name %}", function(){load_shortcut_menu();});' title="{% trans 'Unpin' %}">
+            <i class="fa fa-times"></i>
+    </span></td>
+    {% endwith %}
+</tr>
+{% endfor %}
+</table>
+</fieldset>
+</form>
+<script type='text/javascript'>var advanced_menu = true;</script>
+{% endif %}
diff --git a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
index fc1131c90..f07e0ed99 100644
--- a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
+++ b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
@@ -1,27 +1,25 @@
 {% load i18n %}
 {% load url from future%}
-{% if menu %}
+{% if current_menu %}
 <form method="post" action="{% url 'update-current-item' %}">
 <fieldset>
-<div id='action_current_items'>
-<p><i class="icon fa fa-thumb-tack fa-2x" aria-hidden="true" title="{% trans 'Pin an item in order to constrain default searches with this item. By default only your items are displayed. New created and modified items are auto-pin.' %}"></i></p>
-<p>
-<a href='' onclick='return activate_own_search();' class='activate_own_search{% if SHORTCUT_SEARCH == 'all' %} disabled{% endif %}'><i class="icon fa fa-user" aria-hidden="true" title="{% trans 'Search within my items' %}"></i></a>
-<a href='' class='activate_all_search{% if SHORTCUT_SEARCH == 'own' %} disabled{% endif %}' onclick='return activate_all_search();'><i class="icon fa fa-users" aria-hidden="true" title="{% trans 'Search within all items' %}"></i></a>
-</p>
-<p>
-<a href='' onclick='return load_shortcut_menu();' class='disabled'><i class="icon fa fa-2x fa-refresh" aria-hidden="true" title="{% trans 'Refresh menu' %}"></i></a>
-</p>
+<div class="short-menu-buttons btn-group" role="group">
+  <button type="button" class="btn btn-selected" id='short-menu-simple'>{% trans "simple" %}</button>
+  <button type="button" class="btn" id='short-menu-advanced'>{% trans "advanced" %}</button>
 </div>
+<i class="icon fa fa-thumb-tack fa-2x" aria-hidden="true" title="{% trans 'Pin an item in order to constrain default searches with this item. By default only your items are displayed. New created and modified items are auto-pin.' %}"></i>
 <table id='current_items'>
-{% for lbl, model_name, current, widget in menu %}
+{% for lbl, model_name, main_cls, items in current_menu %}
 <tr>
     <td><label for="current_{{model_name}}">{{lbl}}</label></td>
     <td>
-        {{widget|safe}}
+      <select class='{{main_cls}} chosen-select' id='current_{{model_name}}'>
+        <option class='normal' value=''>--</option>
+        {% for val, label, selected, cls in items %}<option{% if cls %} class='{{cls}}'{% endif %} value='{{val}}'{% if selected %} selected="selected"{% endif %}>{% ifequal cls 'basket' %}&#xf291; {% endifequal %}{% ifequal cls 'green' %}&#xf058; {% endifequal %}{% ifequal cls 'orange' %}&#xf06a; {% endifequal %}{% ifequal cls 'red' %}&#xf071; {% endifequal %}{{label}}</option>
+      {% endfor %}</select>
     </td>{% with 'show-'|add:model_name as model_url%}
-    <td><a href='#' onclick='load_current_window("{% url model_url current %}", "{{model_name}}");' class='display_details'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td>
-    <td><span class='disabled pin-action' onclick='$.get("{% url 'unpin' model_name %}", function(){load_shortcut_menu();});' title="{% trans 'Unpin' %}">
+    <td><a href='#' onclick='load_current_window("{% url model_url 0 %}", "{{model_name}}");' class='display_details'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td>
+    <td><span class='pin-action' onclick='$.get("{% url 'unpin' model_name %}", function(){load_shortcut_menu();});' title="{% trans 'Unpin' %}">
             <i class="fa fa-times"></i>
     </span></td>
     {% endwith %}
@@ -30,4 +28,5 @@
 </table>
 </fieldset>
 </form>
+<script type='text/javascript'>var advanced_menu = false;</script>
 {% endif %}