diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index f5c49fd8d1bee6ce3d4d9868f9a4091580a97958..b4962b7c2fe5b15e0a8ef4a108043c80a90fad79 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -1,120 +1,121 @@
- "Add user",
- 'target' => 'content',
- 'link' => 'admin/users_edit.php');
-
-$items[] = array( 'title' => "Edit user",
- 'target' => 'content',
- 'link' => 'admin/users_list.php');
-
-
-$module["nav"][] = array( 'title' => 'CP Users',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufräumen
-unset($items);
-
-$items[] = array( 'title' => "Add group",
- 'target' => 'content',
- 'link' => 'admin/groups_edit.php');
-
-$items[] = array( 'title' => "Edit group",
- 'target' => 'content',
- 'link' => 'admin/groups_list.php');
-
-
-$module["nav"][] = array( 'title' => 'Groups',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufräumen
-unset($items);
-
-$items[] = array( 'title' => "Add server",
- 'target' => 'content',
- 'link' => 'admin/server_edit.php');
-
-$items[] = array( 'title' => "Edit server",
- 'target' => 'content',
- 'link' => 'admin/server_list.php');
-
-
-$module["nav"][] = array( 'title' => 'Servers',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufräumen
-unset($items);
-
-$items[] = array( 'title' => "Add user",
- 'target' => 'content',
- 'link' => 'admin/dbsync_edit.php');
-
-$items[] = array( 'title' => "Edit user",
- 'target' => 'content',
- 'link' => 'admin/dbsync_list.php');
-
-
-$items[] = array( 'title' => "Sync. Now",
- 'target' => 'content',
- 'link' => 'admin/dbsync_cron.php');
-
-$module["nav"][] = array( 'title' => 'DB Sync.',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufräumen
-unset($items);
-
-$items[] = array( 'title' => "Add user",
- 'target' => 'content',
- 'link' => 'admin/filesync_edit.php');
-
-$items[] = array( 'title' => "Edit user",
- 'target' => 'content',
- 'link' => 'admin/filesync_list.php');
-
-
-$module["nav"][] = array( 'title' => 'File Sync.',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufräumen
-unset($items);
-
-
-
-// Getting the admin options from other modules
-$modules = explode(',',$_SESSION["s"]["user"]["modules"]);
-if(is_array($modules)) {
- foreach($modules as $mt) {
- if(is_file($mt."/lib/admin.conf.php")) {
- $options = array();
- include_once($conf["rootpath"]."/web/".$mt."/lib/admin.conf.php");
- if(is_array($options)) {
- foreach($options as $opt) {
- $module["nav"][] = $opt;
- }
- }
- }
- }
-}
-
-
-
-
+ "Add user",
+ 'target' => 'content',
+ 'link' => 'admin/users_edit.php');
+
+$items[] = array( 'title' => "Edit user",
+ 'target' => 'content',
+ 'link' => 'admin/users_list.php');
+
+
+$module["nav"][] = array( 'title' => 'CP Users',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// aufräumen
+unset($items);
+
+$items[] = array( 'title' => "Add group",
+ 'target' => 'content',
+ 'link' => 'admin/groups_edit.php');
+
+$items[] = array( 'title' => "Edit group",
+ 'target' => 'content',
+ 'link' => 'admin/groups_list.php');
+
+
+$module["nav"][] = array( 'title' => 'Groups',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// aufräumen
+unset($items);
+
+$items[] = array( 'title' => "Add server",
+ 'target' => 'content',
+ 'link' => 'admin/server_edit.php');
+
+$items[] = array( 'title' => "Edit server",
+ 'target' => 'content',
+ 'link' => 'admin/server_list.php');
+
+
+$module["nav"][] = array( 'title' => 'Servers',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// aufräumen
+unset($items);
+
+$items[] = array( 'title' => "Add user",
+ 'target' => 'content',
+ 'link' => 'admin/dbsync_edit.php');
+
+$items[] = array( 'title' => "Edit user",
+ 'target' => 'content',
+ 'link' => 'admin/dbsync_list.php');
+
+
+$items[] = array( 'title' => "Sync. Now",
+ 'target' => 'content',
+ 'link' => 'admin/dbsync_cron.php');
+
+$module["nav"][] = array( 'title' => 'DB Sync.',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// aufräumen
+unset($items);
+
+/*
+$items[] = array( 'title' => "Add user",
+ 'target' => 'content',
+ 'link' => 'admin/filesync_edit.php');
+
+$items[] = array( 'title' => "Edit user",
+ 'target' => 'content',
+ 'link' => 'admin/filesync_list.php');
+
+
+$module["nav"][] = array( 'title' => 'File Sync.',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// aufräumen
+unset($items);
+*/
+
+
+// Getting the admin options from other modules
+$modules = explode(',',$_SESSION["s"]["user"]["modules"]);
+if(is_array($modules)) {
+ foreach($modules as $mt) {
+ if(is_file($mt."/lib/admin.conf.php")) {
+ $options = array();
+ include_once($conf["rootpath"]."/web/".$mt."/lib/admin.conf.php");
+ if(is_array($options)) {
+ foreach($options as $opt) {
+ $module["nav"][] = $opt;
+ }
+ }
+ }
+ }
+}
+
+
+
+
?>
\ No newline at end of file
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 2d20c9d63be2bc7a398d2621a45e7a5a966d873e..491d01054d9634c481f848054479f9810ec93857 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -83,6 +83,50 @@ $form["tabs"]['address'] = array (
'rows' => '',
'cols' => ''
),
+ 'username' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'TEXT',
+ 'default' => '',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'password' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'PASSWORD',
+ 'default' => '',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'language' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => $conf["language"],
+ 'value' => array('en' => 'en'),
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'usertheme' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => 'default',
+ 'value' => array('default' => 'default','grey' => 'grey'),
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
+ ),
'street' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -347,64 +391,6 @@ $form["tabs"]['limits'] = array (
)
);
-$form["tabs"]['login'] = array (
- 'title' => "Login",
- 'width' => 100,
- 'template' => "templates/client_edit_login.htm",
- 'fields' => array (
- ##################################
- # Begin Datatable fields
- ##################################
- 'username' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'default' => '',
- 'value' => '',
- 'separator' => '',
- 'width' => '30',
- 'maxlength' => '255',
- 'rows' => '',
- 'cols' => ''
- ),
- 'password' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'PASSWORD',
- 'default' => '',
- 'value' => '',
- 'separator' => '',
- 'width' => '30',
- 'maxlength' => '255',
- 'rows' => '',
- 'cols' => ''
- ),
- 'language' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => $conf["language"],
- 'value' => array('en' => 'en'),
- 'separator' => '',
- 'width' => '30',
- 'maxlength' => '255',
- 'rows' => '',
- 'cols' => ''
- ),
- 'usertheme' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'SELECT',
- 'default' => 'default',
- 'value' => array('default' => 'default','grey' => 'grey'),
- 'separator' => '',
- 'width' => '30',
- 'maxlength' => '255',
- 'rows' => '',
- 'cols' => ''
- ),
- ##################################
- # END Datatable fields
- ##################################
- ),
-);
-
/*
$form["tabs"]['ipaddress'] = array (
'title' => "IP Addresses",
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index ba19243651ad95f5878ea6644c9cea77c2e2f9e3..0accf4bd9360dbbd0325646ec4817133f06cf010 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -18,7 +18,7 @@ $wb["contact_name_txt"] = 'Contact name';
$wb["street_txt"] = 'Street';
$wb["zip_txt"] = 'ZIP';
$wb["city_txt"] = 'City';
-$wb["state_txt"] = 'state';
+$wb["state_txt"] = 'State';
$wb["country_txt"] = 'Country';
$wb["telephone_txt"] = 'Telephone';
$wb["mobile_txt"] = 'Mobile';
diff --git a/interface/web/client/lib/lang/en_clients_list.lng b/interface/web/client/lib/lang/en_clients_list.lng
index b945582051abed1716443db4d7c4c81b0dc4a88e..be961017ae8f246c3ddfda0e912f2e30ddf45367 100644
--- a/interface/web/client/lib/lang/en_clients_list.lng
+++ b/interface/web/client/lib/lang/en_clients_list.lng
@@ -10,4 +10,5 @@ $wb["page_next_txt"] = 'Next';
$wb["page_back_txt"] = 'Back';
$wb["delete_txt"] = 'Delete';
$wb["filter_txt"] = 'Filter';
+$wb["add_new_record_txt"] = 'Add new client';
?>
\ No newline at end of file
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
deleted file mode 100644
index 80dda0bc0ce8ef844542bfb35f4bc9007c82ae33..0000000000000000000000000000000000000000
--- a/interface/web/client/templates/client_edit_address.htm
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
\ No newline at end of file
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
deleted file mode 100644
index e16eb28c74a8bc4b9742a298d8e6bf572d681f99..0000000000000000000000000000000000000000
--- a/interface/web/client/templates/client_edit_limits.htm
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
\ No newline at end of file
diff --git a/interface/web/client/templates/client_edit_login.htm b/interface/web/client/templates/client_edit_login.htm
deleted file mode 100644
index 4f6d039e0cd00a7f5e21a828cfd0defcf06123d0..0000000000000000000000000000000000000000
--- a/interface/web/client/templates/client_edit_login.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
\ No newline at end of file
diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm
new file mode 100644
index 0000000000000000000000000000000000000000..8404f765c8429aee442f9cc4fb6e4c73099ca3ca
--- /dev/null
+++ b/interface/web/client/templates/clients_list.htm
@@ -0,0 +1,31 @@
+
+
+
\ No newline at end of file
diff --git a/interface/web/designer/lib/module.conf.php b/interface/web/designer/lib/module.conf.php
index 72ffc4a7fc3346fb9dbefeb375929a240082417c..117f79b565da7e41867995327fd68e3aa1b929aa 100644
--- a/interface/web/designer/lib/module.conf.php
+++ b/interface/web/designer/lib/module.conf.php
@@ -28,7 +28,8 @@ $module = array (
),
),
),
- 1 =>
+ /*
+ 1 =>
array (
'title' => 'Formulare',
'open' => '1',
@@ -88,6 +89,7 @@ $module = array (
),
),
),
+ */
),
)
?>
\ No newline at end of file