Shortcut menu: hide/show information saved in the session

5 files changed, 46 insertions, 7 deletions

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index 4c1725308..318c17315 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -38,11 +38,13 @@ function get_previous_table_id(){}
 
 var shortcut_url = '';
 var advanced_menu = false;
+var shortcut_menu_hide = false;
 var activate_all_search_url = '/activate-all-search/';
 var activate_own_search_url = '/activate-own-search/';
 var activate_advanced_url = '/activate-advanced-menu/';
 var activate_simple_url = '/activate-simple-menu/';
-
+var shortcut_menu_hide_url = '/hide-shortcut-menu/'
+var shortcut_menu_show_url = '/show-shortcut-menu/'
 
 function init_shortcut_menu(html){
     $("#progress").hide();
@@ -68,13 +70,21 @@ function init_shortcut_menu(html){
         $('#shortcut-menu table').hide();
         $(".short-menu-close").hide();
         $(".short-menu-open").show();
+        $.get(shortcut_menu_hide_url);
     });
     $(".short-menu-open").click(function(){
         $('#shortcut-menu div').show();
         $('#shortcut-menu table').show();
         $(".short-menu-open").hide();
         $(".short-menu-close").show();
+        $.get(shortcut_menu_show_url);
     });
+    if (shortcut_menu_hide){
+        $('#shortcut-menu div').hide();
+        $('#shortcut-menu table').hide();
+        $(".short-menu-close").hide();
+        $(".short-menu-open").show();
+    }
 }
 
 function init_shortcut_fields(){
diff --git a/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html
index 1758bcf54..5cea8b5a7 100644
--- a/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html
+++ b/ishtar_common/templates/ishtar/blocks/advanced_shortcut_menu.html
@@ -42,5 +42,9 @@
 </table>
 </fieldset>
 </form>
-<script type='text/javascript'>var advanced_menu = true;</script>
+<script type='text/javascript'>
+var advanced_menu = true;
+{% if SHORTCUT_SHOW == 'off' %}var shortcut_menu_hide = true;
+{% else %}var shortcut_menu_hide = false;{% endif %}
+</script>
 {% endif %}
diff --git a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
index 5973eba3f..c03cb3806 100644
--- a/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
+++ b/ishtar_common/templates/ishtar/blocks/shortcut_menu.html
@@ -38,5 +38,8 @@
 </div>
 </fieldset>
 </form>
-<script type='text/javascript'>var advanced_menu = false;</script>
+<script type='text/javascript'>var advanced_menu = false;
+{% if SHORTCUT_SHOW == 'off' %}var shortcut_menu_hide = true;
+{% else %}var shortcut_menu_hide = false;{% endif %}
+</script>
 {% endif %}
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index 98bd55106..5abec4215 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -206,6 +206,10 @@ urlpatterns += patterns(
         name='activate-advanced-menu'),
     url(r'activate-simple-menu/$', 'activate_simple_shortcut_menu',
         name='activate-simple-menu'),
+    url(r'hide-shortcut-menu/$', 'hide_shortcut_menu',
+        name='hide-shortcut-menu'),
+    url(r'show-shortcut-menu/$', 'show_shortcut_menu',
+        name='show-shortcut-menu'),
     url(r'(?P<action_slug>' + actions + r')/$', 'action', name='action'),
 )
 
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 22591164f..c99e78b9c 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -208,6 +208,16 @@ def get_autocomplete_generic(model, extra={'available': True}):
     return func
 
 
+def hide_shortcut_menu(request):
+    request.session['SHORTCUT_SHOW'] = 'off'
+    return HttpResponse('OK', mimetype='text/plain')
+
+
+def show_shortcut_menu(request):
+    request.session['SHORTCUT_SHOW'] = 'on'
+    return HttpResponse('OK', mimetype='text/plain')
+
+
 def activate_all_search(request):
     request.session['SHORTCUT_SEARCH'] = 'all'
     return HttpResponse('OK', mimetype='text/plain')
@@ -249,9 +259,13 @@ def shortcut_menu(request):
         CURRENT_ITEMS.append((_(u"Treatment"), Treatment))
     if hasattr(request.user, 'ishtaruser') and \
             request.user.ishtaruser.advanced_shortcut_menu:
-        dct = {'current_menu': [], 'menu': [],
-               'SHORTCUT_SEARCH': request.session['SHORTCUT_SEARCH']
-               if 'SHORTCUT_SEARCH' in request.session else 'own'}
+        dct = {
+            'current_menu': [], 'menu': [],
+            'SHORTCUT_SEARCH': request.session['SHORTCUT_SEARCH']
+            if 'SHORTCUT_SEARCH' in request.session else 'own',
+            'SHORTCUT_SHOW': request.session['SHORTCUT_SHOW']
+            if 'SHORTCUT_SHOW' in request.session else 'on'
+        }
 
         for lbl, model in CURRENT_ITEMS:
             model_name = model.SLUG
@@ -267,7 +281,11 @@ def shortcut_menu(request):
         return render_to_response(
             'ishtar/blocks/advanced_shortcut_menu.html',
             dct, context_instance=RequestContext(request))
-    dct = {'current_menu': []}
+    dct = {
+        'current_menu': [],
+        'SHORTCUT_SHOW': request.session['SHORTCUT_SHOW']
+        if 'SHORTCUT_SHOW' in request.session else 'off'
+    }
     current_selected_item = {}
     for lbl, model in CURRENT_ITEMS:
         new_selected_item = None