diff --git a/accounting/__init__.py b/accounting/__init__.py index e69de29..f9b7bed 100644 --- a/accounting/__init__.py +++ b/accounting/__init__.py @@ -0,0 +1,5 @@ +from vpanel2.connector import addUrlNamespace, addNavigation +import urls + +addUrlNamespace('accounting/', 'accounting', urls.urlpatterns) +addNavigation("euro", "Buchhaltung", dropdown = [ {"url": "accounting:journals", "label": "Kontenrahmen"}, {"url": "accounting:reports", "label": "Reports"} ]) diff --git a/crm/__init__.py b/crm/__init__.py index e69de29..a466862 100644 --- a/crm/__init__.py +++ b/crm/__init__.py @@ -0,0 +1,4 @@ +from vpanel2.connector import addUrlNamespace +import urls + +addUrlNamespace('crm/', 'crm', urls.urlpatterns) diff --git a/crm_contacts/__init__.py b/crm_contacts/__init__.py index e69de29..5641203 100644 --- a/crm_contacts/__init__.py +++ b/crm_contacts/__init__.py @@ -0,0 +1,5 @@ +from vpanel2.connector import addUrlNamespace, addNavigation +import crm_contacts.urls + +addUrlNamespace('crm_contacts/', 'crm_contacts', crm_contacts.urls.urlpatterns) +addNavigation('phone-alt', "Kontakte", dropdown = [ {"url": "crm_contacts:start", "label": "Alle"}, {"url": "crm_contacts:start", "label": "Mitglieder"} ]) diff --git a/crm_document/__init__.py b/crm_document/__init__.py index e69de29..eef0b62 100644 --- a/crm_document/__init__.py +++ b/crm_document/__init__.py @@ -0,0 +1,3 @@ +from vpanel2.connector import addNavigation + +addNavigation("paperclip", "Dokumente", url = "dashboard") diff --git a/vpanel2/__init__.py b/vpanel2/__init__.py index e69de29..9647738 100644 --- a/vpanel2/__init__.py +++ b/vpanel2/__init__.py @@ -0,0 +1,5 @@ +from connector import addNavigation + +addNavigation("dashboard", "Dashboard", url = "dashboard") +addNavigation("user", "Benutzer", url = "dashboard") +addNavigation("tags", "Gruppen", url = "dashboard") diff --git a/vpanel2/settings.py b/vpanel2/settings.py index 276da3e..ae6f0c3 100644 --- a/vpanel2/settings.py +++ b/vpanel2/settings.py @@ -95,6 +95,17 @@ # 'django.template.loaders.eggs.Loader', ) +TEMPLATE_CONTEXT_PROCESSORS = ( + "django.contrib.auth.context_processors.auth", + "django.core.context_processors.debug", + "django.core.context_processors.i18n", + "django.core.context_processors.media", + "django.core.context_processors.static", + "django.core.context_processors.tz", + "django.contrib.messages.context_processors.messages", + "vpanel2.connector.NavigationContext", +) + MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', @@ -130,12 +141,12 @@ # 'django.contrib.admindocs', # Needed for the TemplateLoader 'vpanel2', - 'crm', + 'accounting', + 'crm_document', 'crm_contacts', 'crm_member', - 'crm_document', 'crm_accounting', - 'accounting', + 'crm', ) # A sample logging configuration. The only tangible logging diff --git a/vpanel2/templates/vpanel2/base.html b/vpanel2/templates/vpanel2/base.html index 5407bb2..b8d52b6 100644 --- a/vpanel2/templates/vpanel2/base.html +++ b/vpanel2/templates/vpanel2/base.html @@ -10,20 +10,37 @@
+ {% block toolbar %}{% endblock %} {% block content %}{% endblock %}
diff --git a/vpanel2/urls.py b/vpanel2/urls.py index 5c5c933..4056d43 100644 --- a/vpanel2/urls.py +++ b/vpanel2/urls.py @@ -15,7 +15,7 @@ # Uncomment the admin/doc line below to enable admin documentation: # (r'^admin/doc/', include('django.contrib.admindocs.urls')), - url(r'^$', login_required(TemplateView.as_view(template_name = "vpanel2/dashboard.html")), name="home"), + url(r'^$', login_required(TemplateView.as_view(template_name = "vpanel2/dashboard.html")), name="dashboard"), url(r'^admin/', include(admin.site.urls)), url(r'^login/', django.contrib.auth.views.login, {'template_name': "vpanel2/login.html"}, name="userauth_login"),