Move menu settings to django's settings.py
Move menu settings to django's settings.py
Conflicts:
modules.py
diff --git a/modules.py b/modules.py
index a842b86..d260e03 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 generate import *
@@ -42,7 +45,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