From 3544bb75545128475750e598f94705727292dda0 Mon Sep 17 00:00:00 2001
From: portnov <portnov@bk.ru>
Date: Thu, 12 Jun 2008 15:32:12 +0600
Subject: [PATCH] Move menu settings to django's settings.py

---
 modules.py      |    9 ++++++---
 modules/menu.py |    5 ++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules.py b/modules.py
index a8ddac6..94b0806 100644
--- a/modules.py
+++ b/modules.py
@@ -8,7 +8,10 @@ def init():
 
 import sys
 import os
-import os.path
+from os.path import dirname,join
+
+sys.path.append(dirname(dirname(dirname(__file__))))
+import settings
 
 from hooks import *
 from themes import *
@@ -16,7 +19,7 @@ from generate import *
 
 MODS_DIR = "modules"
 modules = []
-exports = ['export', 'export_as', 'hook', 'intercept','themeable','theme', 
+exports = ['settings','export', 'export_as', 'hook', 'intercept','themeable','theme', 
            'generates', 'generate', 'Generated']
 
 def export(func):
@@ -43,7 +46,7 @@ def init():
   for w,mod in modules:
     module_load(mod)
 
-for dirpath, dirs, files in os.walk(os.path.join(os.path.dirname(__file__),MODS_DIR)):
+for dirpath, dirs, files in os.walk(join(dirname(__file__),MODS_DIR)):
   for file in files:
     if file[-3:] == ".py":
       name = os.path.join(dirpath,file[:-3])
diff --git a/modules/menu.py b/modules/menu.py
index 86b9a25..09fb21c 100644
--- a/modules/menu.py
+++ b/modules/menu.py
@@ -5,10 +5,9 @@ def init():
   @export
   def menu(request):
     m = []
-    m.append((u'Главная','/'))
     if request.user.is_authenticated():
-      m.append((u'Выход','/logout/'))
+      m = settings.MENU_USER
     else:
-      m.append((u'Вход','/login/'))
+      m = settings.MENU_ANONYMOUS
     L = ["<a href='%s'>%s</a>" % (l,t) for t,l in m]
     return L
-- 
1.7.2.3