[SYNCOPE-156] removed bootstrap-select dependency
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6f679403 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6f679403 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6f679403 Branch: refs/heads/master Commit: 6f67940385ee969cbef7bd360d385badbc3c055f Parents: 1ab8914 Author: fmartelli <[email protected]> Authored: Wed Sep 23 17:41:27 2015 +0200 Committer: fmartelli <[email protected]> Committed: Wed Sep 23 17:41:27 2015 +0200 ---------------------------------------------------------------------- client/console/pom.xml | 4 -- .../console/panels/ResourceDetailsPanel.java | 2 +- .../markup/html/form/MultiFieldPanel.java | 11 +--- .../META-INF/resources/css/syncopeConsole.css | 4 +- .../client/console/pages/BaseModalPage.html | 1 - .../syncope/client/console/pages/BasePage.html | 3 - .../syncope/client/console/pages/Login.html | 1 - .../console/pages/MustChangePassword.html | 2 - .../console/panels/ResourceDetailsPanel.html | 59 ++++++++++++++++---- .../markup/html/form/MultiFieldPanel.html | 5 +- pom.xml | 6 -- 11 files changed, 54 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/6f679403/client/console/pom.xml ---------------------------------------------------------------------- diff --git a/client/console/pom.xml b/client/console/pom.xml index 18f9a91..759ba78 100644 --- a/client/console/pom.xml +++ b/client/console/pom.xml @@ -104,10 +104,6 @@ under the License. </dependency> <dependency> <groupId>org.webjars</groupId> - <artifactId>bootstrap-select</artifactId> - </dependency> - <dependency> - <groupId>org.webjars</groupId> <artifactId>ionicons</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/syncope/blob/6f679403/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java index ba5388d..40789c7 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java @@ -117,7 +117,7 @@ public class ResourceDetailsPanel extends Panel { "actionsClasses", "actionsClasses", new PropertyModel<List<String>>(resourceTO, "propagationActionsClassNames"), - template); + template, true); container.add(actions); http://git-wip-us.apache.org/repos/asf/syncope/blob/6f679403/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java index ccffd20..b6c2d4f 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.java @@ -72,7 +72,7 @@ public class MultiFieldPanel<E extends Serializable> extends AbstractFieldPanel< // ----------------------- if (model.getObject().isEmpty()) { - container.add(getNoDataFragment(model, name)); + container.addOrReplace(getNoDataFragment(model, name)); } else { container.addOrReplace(getDataFragment(model, name)); } @@ -109,15 +109,6 @@ public class MultiFieldPanel<E extends Serializable> extends AbstractFieldPanel< }); } - fieldPanel.getField().add(new AjaxFormComponentUpdatingBehavior(Constants.ON_BLUR) { - - private static final long serialVersionUID = -1107858522700306810L; - - @Override - protected void onUpdate(final AjaxRequestTarget target) { - } - }); - fieldPanel.setNewModel(item); item.add(fieldPanel.hideLabel().setRenderBodyOnly(true)); http://git-wip-us.apache.org/repos/asf/syncope/blob/6f679403/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css index 039f845..b6d4fe5 100644 --- a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css +++ b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css @@ -190,11 +190,11 @@ div.basepage-content{ margin-top: 55px; } -.modal-content { +.tab-content { max-height: 600px; - max-width: 1240px; overflow-x: hidden; overflow-y: auto; + padding: 20px 20px 5px 20px; } .modal-open .modal { http://git-wip-us.apache.org/repos/asf/syncope/blob/6f679403/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage.html index 242eb6a..8f4527c 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BaseModalPage.html @@ -20,7 +20,6 @@ under the License. <head> <title></title> - <link href="webjars/bootstrap-select/${bootstrap-select.version}/css/bootstrap-select.min.css" rel="stylesheet" type="text/css" /> <link href="webjars/font-awesome/${font-awesome.version}/css/font-awesome.min.css" rel="stylesheet" type="text/css" /> <link href="webjars/ionicons/${ionicons.version}/css/ionicons.min.css" rel="stylesheet" type="text/css" /> http://git-wip-us.apache.org/repos/asf/syncope/blob/6f679403/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html index 189b139..790c201 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage.html @@ -25,7 +25,6 @@ under the License. <title>Apache Syncope</title> <link rel="shortcut icon" href="img/favicon.png" type="image/png"/> - <link href="webjars/bootstrap-select/${bootstrap-select.version}/css/bootstrap-select.min.css" rel="stylesheet" type="text/css" /> <link href="webjars/font-awesome/${font-awesome.version}/css/font-awesome.min.css" rel="stylesheet" type="text/css" /> <link href="webjars/ionicons/${ionicons.version}/css/ionicons.min.css" rel="stylesheet" type="text/css" /> @@ -34,8 +33,6 @@ under the License. <link href="css/syncopeConsole.css" rel="stylesheet" type="text/css" /> <link href="css/fieldstyle.css" rel="stylesheet" type="text/css" /> - <script type="text/javascript" src="webjars/bootstrap-select/${bootstrap-select.version}/js/bootstrap-select.min.js"></script> - <script type="text/javascript"> var notificationShownTimes = 0; function showNotification(componentId, messagecount) { http://git-wip-us.apache.org/repos/asf/syncope/blob/6f679403/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html index ed5aae3..f2b80d1 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html @@ -27,7 +27,6 @@ under the License. <link rel="shortcut icon" href="img/favicon.png" type="image/png"/> - <link href="webjars/bootstrap-select/${bootstrap-select.version}/css/bootstrap-select.min.css" rel="stylesheet" type="text/css" /> <link href="webjars/font-awesome/${font-awesome.version}/css/font-awesome.min.css" rel="stylesheet" type="text/css" /> <link href="webjars/ionicons/${ionicons.version}/css/ionicons.min.css" rel="stylesheet" type="text/css" /> <link href="css/login.css" rel="stylesheet" type="text/css" /> http://git-wip-us.apache.org/repos/asf/syncope/blob/6f679403/client/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword.html b/client/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword.html index 675c4df..3697265 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword.html @@ -28,7 +28,6 @@ under the License. <link rel="shortcut icon" href="img/favicon.png" type="image/png"/> <link href="webjars/bootstrap/${bootstrap.version}/css/bootstrap.min.css" rel="stylesheet" type="text/css" /> - <link href="webjars/bootstrap-select/${bootstrap-select.version}/css/bootstrap-select.min.css" rel="stylesheet" type="text/css" /> <link href="webjars/font-awesome/${font-awesome.version}/css/font-awesome.min.css" rel="stylesheet" type="text/css" /> <link href="webjars/ionicons/${ionicons.version}/css/ionicons.min.css" rel="stylesheet" type="text/css" /> <link href="css/AdminLTE.css" rel="stylesheet" type="text/css" /> @@ -36,7 +35,6 @@ under the License. <link href="css/syncopeConsole.css" rel="stylesheet" type="text/css" /> <script type="text/javascript" src="webjars/bootstrap/${bootstrap.version}/js/bootstrap.min.js"></script> - <script type="text/javascript" src="webjars/bootstrap-select/${bootstrap-select.version}/js/bootstrap-select.min.js"></script> </head> <body class="skin-green"> <div class="container"> http://git-wip-us.apache.org/repos/asf/syncope/blob/6f679403/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html ---------------------------------------------------------------------- diff --git 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 index 660449a..942edab 100644 --- 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 @@ -27,18 +27,53 @@ under the License. <wicket:panel> <div wicket:id="container" class="summarize"> - <span wicket:id="name">[name]</span> - <span wicket:id="connector">[connector]</span> - <span wicket:id="enforceMandatoryCondition">[enforceMandatoryCondition]</span> - <span wicket:id="propagationPrimary">[propagationPrimary]</span> - <span wicket:id="propagationPriority">[propagationPriority]</span> - <span wicket:id="propagationMode">[propagationMode]</span> - <span wicket:id="randomPwdIfNotProvided">[randomPwdIfNotProvided]</span> - <span wicket:id="actionsClasses">[actionsClasses]</span> - <span wicket:id="createTraceLevel">[createTraceLevel]</span> - <span wicket:id="updateTraceLevel">[updateTraceLevel]</span> - <span wicket:id="deleteTraceLevel">[deleteTraceLevel]</span> - <span wicket:id="syncTraceLevel">[syncTraceLevel]</span> + <div class="form-group"> + <span wicket:id="name">[name]</span> + </div> + + <div class="form-group"> + <span wicket:id="connector">[connector]</span> + </div> + + <div class="form-group"> + <span wicket:id="enforceMandatoryCondition">[enforceMandatoryCondition]</span> + </div> + + <div class="form-group"> + <span wicket:id="propagationPrimary">[propagationPrimary]</span> + </div> + + <div class="form-group"> + <span wicket:id="propagationPriority">[propagationPriority]</span> + </div> + + <div class="form-group"> + <span wicket:id="propagationMode">[propagationMode]</span> + </div> + + <div class="form-group"> + <span wicket:id="randomPwdIfNotProvided">[randomPwdIfNotProvided]</span> + </div> + + <div class="form-group"> + <span wicket:id="actionsClasses">[actionsClasses]</span> + </div> + + <div class="form-group"> + <span wicket:id="createTraceLevel">[createTraceLevel]</span> + </div> + + <div class="form-group"> + <span wicket:id="updateTraceLevel">[updateTraceLevel]</span> + </div> + + <div class="form-group"> + <span wicket:id="deleteTraceLevel">[deleteTraceLevel]</span> + </div> + + <div class="form-group"> + <span wicket:id="syncTraceLevel">[syncTraceLevel]</span> + </div> </div> <span wicket:id="systeminformation">[System Information]</span> http://git-wip-us.apache.org/repos/asf/syncope/blob/6f679403/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/MultiFieldPanel.html ---------------------------------------------------------------------- diff --git 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 index 8dc7fd0..5a2a02a 100644 --- 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 @@ -26,12 +26,13 @@ under the License. <!--<label wicket:id="field-label">[LABEL]</label><span wicket:id="required"/>--> <label wicket:id="field-label">[LABEL]</label> </wicket:enclosure> + <span wicket:id="multiValueContainer"> <span wicket:id="content">[content]</span> </span> <wicket:fragment wicket:id="noDataFragment"> - <div class="input-group form-group"> + <div class="input-group"> <div class="form-control" style="background-color:#EEE"> <label wicket:id="field-label">[LABEL]</label> </div> @@ -41,7 +42,7 @@ under the License. <wicket:fragment wicket:id="dataFragment"> <span wicket:id="view"> - <div class="input-group form-group"> + <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> http://git-wip-us.apache.org/repos/asf/syncope/blob/6f679403/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 07873ad..c9e38bc 100644 --- a/pom.xml +++ b/pom.xml @@ -377,7 +377,6 @@ 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> <font-awesome.version>4.4.0</font-awesome.version> @@ -950,11 +949,6 @@ under the License. </dependency> <dependency> <groupId>org.webjars</groupId> - <artifactId>bootstrap-select</artifactId> - <version>${bootstrap-select.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> <artifactId>font-awesome</artifactId> <version>${font-awesome.version}</version> </dependency>
