From 4e44dd7a82f27b7d5a9825773783987762e5a9e6 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Sun, 20 May 2007 15:00:32 +0000 Subject: [PATCH] changed client form --- interface/web/admin/lib/module.conf.php | 239 +++++++++--------- interface/web/client/form/client.tform.php | 102 ++++---- interface/web/client/lib/lang/en_client.lng | 2 +- .../web/client/lib/lang/en_clients_list.lng | 1 + .../client/templates/client_edit_address.htm | 68 ----- .../client/templates/client_edit_limits.htm | 44 ---- .../client/templates/client_edit_login.htm | 36 --- .../web/client/templates/clients_list.htm | 31 +++ interface/web/designer/lib/module.conf.php | 4 +- 9 files changed, 200 insertions(+), 327 deletions(-) delete mode 100644 interface/web/client/templates/client_edit_address.htm delete mode 100644 interface/web/client/templates/client_edit_limits.htm delete mode 100644 interface/web/client/templates/client_edit_login.htm create mode 100644 interface/web/client/templates/clients_list.htm diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php index f5c49fd8d..b4962b7c2 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 2d20c9d63..491d01054 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 ba1924365..0accf4bd9 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 b94558205..be961017a 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 80dda0bc0..000000000 --- a/interface/web/client/templates/client_edit_address.htm +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{tmpl_var name='company_name_txt'}:
{tmpl_var name='contact_name_txt'}:
{tmpl_var name='street_txt'}:
{tmpl_var name='zip_txt'}:
{tmpl_var name='city_txt'}:
{tmpl_var name='state_txt'}:
{tmpl_var name='country_txt'}:
{tmpl_var name='telephone_txt'}:
{tmpl_var name='mobile_txt'}:
{tmpl_var name='fax_txt'}:
{tmpl_var name='email_txt'}:
{tmpl_var name='internet_txt'}:
{tmpl_var name='icq_txt'}:
{tmpl_var name='notes_txt'}:
  
 
  -
-
- \ 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 e16eb28c7..000000000 --- a/interface/web/client/templates/client_edit_limits.htm +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{tmpl_var name='limit_maildomain_txt'}:
{tmpl_var name='limit_mailbox_txt'}:
{tmpl_var name='limit_mailalias_txt'}:
{tmpl_var name='limit_mailcatchall_txt'}:
{tmpl_var name='limit_mailrouting_txt'}:
{tmpl_var name='limit_mailfilter_txt'}:
{tmpl_var name='limit_fetchmail_txt'}:
{tmpl_var name='limit_mailquota_txt'}:
  
 
  -
-
- \ 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 4f6d039e0..000000000 --- a/interface/web/client/templates/client_edit_login.htm +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - -
{tmpl_var name='username_txt'}:
{tmpl_var name='password_txt'}:
{tmpl_var name='language_txt'}: - -
{tmpl_var name='usertheme_txt'}: - -
  
 
  -
-
- \ 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 000000000..8404f765c --- /dev/null +++ b/interface/web/client/templates/clients_list.htm @@ -0,0 +1,31 @@ +

+


+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
{tmpl_var name="company_name"}{tmpl_var name="contact_name"}{tmpl_var name="city"}{tmpl_var name="country"}[{tmpl_var name='delete_txt'}]
\ 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 72ffc4a7f..117f79b56 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 -- GitLab