Skip to content

Commit 1b2b076

Browse files
committed
Releasing 1.0.15
2 parents 4dac6a4 + ed266a7 commit 1b2b076

3 files changed

Lines changed: 45 additions & 0 deletions

File tree

css/bootstrap.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,3 +200,15 @@ input.plain-checkbox {
200200
.simple-collapsible [data-toggle="collapse"][aria-expanded="true"]::before {
201201
content: "\f0d7";
202202
}
203+
204+
.fieldset {
205+
box-shadow: 0 0 0.3em;
206+
border-radius: 0.3em;
207+
padding: 0.01em 1em 0.5em 1em;
208+
margin-bottom: 1em;
209+
}
210+
211+
.form-help {
212+
margin-left: 15px;
213+
}
214+

src/WebApp/BootstrapTheme/GridFormRenderer.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,22 @@ public function render() {
3838
}
3939

4040
public function renderFieldSets() {
41+
$rc = '';
42+
43+
// Construct the components
44+
foreach ($this->component->getFieldSets() AS $fieldSet) {
45+
if ($fieldSet->isVisible()) {
46+
$rc .= '<div id="'.$fieldSet->getId().'" class="fieldset grid-fieldset">';
47+
$heading = new \WebApp\Component\Heading(NULL, 3, $fieldSet->getLabel());
48+
$rc .= $this->theme->renderComponent($heading);
49+
// Add the children
50+
$rc .= $this->renderFormChildren($fieldSet->getChildren());
51+
$rc .= '</div>';
52+
}
53+
}
54+
return $rc;
55+
56+
/*
4157
// Construct the components
4258
$tabSet = new \WebApp\Component\TabSet(NULL, $this->component->getId().'fieldsets');
4359
$tabSet->addClass('tabbed-fieldsets');
@@ -50,6 +66,7 @@ public function renderFieldSets() {
5066
5167
// Render them
5268
return $this->theme->renderComponent($tabSet);
69+
*/
5370
}
5471

5572
public function renderFormChildren($children) {

src/WebApp/BootstrapTheme/HorizontalFormRenderer.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,22 @@ public function render() {
4242
}
4343

4444
public function renderFieldSets() {
45+
$rc = '';
46+
4547
// Construct the components
48+
foreach ($this->component->getFieldSets() AS $fieldSet) {
49+
if ($fieldSet->isVisible()) {
50+
$rc .= '<div id="'.$fieldSet->getId().'" class="fieldset horizontal-fieldset">';
51+
$heading = new \WebApp\Component\Heading(NULL, 3, $fieldSet->getLabel());
52+
$rc .= $this->theme->renderComponent($heading);
53+
// Add the children
54+
$rc .= $this->renderFormChildren($fieldSet->getChildren());
55+
$rc .= '</div>';
56+
}
57+
}
58+
return $rc;
59+
60+
/*
4661
$tabSet = new \WebApp\Component\TabSet(NULL, $this->component->getId().'fieldsets');
4762
$tabSet->addClass('tabbed-fieldsets');
4863
$tabSet->setAria('role', 'fieldsets');
@@ -56,6 +71,7 @@ public function renderFieldSets() {
5671
5772
// Render them
5873
return $this->theme->renderComponent($tabSet);
74+
*/
5975
}
6076

6177
public function renderFormChildren($children) {

0 commit comments

Comments
 (0)