Skip to content

Commit 5df6059

Browse files
author
cfoe
committed
a lot of minor template fixes
1 parent 53f0483 commit 5df6059

32 files changed

+167
-126
lines changed

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,30 @@
302302
)
303303
);
304304

305+
/* TODO_ BEGIN: Branding
306+
307+
$form["tabs"]['domains'] = array (
308+
'title' => "Branding",
309+
'width' => 70,
310+
'template' => "templates/system_config_branding_edit.htm",
311+
'fields' => array (
312+
##################################
313+
# Begin Datatable fields
314+
##################################
315+
'allow_themechange' => array (
316+
'datatype' => 'VARCHAR',
317+
'formtype' => 'CHECKBOX',
318+
'default' => 'N',
319+
'value' => array(0 => 'n',1 => 'y')
320+
),
321+
##################################
322+
# ENDE Datatable fields
323+
##################################
324+
)
325+
);
326+
327+
328+
END: Branding */
305329
$form["tabs"]['misc'] = array (
306330
'title' => "Misc",
307331
'width' => 70,

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,18 @@ <h2><tmpl_var name="list_head_txt"></h2>
9595
{tmpl_var name='enable_ip_wildcard'}
9696
</div>
9797
</div>
98+
<div class="ctrlHolder">
99+
<p class="label">{tmpl_var name='overtraffic_notify_admin_txt'}</p>
100+
<div class="multiField">
101+
{tmpl_var name='overtraffic_notify_admin'}
102+
</div>
103+
</div>
104+
<div class="ctrlHolder">
105+
<p class="label">{tmpl_var name='overtraffic_notify_client_txt'}</p>
106+
<div class="multiField">
107+
{tmpl_var name='overtraffic_notify_client'}
108+
</div>
109+
</div>
98110
<div class="subsectiontoggle"><span></span>{tmpl_var name='ssl_settings_txt'}<em></em></div>
99111
<div style="display:none;">
100112
<div class="ctrlHolder">

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ <h2><tmpl_var name="list_head_txt"></h2>
1818
<thead>
1919
<tr class="caption">
2020
<th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
21-
<th class="tbl_col_client_pid" scope="col"><tmpl_var name="client_id_txt"></th>
22-
<th class="tbl_col_ip_address" scope="col"><tmpl_var name="name_txt"></th>
21+
<th class="tbl_col_clientname" scope="col"><tmpl_var name="client_id_txt"></th>
22+
<th class="tbl_col_phpname" scope="col"><tmpl_var name="name_txt"></th>
2323
<th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
2424
</tr>
2525
<tr class="filter">
2626
<td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
27-
<td class="tbl_col_client_pid"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
28-
<td class="tbl_col_ip_address"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
27+
<td class="tbl_col_clientname"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
28+
<td class="tbl_col_phpname"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
2929
<td class="tbl_col_buttons">
3030
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_php_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
3131
</td>
@@ -35,8 +35,8 @@ <h2><tmpl_var name="list_head_txt"></h2>
3535
<tmpl_loop name="records">
3636
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
3737
<td class="tbl_col_server_id"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
38-
<td class="tbl_col_client_pid"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
39-
<td class="tbl_col_name"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
38+
<td class="tbl_col_clientname"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
39+
<td class="tbl_col_phpname"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
4040
<td class="tbl_col_buttons">
4141
<a class="button icons16 icoDelete" href="javascript: del_record('admin/server_php_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
4242
</td>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
2222
<th class="tbl_col_package_title" scope="col"><tmpl_var name="package_title_txt"></th>
2323
<th class="tbl_col_package_description" scope="col"><tmpl_var name="package_description_txt"></th>
2424
<th class="tbl_col_package_description" scope="col"><tmpl_var name="package_id_txt"></th>
25-
<th class="tbl_col_buttons" scope="col">&nbsp;</th>
25+
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
2626
</tr>
2727
</thead>
2828
<tbody>
@@ -32,7 +32,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
3232
<td class="tbl_col_package_title">{tmpl_var name="package_title"}</td>
3333
<td class="tbl_col_package_description">{tmpl_var name="package_description"}</td>
3434
<td class="tbl_col_package_description">ispapp{tmpl_var name="package_id"}</td>
35-
<td class="tbl_col_buttons">
35+
<td class="tbl_col_buttons">
3636
<a class="button icons16 icoDelete" href="javascript: del_record('admin/software_package_del.php?software_update_inst_id={tmpl_var name="software_update_inst_id"}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
3737
</td>
3838
</tr>

‎interface/web/client/lib/module.conf.php‎

Lines changed: 54 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,68 @@
11
<?php
22

3-
$module["name"] = "client";
4-
$module["title"] = "top_menu_client";
3+
$module["name"] = "client";
4+
$module["title"] = "top_menu_client";
55
$module["template"] = "module.tpl.htm";
66
$module["startpage"] = "client/client_list.php";
77
$module["tab_width"] = '';
88

9-
/*
10-
Email accounts menu
11-
*/
129

10+
$items[] = array( 'title' => "Edit Client",
11+
'target' => 'content',
12+
'link' => 'client/client_list.php',
13+
'html_id' => 'client_list');
1314

14-
15-
16-
$items[] = array( 'title' => "Edit Client",
17-
'target' => 'content',
18-
'link' => 'client/client_list.php',
19-
'html_id' => 'client_list');
20-
21-
$items[] = array( 'title' => "Add Client",
22-
'target' => 'content',
23-
'link' => 'client/client_edit.php',
24-
'html_id' => 'client_add');
15+
$items[] = array( 'title' => "Add Client",
16+
'target' => 'content',
17+
'link' => 'client/client_edit.php',
18+
'html_id' => 'client_add');
2519

26-
if($_SESSION["s"]["user"]["typ"] == 'admin'){
27-
$items[] = array( 'title' => "Edit Client-Templates",
28-
'target' => 'content',
29-
'link' => 'client/client_template_list.php',
30-
'html_id' => 'client_template_list');
20+
if($_SESSION["s"]["user"]["typ"] == 'admin'){
21+
$items[] = array( 'title' => "Edit Client-Templates",
22+
'target' => 'content',
23+
'link' => 'client/client_template_list.php',
24+
'html_id' => 'client_template_list');
3125
}
3226

33-
$module["nav"][] = array( 'title' => 'Clients',
34-
'open' => 1,
35-
'items' => $items);
27+
$module["nav"][] = array( 'title' => 'Clients',
28+
'open' => 1,
29+
'items' => $items);
3630

3731
unset($items);
3832

3933

4034
if($_SESSION["s"]["user"]["typ"] == 'admin'){
4135

42-
$items[] = array( 'title' => "Edit Reseller",
43-
'target' => 'content',
44-
'link' => 'client/reseller_list.php',
45-
'html_id' => 'reseller_list');
36+
$items[] = array( 'title' => "Edit Reseller",
37+
'target' => 'content',
38+
'link' => 'client/reseller_list.php',
39+
'html_id' => 'reseller_list');
4640

47-
$items[] = array( 'title' => "Add Reseller",
48-
'target' => 'content',
49-
'link' => 'client/reseller_edit.php',
50-
'html_id' => 'reseller_add');
41+
$items[] = array( 'title' => "Add Reseller",
42+
'target' => 'content',
43+
'link' => 'client/reseller_edit.php',
44+
'html_id' => 'reseller_add');
5145

52-
$module["nav"][] = array( 'title' => 'Resellers',
53-
'open' => 1,
54-
'items' => $items);
46+
$module["nav"][] = array( 'title' => 'Resellers',
47+
'open' => 1,
48+
'items' => $items);
5549

5650
unset($items);
5751
}
5852

59-
$items[] = array( 'title' => "Edit Client Circle",
60-
'target' => 'content',
61-
'link' => 'client/client_circle_list.php',
62-
'html_id' => 'client_circle_list');
53+
$items[] = array( 'title' => "Edit Client Circle",
54+
'target' => 'content',
55+
'link' => 'client/client_circle_list.php',
56+
'html_id' => 'client_circle_list');
6357

64-
$items[] = array( 'title' => "Send email",
65-
'target' => 'content',
66-
'link' => 'client/client_message.php',
67-
'html_id' => 'reseller_add');
58+
$items[] = array( 'title' => "Send email",
59+
'target' => 'content',
60+
'link' => 'client/client_message.php',
61+
'html_id' => 'reseller_add');
6862

69-
$module["nav"][] = array( 'title' => 'Messaging',
70-
'open' => 1,
71-
'items' => $items);
63+
$module["nav"][] = array( 'title' => 'Messaging',
64+
'open' => 1,
65+
'items' => $items);
7266

7367
unset($items);
7468

@@ -87,5 +81,18 @@
8781

8882
unset($items);
8983
}
90-
84+
85+
if($_SESSION["s"]["user"]["typ"] == 'admin'){
86+
$items[] = array( 'title' => "Interface Settings",
87+
'target' => 'content',
88+
'link' => 'client/reseller_admin_interface.php',
89+
'html_id' => 'reseller_admin_interface');
90+
91+
92+
$module["nav"][] = array( 'title' => 'Reseller Panel',
93+
'open' => 1,
94+
'items' => $items);
95+
96+
unset($items);
97+
}
9198
?>

‎interface/web/dns/lib/lang/de_dns_wizard.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
$wb['list_head_txt'] = 'DNS-Zonen Assistent';
3+
$wb['list_desc_txt'] = 'Erstelle eine DNS-Zone per Assistent';
24
$wb['dns_zone_txt'] = 'DNS-Zone';
35
$wb['template_id_txt'] = 'Vorlage';
46
$wb['server_id_txt'] = 'Server';

‎interface/web/dns/lib/lang/en_dns_wizard.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?php
2+
$wb['list_head_txt'] = 'DNS Zone Wizard';
3+
$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
24
$wb['dns_zone_txt'] = 'DNS Zone';
35
$wb['template_id_txt'] = 'Template';
46
$wb['server_id_txt'] = 'Server';

‎interface/web/dns/templates/dns_a_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
c<div class="pnl_toolsarea">
1+
<div class="pnl_toolsarea">
22
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
33
<div class="buttons topbuttons">
44
<button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');"><span>A</span></button>

‎interface/web/help/templates/faq_manage_questions_list.htm‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ <h2>{tmpl_var name="faq_faq_questions_txt"}</h2>
1717
<thead>
1818
<tr class="caption">
1919
<th class="tbl_col_active" scope="col">{tmpl_var name="faq_question_txt"}</th>
20-
<th class="tbl_col_active" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
21-
<th class="tbl_col_server_id" scope="col">{tmpl_var name="faq_delete_txt"}</th>
22-
<th class="tbl_col_domain" scope="col">{tmpl_var name="faq_edit_txt"}</th>
20+
<th class="tbl_col_section_name" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
21+
<th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_delete_txt"}</th>
22+
<th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_edit_txt"}</th>
2323
</tr>
2424
</thead>
2525
<tmpl_loop name="records">
26-
<tr>
26+
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
2727
<td>{tmpl_var name='hf_question'}</td>
2828
<td>{tmpl_var name='hf_section'}</td>
2929
<td class="tbl_col_buttons">
3030
<a class="button icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name="faq_delete_txt"}</span></a>
3131
</td>
32-
<td>
33-
<a href="#" onclick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="faq_edit_txt"}</a>
32+
<td class="tbl_col_buttons">
33+
<a class="button icons16 icoEdit" href="javascript: loadContent('help/faq_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name="faq_edit_txt"}</span></a>
3434
</td>
3535
</tr>
3636
</tmpl_loop>

‎interface/web/help/templates/help_faq_sections_list.htm‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ <h2><tmpl_var name="faq_faq_sections_txt"></h2>
1818
<table class="list">
1919
<thead>
2020
<tr class="caption">
21-
<th class="tbl_col_active" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
22-
<th class="tbl_col_server_id" scope="col">{tmpl_var name="faq_delete_txt"}</th>
23-
<th class="tbl_col_domain" scope="col">{tmpl_var name="faq_edit_txt"}</th>
21+
<th class="tbl_col_section_name" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
22+
<th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_delete_txt"}</th>
23+
<th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_edit_txt"}</th>
2424
</tr>
2525
</thead>
2626
<tmpl_loop name="records">
27-
<tr>
28-
<td><b>{tmpl_var name='hfs_name'}</b></td>
29-
<td>
27+
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
28+
<th class="tbl_col_section_name"><b>{tmpl_var name='hfs_name'}</b></td>
29+
<td class="tbl_col_buttons">
3030
<a class="button icons16 icoDelete" href="javascript: del_record('help/faq_sections_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name="faq_delete_txt"}</span></a>
3131
</td>
32-
<td>
33-
<a href="#" onclick="loadContent('help/faq_sections_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="faq_edit_txt"}</a>
32+
<td class="tbl_col_buttons">
33+
<a class="button icons16 icoEdit" href="javascript: loadContent('help/faq_sections_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name="faq_edit_txt"}</span></a>
3434
</td>
3535
</tr>
3636
</tmpl_loop>

0 commit comments

Comments
 (0)