Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar

Conflicts:
	archaeological_operations/templates/ishtar/sheet_operation.html

1 files changed, 12 insertions, 3 deletions

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index b5f4f1a79..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(){
@@ -213,9 +223,8 @@ $(document).on("click", '.check-all', function(){
         ).attr('checked', $(this).is(':checked'));
 });
 
-$(document).on("click", '#main_menu ul li', function(){
+$(document).on("click", '#main_menu > ul > li', function(){
     var current_id = $(this).attr('id');
-    console.log(current_id);
     $("#main_menu ul ul").not($(this).parents('ul')).not($(this).find('ul')
                         ).hide('slow');
     $(this).find('ul').show('slow');