Merge branch 'master' into v0.9

3 files changed, 52 insertions, 1 deletions

diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 695edd758..7101ed7de 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -32,6 +32,14 @@
     {% endblock %}
     <script type='text/javascript'>
     var shortcut_url = '{% url "shortcut-menu" %}';
+    var get_file_url = '{% url "get-file-shortcut" %}';
+    var get_operation_url = '{% url "get-operation-shortcut" %}';
+    var get_contextrecord_url = '{% url "get-contextrecord-shortcut" %}';
+    var get_find_url = '{% url "get-find-shortcut" %}';
+    var activate_all_search_url = '{% url "activate-all-search" %}';
+    var activate_own_search_url = '{% url "activate-own-search" %}';
+    var activate_all_search_msg = "{% trans 'Searches in the shortcut menu deals with all items.' %}";
+    var activate_own_search_msg = "{% trans 'Searches in the shortcut menu deals with only your items.' %}";
     </script>
 </head>
 <body{% if current_theme%} id='{{current_theme}}'{%endif%}>
@@ -50,7 +58,7 @@
                 {% csrf_token %}
                 <label for='language_selector'>{% trans "Lang" %}{% trans ":"%} </label>
                 <select name="language" id='language_selector'>
-                    <option value="">-------</option>
+                    <option value="">----------</option>
                 {% for lang in LANGUAGES %}
                     <option value="{{ lang.0 }}"{% ifequal LANGUAGE_CODE lang.0 %} selected='selected'{% endifequal %}>{{ lang.1 }}</option>
                 {% endfor %}
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..581381e82
--- /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' title="{% trans 'Simple menu limited to your own items. Be careful only the last 100 items are displayed.' %}">{% trans "simple" %}</button>
+  <button type="button" class="btn btn-selected" id='short-menu-advanced' title="{% trans 'Advanced menu.' %}">{% 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 c1100ae01..5a0463c30 100644
--- a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
+++ b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
@@ -3,6 +3,10 @@
 {% if current_menu %}
 <form method="post" action="{% url 'update-current-item' %}">
 <fieldset>
+<div class="short-menu-buttons btn-group" role="group">
+  <button type="button" class="btn btn-selected" id='short-menu-simple' title="{% trans 'Simple menu limited to your own items. Be careful only the last 100 items are displayed.' %}">{% trans "simple" %}</button>
+  <button type="button" class="btn" id='short-menu-advanced' title="{% trans 'Advanced menu.' %}">{% 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, main_cls, items in current_menu %}
@@ -24,4 +28,5 @@
 </table>
 </fieldset>
 </form>
+<script type='text/javascript'>var advanced_menu = false;</script>
 {% endif %}