Skip to content

Commit be4360f

Browse files
committed
TCDICORE-175 fix color selection
1 parent a46359e commit be4360f

2 files changed

Lines changed: 30 additions & 0 deletions

File tree

forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/BasePage.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
//import de.agilecoders.wicket.core.markup.html.references.RespondJavaScriptReference;
2424
import de.agilecoders.wicket.core.markup.html.themes.bootstrap.BootstrapCssReference;
2525
import de.agilecoders.wicket.core.util.CssClassNames;
26+
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.ColorPickerTextField;
27+
import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.ColorPickerTextFieldCssReference;
2628
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5CssReference;
2729
import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType;
2830
import org.apache.wicket.Application;
@@ -43,6 +45,7 @@
4345
import org.apache.wicket.protocol.http.WebApplication;
4446
import org.apache.wicket.protocol.http.WebSession;
4547
import org.apache.wicket.request.mapper.parameter.PageParameters;
48+
import org.apache.wicket.request.resource.CssResourceReference;
4649
import org.apache.wicket.request.resource.JavaScriptResourceReference;
4750
import org.apache.wicket.request.resource.PackageResourceReference;
4851
import org.apache.wicket.resource.JQueryResourceReference;
@@ -333,6 +336,13 @@ public void renderHead(final IHeaderResponse response) {
333336
response.render(getFavicon());
334337

335338
// Load Styles.
339+
// Add the color picker CSS
340+
response.render(CssHeaderItem.forReference(
341+
new CssResourceReference(
342+
ColorPickerTextFieldCssReference.class,
343+
"css/bootstrap-colorpicker.css"
344+
)
345+
));
336346
response.render(CssHeaderItem.forReference(BootstrapCssReference.instance()));
337347
response.render(CssHeaderItem.forReference(FontAwesome5CssReference.instance()));
338348
response.render(CssHeaderItem.forReference(BaseStyles.INSTANCE));
@@ -342,6 +352,14 @@ public void renderHead(final IHeaderResponse response) {
342352

343353
response.render(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(BaseStyles.class,
344354
"assets/js/fileupload.js")));
355+
356+
// Add the color picker JavaScript
357+
response.render(JavaScriptHeaderItem.forReference(
358+
new JavaScriptResourceReference(
359+
ColorPickerTextFieldCssReference.class,
360+
"js/bootstrap-colorpicker.js"
361+
)
362+
));
345363
}
346364

347365
protected BreadCrumbPanel createBreadcrumbPanel(final String markupId) {

forms/src/main/java/org/devgateway/toolkit/forms/wicket/styles/BaseStyles.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,18 @@ button .btn-home-label {
397397
font-weight: 700;
398398
}
399399

400+
/*-----------------Color picker --------------------*/
401+
.colorpicker-saturation {
402+
background:
403+
linear-gradient(to bottom right, rgba(255, 255, 255, 0), rgba(0, 0, 0, 1)),
404+
linear-gradient(to top right, rgba(255, 255, 255, 0), rgba(255, 255, 255, 1));
405+
}
406+
407+
.colorpicker-hue {
408+
background: linear-gradient(to bottom, #ff0000, #ff00ff, #0000ff, #00ffff, #00ff00, #ffff00, #ff0000);
409+
410+
}
411+
400412
/*Media Queries*/
401413
@media (min-width: 768px) {
402414
.navbar-default{

0 commit comments

Comments
 (0)