From 01d0affaa188c016ba47031ede49591fd52ed40f Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 14 Dec 2011 09:50:30 -0500
Subject: [PATCH] Pass attributes from skin to form table
---
program/steps/settings/edit_folder.inc | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
index e9566f7..9860c2f 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -236,7 +236,7 @@
// Set form tags and hidden fields
list($form_start, $form_end) = get_form_tags($attrib, 'save-folder', null, $hidden_fields);
- unset($attrib['form']);
+ unset($attrib['form'], $attrib['id']);
// return the complete edit form as table
$out = "$form_start\n";
@@ -246,14 +246,14 @@
if (!empty($tab['fieldsets']) && is_array($tab['fieldsets'])) {
$content = '';
foreach ($tab['fieldsets'] as $fieldset) {
- $subcontent = rcmail_get_form_part($fieldset);
+ $subcontent = rcmail_get_form_part($fieldset, $attrib);
if ($subcontent) {
$content .= html::tag('fieldset', null, html::tag('legend', null, Q($fieldset['name'])) . $subcontent) ."\n";
}
}
}
else {
- $content = rcmail_get_form_part($tab);
+ $content = rcmail_get_form_part($tab, $attrib);
}
if ($content) {
@@ -268,7 +268,7 @@
return $out;
}
-function rcmail_get_form_part($form)
+function rcmail_get_form_part($form, $attrib = array())
{
$content = '';
@@ -278,10 +278,10 @@
$colprop['id'] = '_'.$col;
$label = !empty($colprop['label']) ? $colprop['label'] : rcube_label($col);
- $table->add('title', sprintf('<label for="%s">%s</label>', $colprop['id'], Q($label)));
+ $table->add('title', html::label($colprop['id'], Q($label)));
$table->add(null, $colprop['value']);
}
- $content = $table->show();
+ $content = $table->show($attrib);
}
else {
$content = $form['content'];
--
Gitblit v1.9.1