Skip to content

Commit 04699f6

Browse files
author
cfoe
committed
preparation for branding in system config
1 parent 0ded734 commit 04699f6

File tree

2 files changed

+105
-43
lines changed

2 files changed

+105
-43
lines changed

‎interface/web/admin/form/system_config.tform.php‎

Lines changed: 67 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
3434
*/
3535

36-
$form["title"] = "System Config";
37-
$form["description"] = "";
38-
$form["name"] = "system_config";
39-
$form["action"] = "system_config_edit.php";
40-
$form["db_table"] = "sys_ini";
36+
$form["title"] = "System Config";
37+
$form["description"] = "system_config_desc_txt";
38+
$form["name"] = "system_config";
39+
$form["action"] = "system_config_edit.php";
40+
$form["db_table"] = "sys_ini";
4141
$form["db_table_idx"] = "sysini_id";
42-
$form["db_history"] = "yes";
42+
$form["db_history"] = "yes";
4343
$form["tab_default"] = "sites";
4444
$form["list_default"] = "server_list.php";
45-
$form["auth"] = 'yes'; // yes / no
45+
$form["auth"] = 'yes'; // yes / no
4646

4747
$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
4848
$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
@@ -61,10 +61,10 @@
6161
'dbname_prefix' => array (
6262
'datatype' => 'VARCHAR',
6363
'formtype' => 'TEXT',
64-
'validators' => array ( 0 => array ( 'type' => 'REGEX',
65-
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
66-
'errmsg'=> 'dbname_prefix_error_regex'),
67-
),
64+
'validators' => array ( 0 => array ( 'type' => 'REGEX',
65+
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
66+
'errmsg'=> 'dbname_prefix_error_regex'),
67+
),
6868
'default' => '',
6969
'value' => '',
7070
'width' => '30',
@@ -73,10 +73,10 @@
7373
'dbuser_prefix' => array (
7474
'datatype' => 'VARCHAR',
7575
'formtype' => 'TEXT',
76-
'validators' => array ( 0 => array ( 'type' => 'REGEX',
77-
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
78-
'errmsg'=> 'dbuser_prefix_error_regex'),
79-
),
76+
'validators' => array ( 0 => array ( 'type' => 'REGEX',
77+
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
78+
'errmsg'=> 'dbuser_prefix_error_regex'),
79+
),
8080
'default' => '',
8181
'value' => '',
8282
'width' => '30',
@@ -85,10 +85,10 @@
8585
'ftpuser_prefix' => array (
8686
'datatype' => 'VARCHAR',
8787
'formtype' => 'TEXT',
88-
'validators' => array ( 0 => array ( 'type' => 'REGEX',
89-
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
90-
'errmsg'=> 'ftpuser_prefix_error_regex'),
91-
),
88+
'validators' => array ( 0 => array ( 'type' => 'REGEX',
89+
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
90+
'errmsg'=> 'ftpuser_prefix_error_regex'),
91+
),
9292
'default' => '',
9393
'value' => '',
9494
'width' => '30',
@@ -97,10 +97,10 @@
9797
'shelluser_prefix' => array (
9898
'datatype' => 'VARCHAR',
9999
'formtype' => 'TEXT',
100-
'validators' => array ( 0 => array ( 'type' => 'REGEX',
101-
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
102-
'errmsg'=> 'shelluser_prefix_error_regex'),
103-
),
100+
'validators' => array ( 0 => array ( 'type' => 'REGEX',
101+
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
102+
'errmsg'=> 'shelluser_prefix_error_regex'),
103+
),
104104
'default' => '',
105105
'value' => '',
106106
'width' => '30',
@@ -109,10 +109,10 @@
109109
'webdavuser_prefix' => array (
110110
'datatype' => 'VARCHAR',
111111
'formtype' => 'TEXT',
112-
'validators' => array ( 0 => array ( 'type' => 'REGEX',
113-
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
114-
'errmsg'=> 'webdavuser_prefix_error_regex'),
115-
),
112+
'validators' => array ( 0 => array ( 'type' => 'REGEX',
113+
'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
114+
'errmsg'=> 'webdavuser_prefix_error_regex'),
115+
),
116116
'default' => '',
117117
'value' => '',
118118
'width' => '30',
@@ -127,10 +127,10 @@
127127
'phpmyadmin_url' => array (
128128
'datatype' => 'VARCHAR',
129129
'formtype' => 'TEXT',
130-
'validators' => array ( 0 => array ( 'type' => 'REGEX',
131-
'regex' => '/^[0-9a-zA-Z\:\/\-\.\[\]]{0,255}$/',
132-
'errmsg'=> 'phpmyadmin_url_error_regex'),
133-
),
130+
'validators' => array ( 0 => array ( 'type' => 'REGEX',
131+
'regex' => '/^[0-9a-zA-Z\:\/\-\.\[\]]{0,255}$/',
132+
'errmsg'=> 'phpmyadmin_url_error_regex'),
133+
),
134134
'default' => '',
135135
'value' => '',
136136
'width' => '30',
@@ -139,10 +139,10 @@
139139
'webftp_url' => array (
140140
'datatype' => 'VARCHAR',
141141
'formtype' => 'TEXT',
142-
'validators' => array ( 0 => array ( 'type' => 'REGEX',
143-
'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
144-
'errmsg'=> 'webftp_url_error_regex'),
145-
),
142+
'validators' => array ( 0 => array ( 'type' => 'REGEX',
143+
'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
144+
'errmsg'=> 'webftp_url_error_regex'),
145+
),
146146
'default' => '',
147147
'value' => '',
148148
'width' => '30',
@@ -177,10 +177,10 @@
177177
'webmail_url' => array (
178178
'datatype' => 'VARCHAR',
179179
'formtype' => 'TEXT',
180-
'validators' => array ( 0 => array ( 'type' => 'REGEX',
181-
'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
182-
'errmsg'=> 'webmail_url_error_regex'),
183-
),
180+
'validators' => array ( 0 => array ( 'type' => 'REGEX',
181+
'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
182+
'errmsg'=> 'webmail_url_error_regex'),
183+
),
184184
'default' => '',
185185
'value' => '',
186186
'width' => '30',
@@ -195,10 +195,10 @@
195195
'mailmailinglist_url' => array (
196196
'datatype' => 'VARCHAR',
197197
'formtype' => 'TEXT',
198-
'validators' => array ( 0 => array ( 'type' => 'REGEX',
199-
'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
200-
'errmsg'=> 'mailinglist_url_error_regex'),
201-
),
198+
'validators' => array ( 0 => array ( 'type' => 'REGEX',
199+
'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
200+
'errmsg'=> 'mailinglist_url_error_regex'),
201+
),
202202
'default' => '',
203203
'value' => '',
204204
'width' => '30',
@@ -252,6 +252,30 @@
252252
)
253253
);
254254

255+
/* TODO_ BEGIN: Branding
256+
257+
$form["tabs"]['domains'] = array (
258+
'title' => "Branding",
259+
'width' => 70,
260+
'template' => "templates/system_config_branding_edit.htm",
261+
'fields' => array (
262+
##################################
263+
# Begin Datatable fields
264+
##################################
265+
'logo' => array (
266+
'datatype' => 'VARCHAR',
267+
'formtype' => 'TEXT',
268+
'default' => 'themes/default/images/header_logo.png',
269+
'value' => ''
270+
),
271+
##################################
272+
# ENDE Datatable fields
273+
##################################
274+
)
275+
);
276+
277+
278+
END: Branding */
255279
$form["tabs"]['misc'] = array (
256280
'title' => "Misc",
257281
'width' => 70,

‎interface/web/admin/templates/system_config_branding_edit.htm‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<h2><tmpl_var name="list_head_txt"></h2>
2+
<p><tmpl_var name="list_desc_txt"></p>
3+
4+
<div class="panel panel_system_config">
5+
6+
<div class="pnl_formsarea">
7+
<fieldset class="inlineLabels"><legend>Misc</legend>
8+
<div class="ctrlHolder">
9+
<label for="dashboard_atom_url_admin">{tmpl_var name='dashboard_atom_url_admin_txt'}</label>
10+
<input name="dashboard_atom_url_admin" id="dashboard_atom_url_admin" value="{tmpl_var name='dashboard_atom_url_admin'}" size="" maxlength="" type="text" class="textInput" />
11+
</div>
12+
<div class="ctrlHolder">
13+
<label for="dashboard_atom_url_reseller">{tmpl_var name='dashboard_atom_url_reseller_txt'}</label>
14+
<input name="dashboard_atom_url_reseller" id="dashboard_atom_url_reseller" value="{tmpl_var name='dashboard_atom_url_reseller'}" size="" maxlength="" type="text" class="textInput" />
15+
</div>
16+
<div class="ctrlHolder">
17+
<label for="dashboard_atom_url_client">{tmpl_var name='dashboard_atom_url_client_txt'}</label>
18+
<input name="dashboard_atom_url_client" id="dashboard_atom_url_client" value="{tmpl_var name='dashboard_atom_url_client'}" size="" maxlength="" type="text" class="textInput" />
19+
</div>
20+
<div class="ctrlHolder">
21+
<label for="monitor_key">{tmpl_var name='monitor_key_txt'}</label>
22+
<input name="monitor_key" id="monitor_key" value="{tmpl_var name='monitor_key'}" size="" maxlength="" type="text" class="textInput" />
23+
</div>
24+
<div class="ctrlHolder">
25+
<p class="label">{tmpl_var name='maintenance_mode_txt'}</p>
26+
<div class="multiField">
27+
{tmpl_var name='maintenance_mode'}
28+
</div>
29+
</div>
30+
</fieldset>
31+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
32+
<div class="buttonHolder buttons">
33+
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
34+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
35+
</div>
36+
</div>
37+
38+
</div>

0 commit comments

Comments
 (0)