From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/client/lib/module.conf.php | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/interface/web/client/lib/module.conf.php b/interface/web/client/lib/module.conf.php
index bfb6ac8..7d6f1b3 100644
--- a/interface/web/client/lib/module.conf.php
+++ b/interface/web/client/lib/module.conf.php
@@ -5,6 +5,7 @@
$module["template"] = "module.tpl.htm";
$module["startpage"] = "client/client_list.php";
$module["tab_width"] = '';
+$module['order'] = '20';
$items[] = array( 'title' => "Edit Client",
@@ -16,13 +17,6 @@
'target' => 'content',
'link' => 'client/client_edit.php',
'html_id' => 'client_add');
-
-if($_SESSION["s"]["user"]["typ"] == 'admin'){
- $items[] = array( 'title' => "Edit Client-Templates",
- 'target' => 'content',
- 'link' => 'client/client_template_list.php',
- 'html_id' => 'client_template_list');
-}
$module["nav"][] = array( 'title' => 'Clients',
'open' => 1,
@@ -66,6 +60,24 @@
unset($items);
+
+$items[] = array( 'title' => "Limit-Templates",
+ 'target' => 'content',
+ 'link' => 'client/client_template_list.php',
+ 'html_id' => 'client_template_list');
+
+$items[] = array( 'title' => "Email-Templates",
+ 'target' => 'content',
+ 'link' => 'client/message_template_list.php',
+ 'html_id' => 'message_template_list');
+
+$module["nav"][] = array( 'title' => 'Templates',
+ 'open' => 1,
+ 'items' => $items);
+
+unset($items);
+
+
$app->uses('ini_parser,getconf');
$settings = $app->getconf->get_global_config('domains');
--
Gitblit v1.9.1