Merge branch 'newstyle'

Conflicts:
	ishtar_common/static/media/style.css

1 files changed, 8 insertions, 3 deletions

diff --git a/ishtar_common/menus.py b/ishtar_common/menus.py
index 465692ec6..6333a4197 100644
--- a/ishtar_common/menus.py
+++ b/ishtar_common/menus.py
@@ -53,17 +53,22 @@ for section_item in __section_items:
 
 class Menu:
     childs = _section_items
-    def __init__(self, user):
+    def __init__(self, user, current_action=None):
         self.user = user
         self.initialized = False
         self.items = {}
+        self.current_action = current_action
+        self.selected_idx = None
 
     def init(self):
         if self.initialized:
             return
         self.items = {}
-        for main_menu in self.childs:
-            main_menu.set_items(self.user, self.items)
+        for idx, main_menu in enumerate(self.childs):
+            selected = main_menu.set_items(self.user, self.items,
+                                           self.current_action)
+            if selected:
+                self.selected_idx = idx
         self.initialized = True
 
 menu = Menu(None)