From edca9d621a27e4f4f2c8b3963c96faf4348b759e Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Tue, 28 Aug 2012 10:38:09 +0000
Subject: [PATCH] fixed display of addon templates FS#1464
---
interface/web/client/client_edit.php | 4 ++--
interface/web/client/lib/lang/de_client.lng | 1 +
interface/web/client/lib/lang/en_client.lng | 1 +
interface/web/client/templates/client_edit_limits.htm | 9 ++++++++-
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index fd760af139..edb819c412 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -117,8 +117,8 @@ class page_action extends tform_actions {
$text = '';
foreach($tplAdd as $item){
if (trim($item) != ''){
- if ($text != '') $text .= '<br />';
- $text .= $tpl[$item];
+ if ($text != '') $text .= '';
+ $text .= '<li>' . $tpl[$item]. '</li>';
}
}
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index 0dd06f3016..a6425b311a 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -83,6 +83,7 @@ $wb['username_error_regex'] = 'Der Benutzername enthält ungültige Zeichen.';
$wb['password_strength_txt'] = 'Passwortkomplexität';
$wb['template_master_txt'] = 'Mastervorlage';
$wb['template_additional_txt'] = 'Add-Ons';
+$wb["active_template_additional_txt"] = 'Aktive Add-Ons';
$wb['add_additional_template_txt'] = 'Zusätzliches Template hinzufügen';
$wb['delete_additional_template_txt'] = 'Zusätzliches Template löschen';
$wb['ssh_chroot_txt'] = 'SSH-Chroot Optionen';
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index 4f18f9fe6a..adc41c6090 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -94,6 +94,7 @@ $wb["limit_cron_error_frequency"] = 'The cron frequency limit must be a number.'
$wb["username_error_regex"] = 'The Username contains invalid chracaters.';
$wb["template_master_txt"] = 'Master template';
$wb["template_additional_txt"] = 'Addon template';
+$wb["active_template_additional_txt"] = 'Active Addons';
$wb["add_additional_template_txt"] = 'Add additional template';
$wb["delete_additional_template_txt"] = 'Delete additional template';
$wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index 9e12671b11..83928dd7fa 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -28,7 +28,14 @@
<select name="tpl_add_select" id="tpl_add_select" class="selectInput">
{tmpl_var name='tpl_add_select'}
</select>
- <div id="template_additional_list"><br /><br />{tmpl_var name='template_additional_list'}</div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='active_template_additional_txt'}</p>
+ <div id="template_additional_list" class="multiField">
+ <ul>
+ {tmpl_var name='template_additional_list'}
+ </ul>
+ </div>
<input type="hidden" id="template_additional" name="template_additional" value="{tmpl_var name='template_additional'}">
</div>
<div class="ctrlHolder">
--
GitLab