From b0ebbdedaa0805599b97a9d3bbc96c0a5cf2bbac Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 21 Mar 2010 06:04:32 -0400
Subject: [PATCH] Fixed: FS#1124 - Traffic quota on some systems not working
---
interface/web/admin/lib/module.conf.php | 72 +++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 26 deletions(-)
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index b6d4384..0d153bd 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -3,9 +3,9 @@
global $conf;
$module['name'] = 'admin';
-$module['title'] = 'System';
+$module['title'] = 'top_menu_system';
$module['template'] = 'module.tpl.htm';
-$module['startpage'] = 'admin/users_list.php';
+$module['startpage'] = 'admin/server_list.php';
$module['tab_width'] = '60';
@@ -25,7 +25,7 @@
// cleanup
unset($items);
-
+/*
$items[] = array( 'title' => 'Add group',
'target' => 'content',
'link' => 'admin/groups_edit.php');
@@ -42,14 +42,20 @@
// cleanup
unset($items);
+*/
/*
$items[] = array( 'title' => 'Add server',
'target' => 'content',
'link' => 'admin/server_edit.php');
*/
-$items[] = array( 'title' => 'Edit server',
+$items[] = array( 'title' => 'Server Services',
'target' => 'content',
'link' => 'admin/server_list.php');
+
+$items[] = array( 'title' => 'Server Config',
+ 'target' => 'content',
+ 'link' => 'admin/server_config_list.php');
+
/*
$items[] = array( 'title' => 'Add Server IP',
'target' => 'content',
@@ -60,28 +66,23 @@
'link' => 'admin/server_ip_list.php');
-$module['nav'][] = array( 'title' => 'Servers',
+$items[] = array( 'title' => 'Interface Config',
+ 'target' => 'content',
+ 'link' => 'admin/system_config_edit.php?id=1');
+
+$module['nav'][] = array( 'title' => 'System',
'open' => 1,
'items' => $items);
-
-
// cleanup
unset($items);
-$items[] = array( 'title' => 'Add user',
- 'target' => 'content',
- 'link' => 'admin/dbsync_edit.php');
-$items[] = array( 'title' => 'Edit user',
+$items[] = array( 'title' => 'Firewall',
'target' => 'content',
- 'link' => 'admin/dbsync_list.php');
+ 'link' => 'admin/firewall_list.php');
-
-$items[] = array( 'title' => 'Sync. Now',
- 'target' => 'content',
- 'link' => 'admin/dbsync_cron.php');
-$module['nav'][] = array( 'title' => 'DB Sync.',
+$module['nav'][] = array( 'title' => 'Firewall',
'open' => 1,
'items' => $items);
@@ -90,6 +91,25 @@
unset($items);
+$items[] = array( 'title' => 'Repositories',
+ 'target' => 'content',
+ 'link' => 'admin/software_repo_list.php');
+
+$items[] = array( 'title' => 'Packages',
+ 'target' => 'content',
+ 'link' => 'admin/software_package_list.php');
+
+$items[] = array( 'title' => 'Updates',
+ 'target' => 'content',
+ 'link' => 'admin/software_update_list.php');
+
+$module['nav'][] = array( 'title' => 'Software',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// cleanup
+unset($items);
$items[] = array( 'title' => 'Languages',
'target' => 'content',
@@ -99,6 +119,10 @@
'target' => 'content',
'link' => 'admin/language_add.php');
+$items[] = array( 'title' => 'Merge',
+ 'target' => 'content',
+ 'link' => 'admin/language_complete.php');
+
$items[] = array( 'title' => 'Export',
'target' => 'content',
'link' => 'admin/language_export.php');
@@ -112,28 +136,24 @@
'items' => $items);
-// aufr�umen
+// cleanup
unset($items);
-/*
$items[] = array( 'title' => 'Add user',
'target' => 'content',
- 'link' => 'admin/filesync_edit.php');
+ 'link' => 'admin/remote_user_edit.php');
$items[] = array( 'title' => 'Edit user',
'target' => 'content',
- 'link' => 'admin/filesync_list.php');
+ 'link' => 'admin/remote_user_list.php');
-$module['nav'][] = array( 'title' => 'File Sync.',
+$module['nav'][] = array( 'title' => 'Remote Users',
'open' => 1,
'items' => $items);
-
-// aufr�umen
+// cleanup
unset($items);
-*/
-
// Getting the admin options from other modules
$modules = explode(',', $_SESSION['s']['user']['modules']);
--
Gitblit v1.9.1