Skip to content

Commit 0b394f2

Browse files
golinskigolinski
authored
Carousel enhancements (#204)
* Colorscheme per slide * Allow overriding carousel properties per slide
1 parent 013c5bc commit 0b394f2

File tree

14 files changed

+618
-32
lines changed

14 files changed

+618
-32
lines changed

‎core/src/main/java/com/themecleanflex/models/CarouselModel.java

Lines changed: 109 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,34 @@
9797
"x-source": "inject",
9898
"x-form-group": "style",
9999
"x-form-label": "Caption Background",
100-
"x-form-type": "materialswitch"
100+
"x-form-type": "materialswitch",
101+
"x-default": "true"
101102
},
102-
"slides": {
103+
"captionalign": {
103104
"type": "string",
104105
"x-source": "inject",
106+
"x-form-group": "style",
107+
"x-form-label": "Caption Alignment",
108+
"x-form-type": "materialradio",
109+
"x-default": "left",
110+
"properties": {
111+
"left": {
112+
"x-form-name": "Left",
113+
"x-form-value": "left"
114+
},
115+
"center": {
116+
"x-form-name": "Center",
117+
"x-form-value": "center"
118+
},
119+
"right": {
120+
"x-form-name": "Right",
121+
"x-form-value": "right"
122+
}
123+
}
124+
},
125+
"slides": {
126+
"x-collection-type": "CarouselSlide",
127+
"x-source": "inject",
105128
"x-form-label": "Slides",
106129
"x-form-fieldLabel": "heading",
107130
"x-form-group": "content",
@@ -131,6 +154,73 @@
131154
}
132155
}
133156
},
157+
"colorscheme": {
158+
"type": "string",
159+
"x-source": "inject",
160+
"x-form-label": "Slide Color Scheme",
161+
"x-form-type": "materialradio",
162+
"x-default": "inherit",
163+
"properties": {
164+
"none": {
165+
"x-form-name": "Inherit",
166+
"x-form-value": "inherit"
167+
},
168+
"light": {
169+
"x-form-name": "Light",
170+
"x-form-value": "light"
171+
},
172+
"dark": {
173+
"x-form-name": "Dark",
174+
"x-form-value": "dark"
175+
}
176+
}
177+
},
178+
"captionbg": {
179+
"type": "string",
180+
"x-source": "inject",
181+
"x-form-label": "Slide Caption Background",
182+
"x-form-type": "materialradio",
183+
"x-default": "inherit",
184+
"properties": {
185+
"none": {
186+
"x-form-name": "Inherit",
187+
"x-form-value": "inherit"
188+
},
189+
"light": {
190+
"x-form-name": "No",
191+
"x-form-value": "false"
192+
},
193+
"dark": {
194+
"x-form-name": "Yes",
195+
"x-form-value": "true"
196+
}
197+
}
198+
},
199+
"captionalign": {
200+
"type": "string",
201+
"x-source": "inject",
202+
"x-form-label": "Slide Caption Alignment",
203+
"x-form-type": "materialradio",
204+
"x-default": "inherit",
205+
"properties": {
206+
"none": {
207+
"x-form-name": "Inherit",
208+
"x-form-value": "inherit"
209+
},
210+
"left": {
211+
"x-form-name": "Left",
212+
"x-form-value": "left"
213+
},
214+
"center": {
215+
"x-form-name": "Center",
216+
"x-form-value": "center"
217+
},
218+
"right": {
219+
"x-form-name": "Right",
220+
"x-form-value": "right"
221+
}
222+
}
223+
},
134224
"slidelink": {
135225
"type": "string",
136226
"x-source": "inject",
@@ -488,13 +578,19 @@ public class CarouselModel extends AbstractComponent {
488578
@Default(values ="true")
489579
private String controls;
490580

491-
/* {"type":"string","x-source":"inject","x-form-group":"style","x-form-label":"Caption Background","x-form-type":"materialswitch"} */
581+
/* {"type":"string","x-source":"inject","x-form-group":"style","x-form-label":"Caption Background","x-form-type":"materialswitch","x-default":"true"} */
492582
@Inject
583+
@Default(values ="true")
493584
private String captionbg;
494585

495-
/* {"type":"string","x-source":"inject","x-form-label":"Slides","x-form-fieldLabel":"heading","x-form-group":"content","x-form-type":"collection","properties":{"imagepath":{"type":"string","x-source":"inject","x-form-label":"Image Source","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/assets"},"imagefit":{"type":"string","x-source":"inject","x-form-label":"Slide Image Fit","x-form-type":"materialradio","x-default":"cover","properties":{"toggle":{"x-form-name":"Contain","x-form-value":"contain"},"accordion":{"x-form-name":"Cover","x-form-value":"cover"}}},"slidelink":{"type":"string","x-source":"inject","x-form-label":"Slide Link","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/pages"},"text":{"type":"string","x-source":"inject","x-form-label":"Image Text","x-form-type":"texteditor"},"alt":{"type":"string","x-source":"inject","x-form-label":"Image Alt Text","x-form-type":"text"}}} */
586+
/* {"type":"string","x-source":"inject","x-form-group":"style","x-form-label":"Caption Alignment","x-form-type":"materialradio","x-default":"left","properties":{"left":{"x-form-name":"Left","x-form-value":"left"},"center":{"x-form-name":"Center","x-form-value":"center"},"right":{"x-form-name":"Right","x-form-value":"right"}}} */
496587
@Inject
497-
private List<IComponent> slides;
588+
@Default(values ="left")
589+
private String captionalign;
590+
591+
/* {"x-collection-type":"CarouselSlide","x-source":"inject","x-form-label":"Slides","x-form-fieldLabel":"heading","x-form-group":"content","x-form-type":"collection","properties":{"imagepath":{"type":"string","x-source":"inject","x-form-label":"Image Source","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/assets"},"imagefit":{"type":"string","x-source":"inject","x-form-label":"Slide Image Fit","x-form-type":"materialradio","x-default":"cover","properties":{"toggle":{"x-form-name":"Contain","x-form-value":"contain"},"accordion":{"x-form-name":"Cover","x-form-value":"cover"}}},"colorscheme":{"type":"string","x-source":"inject","x-form-label":"Slide Color Scheme","x-form-type":"materialradio","x-default":"inherit","properties":{"none":{"x-form-name":"Inherit","x-form-value":"inherit"},"light":{"x-form-name":"Light","x-form-value":"light"},"dark":{"x-form-name":"Dark","x-form-value":"dark"}}},"captionbg":{"type":"string","x-source":"inject","x-form-label":"Slide Caption Background","x-form-type":"materialradio","x-default":"inherit","properties":{"none":{"x-form-name":"Inherit","x-form-value":"inherit"},"light":{"x-form-name":"No","x-form-value":"false"},"dark":{"x-form-name":"Yes","x-form-value":"true"}}},"captionalign":{"type":"string","x-source":"inject","x-form-label":"Slide Caption Alignment","x-form-type":"materialradio","x-default":"inherit","properties":{"none":{"x-form-name":"Inherit","x-form-value":"inherit"},"left":{"x-form-name":"Left","x-form-value":"left"},"center":{"x-form-name":"Center","x-form-value":"center"},"right":{"x-form-name":"Right","x-form-value":"right"}}},"slidelink":{"type":"string","x-source":"inject","x-form-label":"Slide Link","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/pages"},"text":{"type":"string","x-source":"inject","x-form-label":"Image Text","x-form-type":"texteditor"},"alt":{"type":"string","x-source":"inject","x-form-label":"Image Alt Text","x-form-type":"text"}}} */
592+
@Inject
593+
private List<CarouselSlideModel> slides;
498594

499595
/* {"type":"string","x-source":"inject","x-form-label":"Anchor Name","x-form-group":"advanced","x-form-type":"text"} */
500596
@Inject
@@ -637,13 +733,18 @@ public String getControls() {
637733
return controls;
638734
}
639735

640-
/* {"type":"string","x-source":"inject","x-form-group":"style","x-form-label":"Caption Background","x-form-type":"materialswitch"} */
736+
/* {"type":"string","x-source":"inject","x-form-group":"style","x-form-label":"Caption Background","x-form-type":"materialswitch","x-default":"true"} */
641737
public String getCaptionbg() {
642738
return captionbg;
643739
}
644740

645-
/* {"type":"string","x-source":"inject","x-form-label":"Slides","x-form-fieldLabel":"heading","x-form-group":"content","x-form-type":"collection","properties":{"imagepath":{"type":"string","x-source":"inject","x-form-label":"Image Source","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/assets"},"imagefit":{"type":"string","x-source":"inject","x-form-label":"Slide Image Fit","x-form-type":"materialradio","x-default":"cover","properties":{"toggle":{"x-form-name":"Contain","x-form-value":"contain"},"accordion":{"x-form-name":"Cover","x-form-value":"cover"}}},"slidelink":{"type":"string","x-source":"inject","x-form-label":"Slide Link","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/pages"},"text":{"type":"string","x-source":"inject","x-form-label":"Image Text","x-form-type":"texteditor"},"alt":{"type":"string","x-source":"inject","x-form-label":"Image Alt Text","x-form-type":"text"}}} */
646-
public List<IComponent> getSlides() {
741+
/* {"type":"string","x-source":"inject","x-form-group":"style","x-form-label":"Caption Alignment","x-form-type":"materialradio","x-default":"left","properties":{"left":{"x-form-name":"Left","x-form-value":"left"},"center":{"x-form-name":"Center","x-form-value":"center"},"right":{"x-form-name":"Right","x-form-value":"right"}}} */
742+
public String getCaptionalign() {
743+
return captionalign;
744+
}
745+
746+
/* {"x-collection-type":"CarouselSlide","x-source":"inject","x-form-label":"Slides","x-form-fieldLabel":"heading","x-form-group":"content","x-form-type":"collection","properties":{"imagepath":{"type":"string","x-source":"inject","x-form-label":"Image Source","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/assets"},"imagefit":{"type":"string","x-source":"inject","x-form-label":"Slide Image Fit","x-form-type":"materialradio","x-default":"cover","properties":{"toggle":{"x-form-name":"Contain","x-form-value":"contain"},"accordion":{"x-form-name":"Cover","x-form-value":"cover"}}},"colorscheme":{"type":"string","x-source":"inject","x-form-label":"Slide Color Scheme","x-form-type":"materialradio","x-default":"inherit","properties":{"none":{"x-form-name":"Inherit","x-form-value":"inherit"},"light":{"x-form-name":"Light","x-form-value":"light"},"dark":{"x-form-name":"Dark","x-form-value":"dark"}}},"captionbg":{"type":"string","x-source":"inject","x-form-label":"Slide Caption Background","x-form-type":"materialradio","x-default":"inherit","properties":{"none":{"x-form-name":"Inherit","x-form-value":"inherit"},"light":{"x-form-name":"No","x-form-value":"false"},"dark":{"x-form-name":"Yes","x-form-value":"true"}}},"captionalign":{"type":"string","x-source":"inject","x-form-label":"Slide Caption Alignment","x-form-type":"materialradio","x-default":"inherit","properties":{"none":{"x-form-name":"Inherit","x-form-value":"inherit"},"left":{"x-form-name":"Left","x-form-value":"left"},"center":{"x-form-name":"Center","x-form-value":"center"},"right":{"x-form-name":"Right","x-form-value":"right"}}},"slidelink":{"type":"string","x-source":"inject","x-form-label":"Slide Link","x-form-type":"pathbrowser","x-form-browserRoot":"/content/themecleanflex/pages"},"text":{"type":"string","x-source":"inject","x-form-label":"Image Text","x-form-type":"texteditor"},"alt":{"type":"string","x-source":"inject","x-form-label":"Image Alt Text","x-form-type":"text"}}} */
747+
public List<CarouselSlideModel> getSlides() {
647748
return slides;
648749
}
649750

0 commit comments

Comments
 (0)