Skip to content

Commit 01d1b7d

Browse files
authored
Merge pull request #259 from mgusmano/ext-angular-6.7.x
containerfield
2 parents 69a45d3 + bcb5b76 commit 01d1b7d

File tree

5 files changed

+32
-43
lines changed

5 files changed

+32
-43
lines changed

packages/ext-angular-kitchensink/src/app/app.module.ts

-2
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ import {ExporterPluginComponent} from '../examples/PivotGrid/ExporterPlugin/Expo
153153
import {OutlineLayoutComponent} from '../examples/PivotGrid/OutlineLayout/OutlineLayout'
154154
import {PivotGridWidgetsComponent} from '../examples/PivotGrid/PivotGridWidgets/PivotGridWidgets'
155155
import {RangeEditorPluginComponent} from '../examples/PivotGrid/RangeEditorPlugin/RangeEditorPlugin'
156-
import {RowStylingComponent} from '../examples/PivotGrid/RowStyling/RowStyling'
157156
import {TabularLayoutComponent} from '../examples/PivotGrid/TabularLayout/TabularLayout'
158157

159158
import {SimpleDragDropComponent} from "../examples/DragAndDrop/Simple/Simple";
@@ -613,7 +612,6 @@ export const routingModule: ModuleWithProviders = RouterModule.forRoot(routes, {
613612
OutlineLayoutComponent,
614613
PivotGridWidgetsComponent,
615614
RangeEditorPluginComponent,
616-
RowStylingComponent,
617615
TabularLayoutComponent,
618616

619617
SimpleDragDropComponent,
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,35 @@
11
<container padding="10" layout="fit" [fitToParent]="true">
2-
<container [shadow]="true" [top]="top" [left]="left" [width]="width" [height]="height"
3-
[layout]="vbox" [padding]="10"
4-
>
5-
<panel [ui]="'instructions'" [margin]="'0 0 20 0'" [shadow]="true"
6-
[html]="'<b>ContainerField</b> allows you to apply a single label to multiple fields.
2+
3+
<formpanel [shadow]="true" [top]="top" [left]="left" [width]="width" [height]="height"
4+
[layout]="{type: 'vbox', align: 'left'}" [bodyPadding]="10"
5+
[defaults]="{labelAlign: 'left', labelTextAlign: 'right'}">
6+
7+
<container>
8+
<span #extitem>
9+
<b>ContainerField</b> allows you to apply a single label to multiple fields.
710
This is especially useful for groups of checkboxes, radio buttons, and other compound
8-
fields.'"
9-
></panel>
10-
<container padding="10" layout="fit" [fitToParent]="true"><formpanel [layout]="'form'" [shadow]="true" [defaults]="{labelAlign: 'left', labelTextAlign: 'right'}">
11-
<containerfield [label]="'Name'" [layout]="isPhone ? 'vbox' : 'hbox'" [defaults]="{labelAlign: 'bottom'}">
12-
<textfield [label]="'First'"></textfield>
13-
<textfield [label]="'Middle'"></textfield>
14-
<textfield [label]="'Last'"></textfield>
15-
</containerfield>
16-
<containerfield [label]="'Vehicle Class'" [layout]="{type: 'vbox', align: 'left'}" [defaults]="{ margin: '0' }">
17-
<radiofield [boxLabel]="'Compact'" [name]="'priority'"></radiofield>
18-
<radiofield [boxLabel]="'Mid-size'" [name]="'priority'"></radiofield>
19-
<radiofield [boxLabel]="'SUV'" [name]="'priority'"></radiofield>
20-
</containerfield>
21-
<containerfield [label]="'Options'" [layout]="{type: 'vbox', align: 'left'}">
22-
<checkboxfield [boxLabel]="'A/C'"></checkboxfield>
23-
<checkboxfield [boxLabel]="'Leather'"></checkboxfield>
24-
<checkboxfield [boxLabel]="'Nav'"></checkboxfield>
25-
</containerfield>
26-
</formpanel>
27-
</container>
11+
fields.
12+
</span>
13+
</container>
14+
15+
<containerfield [label]="'Name'" [layout]="isPhone ? 'vbox' : 'vbox'" [defaults]="{labelAlign: 'bottom'}">
16+
<textfield [label]="'First'"></textfield>
17+
<textfield [label]="'Middle'"></textfield>
18+
<textfield [label]="'Last'"></textfield>
19+
</containerfield>
20+
21+
<containerfield [label]="'Vehicle Class'" [layout]="{type: 'vbox', align: 'left'}" [defaults]="{ margin: '0' }">
22+
<radiofield [boxLabel]="'Compact'" [name]="'priority'"></radiofield>
23+
<radiofield [boxLabel]="'Mid-size'" [name]="'priority'"></radiofield>
24+
<radiofield [boxLabel]="'SUV'" [name]="'priority'"></radiofield>
25+
</containerfield>
26+
27+
<containerfield [label]="'Options'" [layout]="{type: 'vbox', align: 'left'}">
28+
<checkboxfield [boxLabel]="'A/C'"></checkboxfield>
29+
<checkboxfield [boxLabel]="'Leather'"></checkboxfield>
30+
<checkboxfield [boxLabel]="'Nav'"></checkboxfield>
31+
</containerfield>
32+
33+
</formpanel>
34+
2835
</container>

packages/ext-angular-kitchensink/src/examples/PivotGrid/RowStyling/RowStyling.html

Whitespace-only changes.

packages/ext-angular-kitchensink/src/examples/PivotGrid/RowStyling/RowStyling.ts

-15
This file was deleted.

packages/ext-angular-kitchensink/src/examples/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ import {ExporterPluginComponent} from './PivotGrid/ExporterPlugin/ExporterPlugin
140140
import {OutlineLayoutComponent} from './PivotGrid/OutlineLayout/OutlineLayout'
141141
import {PivotGridWidgetsComponent} from './PivotGrid/PivotGridWidgets/PivotGridWidgets'
142142
import {RangeEditorPluginComponent} from './PivotGrid/RangeEditorPlugin/RangeEditorPlugin'
143-
import {RowStylingComponent} from './PivotGrid/RowStyling/RowStyling'
144143
import {TabularLayoutComponent} from './PivotGrid/TabularLayout/TabularLayout'
145144

146145
import { CarouselComponent } from './Carousel/Carousel';

0 commit comments

Comments
 (0)