http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java ---------------------------------------------------------------------- diff --cc client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java index d7dddec,3fef056..e71365f --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/list/ConnConfPropertyListView.java @@@ -18,11 -18,11 +18,13 @@@ */ package org.apache.syncope.client.console.wicket.markup.html.list; ++import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstraptoggle.BootstrapToggle; ++import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstraptoggle.BootstrapToggleConfig; import java.io.Serializable; import java.util.List; --import java.util.Set; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.client.console.commons.Constants; ++import org.apache.syncope.client.console.wicket.markup.html.form.AbstractFieldPanel; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxCheckBoxPanel; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxPasswordFieldPanel; import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPanel; @@@ -30,9 -30,9 +32,15 @@@ import org.apache.syncope.client.consol import org.apache.syncope.client.console.wicket.markup.html.form.MultiFieldPanel; import org.apache.syncope.client.console.wicket.markup.html.form.SpinnerFieldPanel; import org.apache.syncope.common.lib.types.ConnConfProperty; ++import org.apache.wicket.ajax.AjaxRequestTarget; ++import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; ++import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.html.basic.Label; ++import org.apache.wicket.markup.html.form.CheckBox; ++import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.markup.html.form.PasswordTextField; import org.apache.wicket.markup.html.list.ListItem; ++import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@@ -40,7 -40,7 +48,7 @@@ import org.slf4j.Logger import org.slf4j.LoggerFactory; import org.springframework.util.ClassUtils; --public class ConnConfPropertyListView extends AltListView<ConnConfProperty> { ++public class ConnConfPropertyListView extends ListView<ConnConfProperty> { private static final long serialVersionUID = -5239334900329150316L; @@@ -48,13 -48,13 +56,12 @@@ private final boolean withOverridable; -- private final Set<ConnConfProperty> configuration; -- -- public ConnConfPropertyListView(final String id, final IModel<? extends List<ConnConfProperty>> model, -- final boolean withOverridable, final Set<ConnConfProperty> configuration) { ++ public ConnConfPropertyListView( ++ final String id, ++ final IModel<? extends List<ConnConfProperty>> model, ++ final boolean withOverridable) { super(id, model); -- this.configuration = configuration; this.withOverridable = withOverridable; } @@@ -63,13 -63,13 +70,11 @@@ protected void populateItem(final ListItem<ConnConfProperty> item) { final ConnConfProperty property = item.getModelObject(); -- final Label label = new Label("connPropAttrSchema", -- StringUtils.isBlank(property.getSchema().getDisplayName()) -- ? property.getSchema().getName() -- : property.getSchema().getDisplayName()); ++ final Label label = new Label("connPropAttrSchema", StringUtils.isBlank(property.getSchema().getDisplayName()) ++ ? property.getSchema().getName() : property.getSchema().getDisplayName()); item.add(label); -- FieldPanel<? extends Serializable> field; ++ final FieldPanel<? extends Serializable> field; boolean required = false; boolean isArray = false; @@@ -77,8 -77,8 +82,8 @@@ || Constants.GUARDED_STRING.equalsIgnoreCase(property.getSchema().getType()) || Constants.GUARDED_BYTE_ARRAY.equalsIgnoreCase(property.getSchema().getType())) { -- field = new AjaxPasswordFieldPanel("panel", -- label.getDefaultModelObjectAsString(), new Model<String>()); ++ field = new AjaxPasswordFieldPanel( ++ "panel", label.getDefaultModelObjectAsString(), new Model<String>(), false); ((PasswordTextField) field.getField()).setResetPassword(false); required = property.getSchema().isRequired(); @@@ -90,7 -90,7 +95,7 @@@ if (ClassUtils.isPrimitiveOrWrapper(propertySchemaClass)) { propertySchemaClass = org.apache.commons.lang3.ClassUtils.primitiveToWrapper(propertySchemaClass); } -- } catch (Exception e) { ++ } catch (ClassNotFoundException e) { LOG.error("Error parsing attribute type", e); propertySchemaClass = String.class; } @@@ -98,17 -98,17 +103,16 @@@ if (ClassUtils.isAssignable(Number.class, propertySchemaClass)) { @SuppressWarnings("unchecked") final Class<Number> numberClass = (Class<Number>) propertySchemaClass; -- field = new SpinnerFieldPanel<Number>("panel", -- label.getDefaultModelObjectAsString(), numberClass, new Model<Number>(), null, null); ++ field = new SpinnerFieldPanel<Number>( ++ "panel", label.getDefaultModelObjectAsString(), numberClass, new Model<Number>()); required = property.getSchema().isRequired(); } else if (ClassUtils.isAssignable(Boolean.class, propertySchemaClass)) { -- field = new AjaxCheckBoxPanel("panel", -- label.getDefaultModelObjectAsString(), new Model<Boolean>()); ++ field = new AjaxCheckBoxPanel( ++ "panel", label.getDefaultModelObjectAsString(), new Model<Boolean>(), false); } else { -- field = new AjaxTextFieldPanel("panel", -- label.getDefaultModelObjectAsString(), new Model<String>()); -- ++ field = new AjaxTextFieldPanel( ++ "panel", label.getDefaultModelObjectAsString(), new Model<String>(), false); required = property.getSchema().isRequired(); } @@@ -119,29 -119,29 +123,28 @@@ field.setTitle(property.getSchema().getHelpMessage()); -- if (required) { -- field.addRequiredLabel(); -- } -- ++ final AbstractFieldPanel<? extends Serializable> fieldPanel; if (isArray) { -- if (property.getValues().isEmpty()) { -- property.getValues().add(null); -- } -- - final MultiFieldPanel multiFieldPanel = new MultiFieldPanel("panel", "connPropAttrSchema", - final MultiFieldPanel multiFieldPanel = new MultiFieldPanel("panel", -- new PropertyModel<List<String>>(property, "values"), field); ++ final MultiFieldPanel multiFieldPanel = new MultiFieldPanel( ++ "panel", ++ label.getDefaultModelObjectAsString(), ++ new PropertyModel<List<String>>(property, "values"), ++ field, true); item.add(multiFieldPanel); ++ fieldPanel = multiFieldPanel; } else { setNewFieldModel(field, property.getValues()); item.add(field); ++ fieldPanel = field; } -- if (withOverridable) { -- item.add(new AjaxCheckBoxPanel("connPropAttrOverridable", -- "connPropAttrOverridable", new PropertyModel<Boolean>(property, "overridable"))); ++ if (required) { ++ fieldPanel.addRequiredLabel(); } -- configuration.add(property); ++ if (withOverridable) { ++ fieldPanel.showExternAction(addCheckboxToggle(property)); ++ } } @SuppressWarnings({ "unchecked", "rawtypes" }) @@@ -149,4 -149,4 +152,38 @@@ field.setNewModel(values); } ++ private FormComponent<?> addCheckboxToggle(final ConnConfProperty property) { ++ ++ final BootstrapToggleConfig config = new BootstrapToggleConfig(); ++ config ++ .withOnStyle(BootstrapToggleConfig.Style.info).withOffStyle(BootstrapToggleConfig.Style.warning) ++ .withSize(BootstrapToggleConfig.Size.mini) ++ .withOnLabel("Overridable") ++ .withOffLabel("Not Overridable"); ++ ++ return new BootstrapToggle("externalAction", new PropertyModel<Boolean>(property, "overridable"), config) { ++ ++ private static final long serialVersionUID = 1L; ++ ++ @Override ++ protected CheckBox newCheckBox(final String id, final IModel<Boolean> model) { ++ final CheckBox checkBox = super.newCheckBox(id, model); ++ checkBox.add(new AjaxFormComponentUpdatingBehavior("change") { ++ ++ private static final long serialVersionUID = 1L; ++ ++ @Override ++ protected void onUpdate(final AjaxRequestTarget target) { ++ } ++ }); ++ return checkBox; ++ } ++ ++ @Override ++ protected void onComponentTag(final ComponentTag tag) { ++ super.onComponentTag(tag); ++ tag.append("class", "overridable", " "); ++ } ++ }; ++ } }
http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java ---------------------------------------------------------------------- diff --cc client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java index 30a7bbc,30a7bbc..c3729bd --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/provision/ProvisionWizardBuilder.java @@@ -194,12 -194,12 +194,12 @@@ public class ProvisionWizardBuilder ext * Construct. * * @param id The component id -- * @param resourceTO external resource to be updated. ++ * @param resurceTO external resource to be updated. * @param pageRef Caller page reference. */ -- public ProvisionWizardBuilder(final String id, final ResourceTO resourceTO, final PageReference pageRef) { ++ public ProvisionWizardBuilder(final String id, final ResourceTO resurceTO, final PageReference pageRef) { super(id, new ProvisionTO(), pageRef); -- this.resourceTO = resourceTO; ++ this.resourceTO = resurceTO; } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css index b6d4fe5,fcdc8db..dbf377c --- a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css +++ b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css @@@ -212,3 -209,3 +212,9 @@@ div.realms div.summarize .navbar a { height: 55px } ++ ++span.overridable div.checkbox { ++ float: right; ++ margin: 0px; ++ padding: 0px; ++} http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractConnectorConfPanel.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractConnectorConfPanel.html index 0000000,0000000..0a3802f new file mode 100644 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractConnectorConfPanel.html @@@ -1,0 -1,0 +1,38 @@@ ++<!-- ++Licensed to the Apache Software Foundation (ASF) under one ++or more contributor license agreements. See the NOTICE file ++distributed with this work for additional information ++regarding copyright ownership. The ASF licenses this file ++to you under the Apache License, Version 2.0 (the ++"License"); you may not use this file except in compliance ++with the License. You may obtain a copy of the License at ++ ++ http://www.apache.org/licenses/LICENSE-2.0 ++ ++Unless required by applicable law or agreed to in writing, ++software distributed under the License is distributed on an ++"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ++KIND, either express or implied. See the License for the ++specific language governing permissions and limitations ++under the License. ++--> ++<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> ++ <head> ++ <title>Connector configuration panel</title> ++ </head> ++ <body> ++ <wicket:panel> ++ <span wicket:id="connectorPropertiesContainer"> ++ <div class="form-group" wicket:id="connectorProperties"> ++ <span wicket:id="panel">[panel]</span> ++ </div> ++ ++ <div> ++ <a style="position: absolute; top: 25px; right:20px;" wicket:id="check" href="#"> ++ <i class="fa fa-heartbeat fa-2x"></i> ++ </a> ++ </div> ++ </span> ++ </wicket:panel> ++ </body> ++</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractResourceModal.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractResourceModal.html index 0000000,0000000..bd4cd4b new file mode 100644 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractResourceModal.html @@@ -1,0 -1,0 +1,23 @@@ ++<!-- ++Licensed to the Apache Software Foundation (ASF) under one ++or more contributor license agreements. See the NOTICE file ++distributed with this work for additional information ++regarding copyright ownership. The ASF licenses this file ++to you under the Apache License, Version 2.0 (the ++"License"); you may not use this file except in compliance ++with the License. You may obtain a copy of the License at ++ ++ http://www.apache.org/licenses/LICENSE-2.0 ++ ++Unless required by applicable law or agreed to in writing, ++software distributed under the License is distributed on an ++"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ++KIND, either express or implied. See the License for the ++specific language governing permissions and limitations ++under the License. ++--> ++<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> ++ <wicket:extend> ++ <div wicket:id="tabbedPanel"></div> ++ </wicket:extend> ++</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorCapabilitiesPanel.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorCapabilitiesPanel.html index 0000000,0000000..b5aa95d new file mode 100644 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorCapabilitiesPanel.html @@@ -1,0 -1,0 +1,28 @@@ ++<!-- ++Licensed to the Apache Software Foundation (ASF) under one ++or more contributor license agreements. See the NOTICE file ++distributed with this work for additional information ++regarding copyright ownership. The ASF licenses this file ++to you under the Apache License, Version 2.0 (the ++"License"); you may not use this file except in compliance ++with the License. You may obtain a copy of the License at ++ ++ http://www.apache.org/licenses/LICENSE-2.0 ++ ++Unless required by applicable law or agreed to in writing, ++software distributed under the License is distributed on an ++"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ++KIND, either express or implied. See the License for the ++specific language governing permissions and limitations ++under the License. ++--> ++<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> ++ <head> ++ <title>Connector capabilities panel</title> ++ </head> ++ <body> ++ <wicket:panel> ++ <span wicket:id="capabilitiesPalette"/> ++ </wicket:panel> ++ </body> ++</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorDetailsPanel.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorDetailsPanel.html index 0000000,0000000..390176c new file mode 100644 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorDetailsPanel.html @@@ -1,0 -1,0 +1,61 @@@ ++<!-- ++Licensed to the Apache Software Foundation (ASF) under one ++or more contributor license agreements. See the NOTICE file ++distributed with this work for additional information ++regarding copyright ownership. The ASF licenses this file ++to you under the Apache License, Version 2.0 (the ++"License"); you may not use this file except in compliance ++with the License. You may obtain a copy of the License at ++ ++ http://www.apache.org/licenses/LICENSE-2.0 ++ ++Unless required by applicable law or agreed to in writing, ++software distributed under the License is distributed on an ++"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ++KIND, either express or implied. See the License for the ++specific language governing permissions and limitations ++under the License. ++--> ++<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> ++ <head> ++ <title>Connector details panel</title> ++ </head> ++ <body> ++ <wicket:panel> ++ <div class="form-group"> ++ <span wicket:id="displayName">[displayName]</span> ++ </div> ++ ++ <div class="form-group"> ++ <span wicket:id="location">[location]</span> ++ </div> ++ ++ <div class="form-group"> ++ <span wicket:id="connectorName">[connectorName]</span> ++ </div> ++ ++ <div class="form-group"> ++ <span wicket:id="version">[version]</span> ++ </div> ++ ++ <div class="form-group" style="padding: 30px 0px 0px 0px"> ++ <table class="table"> ++ <tbody> ++ <tr> ++ <td><span wicket:id="connRequestTimeout">[connRequestTimeout]</span></td> ++ <td><span wicket:id="poolMaxObjects">[poolMaxObjects]</span></td> ++ </tr> ++ <tr> ++ <td><span wicket:id="poolMinIdle">[poolMinIdle]</span></td> ++ <td><span wicket:id="poolMaxIdle">[poolMaxIdle]</span></td> ++ </tr> ++ <tr> ++ <td><span wicket:id="poolMaxWait">[poolMaxWait]</span></td> ++ <td><span wicket:id="poolMinEvictableIdleTime">[poolMinEvictableIdleTime]</span></td> ++ </tr> ++ </tbody> ++ </table> ++ </div> ++ </wicket:panel> ++ </body> ++</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal.html index 2580a91,a07a8dc..0000000 deleted file mode 100644,100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal.html +++ /dev/null @@@ -1,147 -1,154 +1,0 @@@ --<!-- --Licensed to the Apache Software Foundation (ASF) under one --or more contributor license agreements. See the NOTICE file --distributed with this work for additional information --regarding copyright ownership. The ASF licenses this file --to you under the Apache License, Version 2.0 (the --"License"); you may not use this file except in compliance --with the License. You may obtain a copy of the License at -- -- http://www.apache.org/licenses/LICENSE-2.0 -- --Unless required by applicable law or agreed to in writing, --software distributed under the License is distributed on an --"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --KIND, either express or implied. See the License for the --specific language governing permissions and limitations --under the License. ----> --<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> -- <wicket:extend> - <div class="tabbable tabs-left"> - <ul class="nav nav-tabs"> - <li class="active"><a data-toggle="tab" href="#tabs-1"><span><wicket:message key="tab1"/></span></a></li> - <li><a data-toggle="tab" href="#tabs-2"><span><wicket:message key="tab2"/></span></a></li> - <li><a data-toggle="tab" href="#tabs-3"><span><wicket:message key="tab3"/></span></a></li> - </ul> - <div class="tab-content"> - <div id="tabs-1" class="tab-pane active"> - <div id="formtable"> - <div class="tablerow alt"> - <div class="tablecolumn_label short_dynamicsize"> - <label for="displayName"><wicket:message key="displayName"/></label> - </div> - <div class="tablecolumn_field short_dynamicsize"> - <span wicket:id="displayName">[displayName]</span> - <form wicket:id="form"> - <div class="tabbable tabs-left"> - <ul class="nav nav-tabs"> - <li class="active"><a data-toggle="tab" href="#tabs-1"><span><wicket:message key="tab1"/></span></a></li> - <li><a data-toggle="tab" href="#tabs-2"><span><wicket:message key="tab2"/></span></a></li> - <li><a data-toggle="tab" href="#tabs-3"><span><wicket:message key="tab3"/></span></a></li> - </ul> - <div class="tab-content"> - <div id="tabs-1" class="tab-pane active"> - <div id="formtable"> - <div class="tablerow alt"> - <div class="tablecolumn_label short_dynamicsize"> - <label for="displayName"><wicket:message key="displayName"/></label> - </div> - <div class="tablecolumn_field short_dynamicsize"> - <span wicket:id="displayName">[displayName]</span> - </div> -- </div> - </div> -- - <div class="tablerow"> - <div class="tablecolumn_label short_dynamicsize"> - <label for="location"><wicket:message key="location"/></label> - </div> - <div class="tablecolumn_field short_dynamicsize"> - <span wicket:id="location">[location]</span> - <div class="tablerow"> - <div class="tablecolumn_label short_dynamicsize"> - <label for="location"><wicket:message key="location"/></label> - </div> - <div class="tablecolumn_field short_dynamicsize"> - <span wicket:id="location">[location]</span> - </div> -- </div> - </div> -- - <div class="tablerow alt"> - <div class="tablecolumn_label short_dynamicsize"> - <label for="name"><wicket:message key="name"/></label> - </div> - <div class="tablecolumn_field medium_dynamicsize"> - <span wicket:id="connectorName">[connectorName]</span> - <div class="tablerow alt"> - <div class="tablecolumn_label short_dynamicsize"> - <label for="name"><wicket:message key="name"/></label> - </div> - <div class="tablecolumn_field medium_dynamicsize"> - <span wicket:id="connectorName">[connectorName]</span> - </div> -- </div> - </div> -- - <div class="tablerow"> - <div class="tablecolumn_label short_dynamicsize"> - <label for="version"><wicket:message key="version"/></label> - </div> - <div class="tablecolumn_field short_dynamicsize"> - <span wicket:id="version">[version]</span> - </div> - </div> - </div> - <div style="display: table; border: 1px solid #BBBBBB;"> - <div class="tablerow2 alt"> - <div class="tablecolumn2_label short_dynamicsize"> - <label for="connRequestTimeout"><wicket:message key="connRequestTimeout"/></label> - </div> - <div class="tablecolumn2_field short_dynamicsize"> - <span wicket:id="connRequestTimeout">[connRequestTimeout]</span> - </div> - <div class="tablecolumn2_label short_dynamicsize"> - <label for="poolMaxObjects"><wicket:message key="poolMaxObjects"/></label> - </div> - <div class="tablecolumn2_field short_dynamicsize"> - <span wicket:id="poolMaxObjects">[poolMaxObjects]</span> - </div> - </div> - <div class="tablerow2"> - <div class="tablecolumn2_label short_dynamicsize"> - <label for="poolMinIdle"><wicket:message key="poolMinIdle"/></label> - </div> - <div class="tablecolumn2_field short_dynamicsize"> - <span wicket:id="poolMinIdle">[poolMinIdle]</span> - </div> - <div class="tablecolumn2_label short_dynamicsize"> - <label for="poolMaxIdle"><wicket:message key="poolMaxIdle"/></label> - </div> - <div class="tablecolumn2_field short_dynamicsize"> - <span wicket:id="poolMaxIdle">[poolMaxIdle]</span> - <div class="tablerow"> - <div class="tablecolumn_label short_dynamicsize"> - <label for="version"><wicket:message key="version"/></label> - </div> - <div class="tablecolumn_field short_dynamicsize"> - <span wicket:id="version">[version]</span> - </div> -- </div> -- </div> - <div class="tablerow2 alt"> - <div class="tablecolumn2_label short_dynamicsize"> - <label for="poolMaxWait"><wicket:message key="poolMaxWait"/></label> - </div> - <div class="tablecolumn2_field short_dynamicsize"> - <span wicket:id="poolMaxWait">[poolMaxWait]</span> - <div style="display: table; border: 1px solid #BBBBBB;"> - <div class="tablerow2 alt"> - <div class="tablecolumn2_label short_dynamicsize"> - <label for="connRequestTimeout"><wicket:message key="connRequestTimeout"/></label> - </div> - <div class="tablecolumn2_field short_dynamicsize"> - <span wicket:id="connRequestTimeout">[connRequestTimeout]</span> - </div> - <div class="tablecolumn2_label short_dynamicsize"> - <label for="poolMaxObjects"><wicket:message key="poolMaxObjects"/></label> - </div> - <div class="tablecolumn2_field short_dynamicsize"> - <span wicket:id="poolMaxObjects">[poolMaxObjects]</span> - </div> -- </div> - <div class="tablecolumn2_label short_dynamicsize"> - <label for="poolMinEvictableIdleTime"><wicket:message key="poolMinEvictableIdleTime"/></label> - <div class="tablerow2"> - <div class="tablecolumn2_label short_dynamicsize"> - <label for="poolMinIdle"><wicket:message key="poolMinIdle"/></label> - </div> - <div class="tablecolumn2_field short_dynamicsize"> - <span wicket:id="poolMinIdle">[poolMinIdle]</span> - </div> - <div class="tablecolumn2_label short_dynamicsize"> - <label for="poolMaxIdle"><wicket:message key="poolMaxIdle"/></label> - </div> - <div class="tablecolumn2_field short_dynamicsize"> - <span wicket:id="poolMaxIdle">[poolMaxIdle]</span> - </div> -- </div> - <div class="tablecolumn2_field short_dynamicsize"> - <span wicket:id="poolMinEvictableIdleTime">[poolMinEvictableIdleTime]</span> - <div class="tablerow2 alt"> - <div class="tablecolumn2_label short_dynamicsize"> - <label for="poolMaxWait"><wicket:message key="poolMaxWait"/></label> - </div> - <div class="tablecolumn2_field short_dynamicsize"> - <span wicket:id="poolMaxWait">[poolMaxWait]</span> - </div> - <div class="tablecolumn2_label short_dynamicsize"> - <label for="poolMinEvictableIdleTime"><wicket:message key="poolMinEvictableIdleTime"/></label> - </div> - <div class="tablecolumn2_field short_dynamicsize"> - <span wicket:id="poolMinEvictableIdleTime">[poolMinEvictableIdleTime]</span> - </div> -- </div> -- </div> -- </div> - </div> - <div id="tabs-2" class="tab-pane"> - <div id="formtable"> - <span wicket:id="container"> - <div style="border-bottom: 10px"> - <div style="width: 40px; text-align: center; font-size: 7px"> - <label for="version"><wicket:message key="overridable"/></label> - </div> - </div> - <form wicket:id="connectorPropForm"> - <div class="tablerow connectorProp" wicket:id="connectorProperties"> - <div class="tablecolumn_check" style="width: 27px; text-align: center; margin-right: 10px"> - <span wicket:id="connPropAttrOverridable">[connPropAttrOverridable]</span> - <div id="tabs-2" class="tab-pane"> - <div id="formtable"> - <span wicket:id="container"> - <div style="border-bottom: 10px"> - <div style="width: 40px; text-align: center; font-size: 7px"> - <label for="version"><wicket:message key="overridable"/></label> -- </div> - <div class="tablecolumn_connPropAttr"> - <span wicket:id="connPropAttrSchema">[connPropAttrSchema]</span> - </div> - <form wicket:id="connectorPropForm"> - <div class="tablerow connectorProp" wicket:id="connectorProperties"> - <div class="tablecolumn_check" style="width: 27px; text-align: center; margin-right: 10px"> - <span wicket:id="connPropAttrOverridable">[connPropAttrOverridable]</span> - </div> - <div class="tablecolumn_connPropAttr"> - <span wicket:id="connPropAttrSchema">[connPropAttrSchema]</span> - </div> - <div class="tablecolumn_field veryshort_fixedsize"> - <span wicket:id="panel">[panel]</span> - </div> -- </div> - <div class="tablecolumn_field veryshort_fixedsize"> - <span wicket:id="panel">[panel]</span> - <div> - <a style="position: absolute; top: 2px; right:20px;" wicket:id="check"> - <img src="img/ping.png"width="30" height="30" - alt="ping" title="title" wicket:message="title:check"/> - </a> -- </div> - </div> - <div> - <a style="position: absolute; top: 2px; right:20px;" wicket:id="check"> - <img src="img/ping.png"width="30" height="30" - alt="ping" title="title" wicket:message="title:check"/> - </a> - </div> - </form> - </span> - </form> - </span> - </div> -- </div> - </div> - <div id="tabs-3" class="tab-pane"> - <span wicket:id="capabilitiesPalette"/> - <div id="tabs-3" class="tab-pane"> - <span wicket:id="capabilitiesPalette"/> - </div> -- </div> -- </div> - </div> - - <div class="modal-footer"> - <input type="submit" class="btn btn-primary" wicket:id="apply"/> - <input type="button" class="btn btn-default" wicket:id="cancel"/> - </div> - </form> -- </wicket:extend> --</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal.properties ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal.properties index 8500f1a,8500f1a..69ea457 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal.properties @@@ -14,9 -14,9 +14,10 @@@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. --tab1=General --tab2=Configuration --tab3=Capabilities ++general=General ++configuration=Configuration ++capabilities=Capabilities ++ displayName=Display name bundleName=Bundle name version=Version http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal_it.properties ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal_it.properties index 96080c3,96080c3..16126ba --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal_it.properties @@@ -14,9 -14,9 +14,10 @@@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. --tab1=Generale --tab2=Configurazione --tab3=Capabilities ++general=Generale ++configuration=Configurazione ++capabilities=Capabilities ++ bundleName=Bundle name version=Versione connRequestTimeout=Timeout richiesta (sec) http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal_pt_BR.properties ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal_pt_BR.properties index b688216,b688216..28e5825 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ConnectorModal_pt_BR.properties @@@ -14,9 -14,9 +14,10 @@@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. --tab1=Geral --tab2=Configura\u00e7\u00e3o --tab3=Capacidades ++general=Geral ++configuration=Configura\u00e7\u00e3o ++capabilities=Capacidades ++ displayName=Mostrar Nome bundleName=Nome do Pacote version=Vers\u00e3o http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceConnConfPanel.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceConnConfPanel.html index af71505,af71505..0000000 deleted file mode 100644,100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceConnConfPanel.html +++ /dev/null @@@ -1,40 -1,40 +1,0 @@@ --<!-- --Licensed to the Apache Software Foundation (ASF) under one --or more contributor license agreements. See the NOTICE file --distributed with this work for additional information --regarding copyright ownership. The ASF licenses this file --to you under the Apache License, Version 2.0 (the --"License"); you may not use this file except in compliance --with the License. You may obtain a copy of the License at -- -- http://www.apache.org/licenses/LICENSE-2.0 -- --Unless required by applicable law or agreed to in writing, --software distributed under the License is distributed on an --"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --KIND, either express or implied. See the License for the --specific language governing permissions and limitations --under the License. ----> --<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> -- <wicket:panel> -- <span wicket:id="connectorPropertiesContainer"> -- <div id="formtable"> -- <div class="tablerow" wicket:id="connectorProperties"> -- <div class="tablecolumn_label medium_fixedsize"> -- <span wicket:id="connPropAttrSchema">[connPropAttrSchema]</span> -- </div> -- <div class="tablecolumn_field medium_dynamicsize"> -- <span wicket:id="panel">[connPropAttrValue]</span> -- </div> -- </div> -- </div> -- -- <div> -- <a style="position: absolute; top: 2px; right:20px;" wicket:id="check"> -- <i class="fa fa-heartbeat fa-2x"></i> -- </a> -- </div> -- </span> -- </wicket:panel> --</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html index 942edab,7d518ce..67bbd73 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html @@@ -16,62 -16,110 +16,58 @@@ KIND, either express or implied. See t specific language governing permissions and limitations under the License. --> -<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <wicket:panel> - <div id="formtable"> - <div class="tablerow alt"> - <div class="tablecolumn_label medium_fixedsize"> - <label for="name"><wicket:message key="name"/></label> - </div> - <div class="tablecolumn_field medium_dynamicsize"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> + +<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://xmlns.jcp.org/jsf/composite";> + <head> + <title>Resource details panel</title> + </head> + <body> + <wicket:panel> + + <div wicket:id="container" class="summarize"> + <div class="form-group"> <span wicket:id="name">[name]</span> </div> - </div> - <div class="tablerow"> - <div class="tablecolumn_label medium_fixedsize"> - <label for="connector"><wicket:message key="connector"/></label> - </div> - <div class="tablecolumn_field medium_dynamicsize"> + <div class="form-group"> <span wicket:id="connector">[connector]</span> </div> - </div> - <div class="tablerow alt"> - <div class="tablecolumn_label medium_fixedsize"> - <label for="enforceMandatoryCondition"><wicket:message key="enforceMandatoryCondition"/></label> - </div> - <div class="tablecolumn_field medium_dynamicsize"> + <div class="form-group"> <span wicket:id="enforceMandatoryCondition">[enforceMandatoryCondition]</span> </div> - </div> - <div class="tablerow"> - <div class="tablecolumn_label medium_fixedsize"> - <label for="propagationPrimary"><wicket:message key="propagationPrimary"/></label> - </div> - <div class="tablecolumn_field medium_dynamicsize"> + <div class="form-group"> <span wicket:id="propagationPrimary">[propagationPrimary]</span> </div> - </div> - <div class="tablerow alt"> - <div class="tablecolumn_label medium_fixedsize"> - <label for="propagationPriority"><wicket:message key="propagationPriority"/></label> - </div> - <div class="tablecolumn_field medium_dynamicsize"> + <div class="form-group"> <span wicket:id="propagationPriority">[propagationPriority]</span> </div> - </div> - <div class="tablerow alt"> - <div class="tablecolumn_label medium_fixedsize"> - <label for="randomPwdIfNotProvided"><wicket:message key="randomPwdIfNotProvided"/></label> - </div> - <div class="tablecolumn_field medium_dynamicsize"> + <div class="form-group"> - <span wicket:id="propagationMode">[propagationMode]</span> - </div> - - <div class="form-group"> <span wicket:id="randomPwdIfNotProvided">[randomPwdIfNotProvided]</span> </div> - </div> - <div class="tablerow"> - <div class="tablecolumn_label short_dynamicsize"> - <label for="propagationActionsClassNames"><wicket:message key="actionsClasses"/></label> + <div class="form-group"> + <span wicket:id="actionsClasses">[actionsClasses]</span> </div> - <span wicket:id="propagationActionsClassNames"> - <span wicket:id="actionsClasses"> - <select class="text ui-widget-content ui-corner-all" wicket:id="actionsClass"/> - <a wicket:id="drop"><i class="fa fa-minus"></i></a> - <a wicket:id="add"><i class="fa fa-plus"></i></a> - <br/> - </span> - <a wicket:id="first"><i class="fa fa-plus"></i></a> - </span> - </div> - <div class="tablerow alt"> - <div class="tablecolumn_label medium_fixedsize"> - <label for="createTraceLevel"><wicket:message key="createTraceLevel"/></label> - </div> - <div class="tablecolumn_field medium_dynamicsize"> + <div class="form-group"> <span wicket:id="createTraceLevel">[createTraceLevel]</span> </div> - </div> - <div class="tablerow"> - <div class="tablecolumn_label medium_fixedsize"> - <label for="updateTraceLevel"><wicket:message key="updateTraceLevel"/></label> - </div> - <div class="tablecolumn_field medium_dynamicsize"> + <div class="form-group"> <span wicket:id="updateTraceLevel">[updateTraceLevel]</span> </div> - </div> - <div class="tablerow alt"> - <div class="tablecolumn_label medium_fixedsize"> - <label for="deleteTraceLevel"><wicket:message key="deleteTraceLevel"/></label> - </div> - <div class="tablecolumn_field medium_dynamicsize"> + <div class="form-group"> <span wicket:id="deleteTraceLevel">[deleteTraceLevel]</span> </div> - </div> - <div class="tablerow"> - <div class="tablecolumn_label medium_fixedsize"> - <label for="syncTraceLevel"><wicket:message key="syncTraceLevel"/></label> - </div> - <div class="tablecolumn_field medium_dynamicsize"> + <div class="form-group"> <span wicket:id="syncTraceLevel">[syncTraceLevel]</span> </div> </div> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.html index bd4cd4b,2d4f7b4..0000000 deleted file mode 100644,100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.html +++ /dev/null @@@ -1,23 -1,54 +1,0 @@@ --<!-- --Licensed to the Apache Software Foundation (ASF) under one --or more contributor license agreements. See the NOTICE file --distributed with this work for additional information --regarding copyright ownership. The ASF licenses this file --to you under the Apache License, Version 2.0 (the --"License"); you may not use this file except in compliance --with the License. You may obtain a copy of the License at -- -- http://www.apache.org/licenses/LICENSE-2.0 -- --Unless required by applicable law or agreed to in writing, --software distributed under the License is distributed on an --"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --KIND, either express or implied. See the License for the --specific language governing permissions and limitations --under the License. ----> --<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> -- <wicket:extend> - <div wicket:id="tabbedPanel"></div> - <form wicket:id="form"> - <div class="tabbable tabs-left"> - <ul class="nav nav-tabs"> - <li class="active"><a data-toggle="tab" href="#resource"><span><wicket:message key="resource"/></span></a></li> - <li><a data-toggle="tab" href="#provisions"><span><wicket:message key="provisions"/></span></a></li> - <li><a data-toggle="tab" href="#connectorProperties"><span><wicket:message key="connectorProperties"/></span></a></li> - <li><a data-toggle="tab" href="#security"><span><wicket:message key="security"/></span></a></li> - </ul> - <div class="tab-content"> - <div id="resource" class="tab-pane active"> - <span wicket:id="details">[details]</span> - <span wicket:id="systeminformation">[System Information]</span> - </div> - <div id="provisions" class="tab-pane"> - <span wicket:id="pcontainer"> - <span wicket:id="provisions">[provisions]</span> - </span> - </div> - <div id="connectorProperties" class="tab-pane"> - <span wicket:id="connconf">[connconf]</span> - </div> - <div id="security" class="tab-pane"> - <span wicket:id="security">[security]</span> - </div> - </div> - </div> - - <div class="modal-footer"> - <input type="submit" class="btn btn-primary" wicket:id="apply"/> - <input type="button" class="btn btn-default" wicket:id="cancel"/> - </div> - </form> -- </wicket:extend> --</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.properties ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.properties index 24827a6,24827a6..bad0582 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.properties @@@ -14,11 -14,11 +14,12 @@@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. --resource=Resource details ++general=Resource details provisions=Provisioning --umapping=User mapping connectorProperties=Connector properties security=Security ++ ++umapping=User mapping required_alert=All form fields are required connector=Connector existing_resources=Existing resources http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_it.properties ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_it.properties index 1bc3c04,1bc3c04..02c2b81 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_it.properties @@@ -14,7 -14,7 +14,7 @@@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. --resource=Dettagli Risorsa ++general=Dettagli Risorsa provisions=Provisioning umapping=Mapping utenti connectorProperties=Propriet\u00e0\u00a0 Connettore http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_pt_BR.properties ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_pt_BR.properties index 47f41b2,47f41b2..9d6faa5 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_pt_BR.properties @@@ -14,7 -14,7 +14,7 @@@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. --resource=Detalhes de Recursos ++general=Detalhes de Recursos provisions=Provisioning umapping=Mapeamento de usu\u00e1rios connectorProperties=Propriedades de Conectores http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AbstractFieldPanel.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AbstractFieldPanel.html index 0000000,0000000..b3ee7bc new file mode 100644 --- /dev/null +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AbstractFieldPanel.html @@@ -1,0 -1,0 +1,35 @@@ ++<!-- ++Licensed to the Apache Software Foundation (ASF) under one ++or more contributor license agreements. See the NOTICE file ++distributed with this work for additional information ++regarding copyright ownership. The ASF licenses this file ++to you under the Apache License, Version 2.0 (the ++"License"); you may not use this file except in compliance ++with the License. You may obtain a copy of the License at ++ ++ http://www.apache.org/licenses/LICENSE-2.0 ++ ++Unless required by applicable law or agreed to in writing, ++software distributed under the License is distributed on an ++"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ++KIND, either express or implied. See the License for the ++specific language governing permissions and limitations ++under the License. ++--> ++<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> ++ <wicket:panel> ++ ++ <wicket:fragment wicket:id="requiredFragment"> ++ <span wicket:id="requiredLabel"/> ++ </wicket:fragment> ++ ++ <wicket:fragment wicket:id="externalActionFragment"> ++ <span wicket:id="externalAction"/> ++ </wicket:fragment> ++ ++ <wicket:fragment wicket:id="emptyFragment"> ++ </wicket:fragment> ++ ++ <wicket:child /> ++ </wicket:panel> ++</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxCheckBoxPanel.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxCheckBoxPanel.html index ccb8d5e,fc7596f..17289db --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxCheckBoxPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxCheckBoxPanel.html @@@ -16,18 -16,6 +16,21 @@@ KIND, either express or implied. See t specific language governing permissions and limitations under the License. --> -<wicket:extend> - <input type="checkbox" class="checkbox" wicket:id="checkboxField"/> -</wicket:extend> +<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> + <head> + <title>Ajax checkbox panel</title> + </head> + <body> + <wicket:extend> + <div class="checkbox"> - <label> - <input type="checkbox" wicket:id="checkboxField"> - <label wicket:id="label">[LABEL]</label> ++ <label style="width:100%"> ++ <input type="checkbox" wicket:id="checkboxField" /> ++ <wicket:enclosure child="field-label"> ++ <label wicket:id="field-label">[LABEL]</label><span wicket:id="required"/> ++ <span wicket:id="externalAction"/> ++ </wicket:enclosure> + </label> + </div> + </wicket:extend> + </body> +</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDropDownChoicePanel.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDropDownChoicePanel.html index e1ff5da,12d5bf2..b9af868 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDropDownChoicePanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxDropDownChoicePanel.html @@@ -17,15 -17,8 +17,16 @@@ specific language governing permission under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> + <head> + <title>Drop down choice</title> + </head> <wicket:extend> - <select class="ui-widget-content ui-corner-all medium_dynamicsize" - wicket:id="dropDownChoiceField" /> + <wicket:enclosure child="field-label"> + <label wicket:id="field-label">[LABEL]</label><span wicket:id="required"/> ++ <span wicket:id="externalAction"/> + </wicket:enclosure> + <fieldset class="input-group"> + <select wicket:id="dropDownChoiceField" /> + </fieldset> </wicket:extend> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPasswordFieldPanel.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPasswordFieldPanel.html index eab74ac,eab74ac..2d22038 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPasswordFieldPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPasswordFieldPanel.html @@@ -17,7 -17,7 +17,18 @@@ specific language governing permission under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> -- <wicket:extend> -- <input type="password" class="form-control" wicket:id="passwordField" /> -- </wicket:extend> ++ <head> ++ <title>Ajaxt password field panel</title> ++ </head> ++ <body> ++ <wicket:extend> ++ <wicket:enclosure child="field-label"> ++ <label wicket:id="field-label">[LABEL]</label><span wicket:id="required"/> ++ <span wicket:id="externalAction"/> ++ </wicket:enclosure> ++ <fieldset class="input-group"> ++ <input type="password" class="form-control" wicket:id="passwordField" /> ++ </fieldset> ++ </wicket:extend> ++ </body> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxTextFieldPanel.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxTextFieldPanel.html index f2b0cd3,28d897d..3168f31 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxTextFieldPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/AjaxTextFieldPanel.html @@@ -17,17 -17,10 +17,18 @@@ specific language governing permission under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <wicket:extend> - <div class="form-group"> - <label wicket:id="label">[LABEL]</label><span wicket:id="required"/> - <input type="text" class="form-control" wicket:id="textField"/> - </div> - </wicket:extend> + <head> + <title>Ajaxt text field panel</title> + </head> + <body> + <wicket:extend> + <wicket:enclosure child="field-label"> + <label wicket:id="field-label">[LABEL]</label><span wicket:id="required"/> ++ <span wicket:id="externalAction"/> + </wicket:enclosure> - <fieldset class="form-group input-group"> ++ <fieldset class="input-group"> + <input type="text" class="form-control" wicket:id="textField"/> + </fieldset> + </wicket:extend> + </body> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.html index af85a84,af85a84..653dce8 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.html @@@ -16,10 -16,10 +16,16 @@@ KIND, either express or implied. See t specific language governing permissions and limitations under the License. --> --<html> -- <wicket:panel> -- <div class="form-group"> -- <span wicket:id="checkBoxMultipleChoice" /> -- </div> -- </wicket:panel> ++<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> ++ <head> ++ <title>Checkbox multi-choice field panel</title> ++ </head> ++ <body> ++ <wicket:extend> ++ <div class="form-group"> ++ <span wicket:id="checkBoxMultipleChoice" /> ++ </div> ++ </wicket:extend> ++ </body> </html> ++ http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/FieldPanel.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/FieldPanel.html index 9972280,9972280..0000000 deleted file mode 100644,100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/FieldPanel.html +++ /dev/null @@@ -1,31 -1,31 +1,0 @@@ --<!-- --Licensed to the Apache Software Foundation (ASF) under one --or more contributor license agreements. See the NOTICE file --distributed with this work for additional information --regarding copyright ownership. The ASF licenses this file --to you under the Apache License, Version 2.0 (the --"License"); you may not use this file except in compliance --with the License. You may obtain a copy of the License at -- -- http://www.apache.org/licenses/LICENSE-2.0 -- --Unless required by applicable law or agreed to in writing, --software distributed under the License is distributed on an --"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --KIND, either express or implied. See the License for the --specific language governing permissions and limitations --under the License. ----> --<html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> -- <wicket:panel> -- -- <wicket:fragment wicket:id="requiredFragment"> -- <span wicket:id="requiredLabel"/> -- </wicket:fragment> -- -- <wicket:fragment wicket:id="notRequiredFragment"> -- </wicket:fragment> -- -- <wicket:child /> -- </wicket:panel> --</html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.html index 5a2a02a,e35205c..d1e0a46 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.html @@@ -17,49 -17,19 +17,49 @@@ specific language governing permission under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> - <wicket:panel> - <span wicket:id="multiValueContainer"> - <span wicket:id="view"> - <span wicket:id="panel">[form field]</span> - <a wicket:id="drop"><img src="img/minus-icon.png" alt="remove icon" class="drop_button" /></a> - <span wicket:id="panelPlus">[plus]</span> - <br /> + <head> + <title>Multivalue conatiner</title> + </head> + <body> - <wicket:panel> ++ <wicket:extend> + <wicket:enclosure child="field-label"> - <!--<label wicket:id="field-label">[LABEL]</label><span wicket:id="required"/>--> - <label wicket:id="field-label">[LABEL]</label> ++ <label wicket:id="field-label">[LABEL]</label><span wicket:id="required"/> ++ <span wicket:id="externalAction"/> + </wicket:enclosure> + + <span wicket:id="multiValueContainer"> + <span wicket:id="content">[content]</span> </span> + + <wicket:fragment wicket:id="noDataFragment"> + <div class="input-group"> + <div class="form-control" style="background-color:#EEE"> + <label wicket:id="field-label">[LABEL]</label> + </div> + <span wicket:id="panelPlus">[plus]</span> + </div> + </wicket:fragment> + + <wicket:fragment wicket:id="dataFragment"> + <span wicket:id="view"> + <div class="input-group"> + <span wicket:id="panel">[form field]</span> + <div class="input-group-addon"> + <a wicket:id="drop"><i class="fa fa-minus"></i></a> + </div> + <span wicket:id="panelPlus">[plus]</span> + </div> + </span> + </wicket:fragment> + <wicket:fragment wicket:id="fragmentPlus"> - <a wicket:id="add"><i class="fa fa-plus"></i></a> + <div class="input-group-addon"> + <a wicket:id="add"><i class="fa fa-plus"></i></a> + </div> </wicket:fragment> + <wicket:fragment wicket:id="emptyFragment"> </wicket:fragment> - </wicket:panel> - </span> - </wicket:panel> ++ </wicket:extend> + </body> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/SpinnerFieldPanel.html ---------------------------------------------------------------------- diff --cc client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/SpinnerFieldPanel.html index c9ee0e1,a6f0e51..bc34105 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/SpinnerFieldPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/SpinnerFieldPanel.html @@@ -18,9 -18,12 +18,10 @@@ under the License --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <wicket:extend> - <script type="text/javascript" wicket:id="spinnerFieldJS"> - </script> - <div style="display: inline-table;"> - <div style="display: table-cell;"> - <input wicket:id="spinnerField"/> - </div> - </div> + <wicket:enclosure child="field-label"> + <label wicket:id="field-label">[LABEL]</label><span wicket:id="required"/> ++ <span wicket:id="externalAction"/> + </wicket:enclosure> + <input wicket:id="spinner"/> </wicket:extend> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/b56c08ee/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index c9e38bc,e0b4b184e..b9653a1 --- a/pom.xml +++ b/pom.xml @@@ -377,7 -376,8 +376,7 @@@ under the License <jquery-cookie.version>1.4.1-1</jquery-cookie.version> <bootstrap.version>3.3.5</bootstrap.version> - <bootstrap-select.version>1.7.3</bootstrap-select.version> -- <wicket-bootstrap.version>0.10.3</wicket-bootstrap.version> ++ <wicket-bootstrap.version>0.10.4-SNAPSHOT</wicket-bootstrap.version> <font-awesome.version>4.4.0</font-awesome.version> <ionicons.version>2.0.1</ionicons.version>
