syncope git commit: [SYNCOPE-156] Notification component, fixed css
Repository: syncope Updated Branches: refs/heads/master 2261b8243 -> cb1ac36d8 [SYNCOPE-156] Notification component, fixed css Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cb1ac36d Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cb1ac36d Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cb1ac36d Branch: refs/heads/master Commit: cb1ac36d80e83f6d06eb44897e5c56dc3ec931b0 Parents: 2261b82 Author: Marco Di Sabatino Di DiodoroAuthored: Tue Dec 29 15:13:18 2015 +0100 Committer: Marco Di Sabatino Di Diodoro Committed: Tue Dec 29 15:13:18 2015 +0100 -- .../META-INF/resources/css/syncopeConsole.css | 37 .../console/panels/NotificationPanel.html | 8 ++--- 2 files changed, 27 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/cb1ac36d/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 8478d22..a0391f0 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 @@ -377,17 +377,21 @@ div.searchResult{ .errorNotification { width: 300px; height: 100px; + vertical-align: middle; + display: table-cell; } -.errorNotification h3 { - font-size: 1em; - padding: 10px 10px 5px; +.errorNotification #level { + float: left; + padding-left: 10px; + font-size: 2em; + width: 2%; } -.errorNotification span { - float: left; - margin: 30px 15px 30px 15px; - font-size: 2em; +.errorNotification #message { + float: right; + padding-left: 0px; + width:85% } .k-notification-success.k-group { @@ -398,15 +402,20 @@ div.searchResult{ .successNotification { width: 300px; height: 100px; + vertical-align: middle; + display: table-cell; } -.successNotification h3 { - font-size: 1em; - padding: 32px 10px 5px; +.successNotification #level { + float: left; + padding-left: 10px; + font-size: 2em; + width: 2%; } -.successNotification span { - float: left; - margin: 30px 15px 30px 15px; - font-size: 2em; +.successNotification #message { + float: right; + padding-left: 0px; + width:85% } + http://git-wip-us.apache.org/repos/asf/syncope/blob/cb1ac36d/client/console/src/main/resources/org/apache/syncope/client/console/panels/NotificationPanel.html -- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/NotificationPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/NotificationPanel.html index ec489d1..2c3eb74 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/NotificationPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/NotificationPanel.html @@ -23,15 +23,15 @@ under the License. - -#= message #
+ +#= message #
- -#= message #
+ +#= message #
syncope git commit: fixed typo and removed unuseful string builder
Repository: syncope Updated Branches: refs/heads/master d35f028dd -> 2261b8243 fixed typo and removed unuseful string builder Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2261b824 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2261b824 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2261b824 Branch: refs/heads/master Commit: 2261b8243435bd7197bf2c172c8d98bcc67b3a43 Parents: d35f028 Author: Andrea PatricelliAuthored: Tue Dec 29 13:18:53 2015 +0100 Committer: Andrea Patricelli Committed: Tue Dec 29 13:18:53 2015 +0100 -- .../enduser/resources/CaptchaValidateResource.java | 7 +++ .../client/enduser/resources/UserSelfCreateResource.java | 11 +++ 2 files changed, 10 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/2261b824/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaValidateResource.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaValidateResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaValidateResource.java index 28502b8..be07096 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaValidateResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaValidateResource.java @@ -55,10 +55,9 @@ public class CaptchaValidateResource extends AbstractBaseResource { if (StringUtils.isBlank(currentCaptcha) || enteredCaptcha == null) { LOG.info("Could not validate captcha: current session captcha or inserted captcha are empty or null"); -response.setError(Response.Status.BAD_REQUEST.getStatusCode(), new StringBuilder() -.append("ErrorMessage{{ Could not validate captcha: current session captcha or entered") -.append(" captcha areempty or null }}") -.toString()); +response.setError(Response.Status.BAD_REQUEST.getStatusCode(), +"ErrorMessage{{ Could not validate captcha: current session captcha or entered captcha are " ++ "empty or null }}"); } else { LOG.info("Is entered captcha equal to current session captcha? {}", enteredCaptcha.getValue().equals( currentCaptcha)); http://git-wip-us.apache.org/repos/asf/syncope/blob/2261b824/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java index b065a86..d22b267 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfCreateResource.java @@ -79,14 +79,17 @@ public class UserSelfCreateResource extends AbstractBaseResource { } else { response.setError(Response.Status.FORBIDDEN.getStatusCode(), new StringBuilder(). append("ErrorMessage{{").append(userTORequest == null -? "Request received is not valid" -: "Self registration not allowed").append("}}").toString()); +? "Request received is not valid }}" +: "Self registration not allowed }}").toString()); } } catch (Exception e) { LOG.error("Could not create userTO", e); -response.setError(Response.Status.BAD_REQUEST.getStatusCode(), new StringBuilder().append("ErrorMessage{{ ") -.append(e.getMessage()).append(" }}").toString()); +response.setError(Response.Status.BAD_REQUEST.getStatusCode(), new StringBuilder() +.append("ErrorMessage{{ ") +.append(e.getMessage()) +.append(" }}") +.toString()); } return response; }
syncope git commit: [SYNCOPE-719] added last wizard page with captcha validation, implemented also captcha backend
Repository: syncope Updated Branches: refs/heads/master f93b48951 -> 57a120244 [SYNCOPE-719] added last wizard page with captcha validation, implemented also captcha backend Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/57a12024 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/57a12024 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/57a12024 Branch: refs/heads/master Commit: 57a120244baeb9d8dd38e9f242b0f54631b7083a Parents: f93b489 Author: Andrea PatricelliAuthored: Tue Dec 29 12:38:45 2015 +0100 Committer: Andrea Patricelli Committed: Tue Dec 29 12:38:45 2015 +0100 -- .../enduser/SyncopeEnduserApplication.java | 24 + .../client/enduser/SyncopeEnduserConstants.java | 29 + .../client/enduser/model/CaptchaRequest.java| 49 + .../enduser/resources/CaptchaResource.java | 61 +++ .../resources/CaptchaValidateResource.java | 83 ++ .../resources/META-INF/resources/app/index.html | 4 +- .../resources/META-INF/resources/app/js/app.js | 13 +++ .../app/js/controllers/UserController.js| 108 +++ .../resources/app/js/directives/captcha.js | 42 .../resources/app/js/services/captchaService.js | 54 ++ .../app/js/services/userSelfService.js | 2 +- .../META-INF/resources/app/views/captcha.html | 17 +++ .../META-INF/resources/app/views/editUser.html | 2 +- .../resources/app/views/user-credentials.html | 2 +- .../resources/app/views/user-form-finish.html | 32 ++ .../resources/app/views/user-groups.html| 2 +- .../resources/app/views/user-plain-schemas.html | 2 +- .../resources/app/views/user-resources.html | 5 +- .../src/main/resources/log4j2.xml | 4 +- 19 files changed, 479 insertions(+), 56 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/57a12024/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java index 23ee026..5a565a4 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.Locale; import java.util.Properties; import org.apache.commons.io.FileUtils; +import org.apache.syncope.client.enduser.resources.CaptchaResource; +import org.apache.syncope.client.enduser.resources.CaptchaValidateResource; import org.apache.syncope.client.enduser.resources.InfoResource; import org.apache.syncope.client.enduser.resources.LoginResource; import org.apache.syncope.client.enduser.resources.LogoutResource; @@ -200,6 +202,28 @@ public class SyncopeEnduserApplication extends WebApplication implements Seriali } }); +// resource to get a fresh captcha image +mountResource("/api/captcha", new ResourceReference("captcha") { + +private static final long serialVersionUID = -128426276529456602L; + +@Override +public IResource getResource() { +return new CaptchaResource(); +} +}); + +// resource to validate current captcha +mountResource("/api/captcha/validate", new ResourceReference("captchaValidate") { + +private static final long serialVersionUID = -128426276529456602L; + +@Override +public IResource getResource() { +return new CaptchaValidateResource(); +} +}); + } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/57a12024/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserConstants.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserConstants.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserConstants.java new file mode 100644 index 000..daa0e15 --- /dev/null +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserConstants.java @@ -0,0 +1,29 @@ +/* + * 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
[2/2] syncope git commit: [SYNCOPE-156] New notification component
[SYNCOPE-156] New notification component Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c34dd05e Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c34dd05e Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c34dd05e Branch: refs/heads/master Commit: c34dd05eace2e3db9235f614639567f536d1937e Parents: 57a1202 Author: Marco Di Sabatino Di DiodoroAuthored: Tue Dec 29 12:47:36 2015 +0100 Committer: Marco Di Sabatino Di Diodoro Committed: Tue Dec 29 12:47:44 2015 +0100 -- client/console/pom.xml | 8 ++ .../console/SyncopeConsoleApplication.java | 19 +++- .../commons/NotificationAwareComponent.java | 2 +- .../commons/StyledNotificationBehavior.java | 39 .../client/console/pages/AbstractBasePage.java | 23 ++--- .../syncope/client/console/pages/BasePage.java | 43 +++-- .../console/pages/BulkActionModalPage.java | 13 +-- .../pages/DisplayAttributesModalPage.java | 5 +- .../syncope/client/console/pages/Realms.java| 19 ++-- .../client/console/pages/SecurityQuestions.java | 17 ++-- .../client/console/pages/StatusModal.java | 66 ++ .../syncope/client/console/pages/Types.java | 14 +-- .../console/pages/XMLEditorPopupPage.java | 4 +- .../console/panels/AbstractLogsPanel.java | 9 +- .../console/panels/AbstractModalPanel.java | 4 +- .../console/panels/AbstractResourceModal.java | 2 +- .../panels/AbstractSchemaDetailsPanel.java | 8 +- .../panels/AbstractSearchResultPanel.java | 16 +--- .../console/panels/AbstractTypesPanel.java | 5 -- .../console/panels/ActionDataTablePanel.java| 14 +-- .../console/panels/AjaxDataTablePanel.java | 18 ++-- .../panels/AnyObjectSearchResultPanel.java | 2 +- .../console/panels/AnyTypeClassModalPanel.java | 7 +- .../console/panels/AnyTypeClassesPanel.java | 2 +- .../console/panels/AnyTypeModalPanel.java | 8 +- .../client/console/panels/AnyTypePanel.java | 8 +- .../client/console/panels/ConnectorModal.java | 12 +-- .../client/console/panels/DerSchemaDetails.java | 7 +- .../console/panels/GroupSearchResultPanel.java | 4 +- .../console/panels/NotificationPanel.java | 94 ++-- .../console/panels/PlainSchemaDetails.java | 7 +- .../syncope/client/console/panels/Realm.java| 7 +- .../client/console/panels/RealmModalPanel.java | 13 +-- .../panels/RelationshipTypeModalPanel.java | 7 +- .../console/panels/RelationshipTypePanel.java | 3 +- .../client/console/panels/ResourceModal.java| 15 ++-- .../console/panels/RoleSearchResultPanel.java | 4 +- .../client/console/panels/SchemasPanel.java | 38 .../panels/SecurityQuestionModalPanel.java | 7 +- .../console/panels/SecurityQuestionsPanel.java | 4 +- .../console/panels/UserSearchResultPanel.java | 13 +-- .../client/console/panels/VirSchemaDetails.java | 10 +-- .../panels/search/AbstractSearchPanel.java | 44 + .../client/console/topology/Topology.java | 10 +-- .../console/topology/TopologyNodePanel.java | 33 +++ .../markup/html/ClearIndicatingAjaxButton.java | 2 +- .../markup/html/ClearIndicatingAjaxLink.java| 10 +-- .../markup/html/bootstrap/dialog/BaseModal.java | 12 +-- .../markup/html/form/ActionLinksPanel.java | 74 +++ .../html/form/IndicatingOnConfirmAjaxLink.java | 13 ++- .../META-INF/resources/css/syncopeConsole.css | 84 +++-- .../syncope/client/console/pages/BasePage.html | 16 +--- .../client/console/pages/BasePopupPage.html | 12 --- .../syncope/client/console/pages/Logs.html | 6 +- .../console/panels/NotificationPanel.html | 38 .../markup/html/bootstrap/dialog/BaseModal.html | 13 +-- .../console/pages/CamelRouteModalPage.java | 4 +- pom.xml | 10 +++ 58 files changed, 461 insertions(+), 540 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/c34dd05e/client/console/pom.xml -- diff --git a/client/console/pom.xml b/client/console/pom.xml index 5d3e658..a78d5c4 100644 --- a/client/console/pom.xml +++ b/client/console/pom.xml @@ -71,6 +71,14 @@ under the License. wicket-jquery-ui + com.googlecode.wicket-jquery-ui + wicket-kendo-ui + + + com.googlecode.wicket-jquery-ui + wicket-kendo-ui-theme-bootstrap + + org.apache.wicket wicket-native-websocket-javax
syncope git commit: fixed wrong style in CaptchaValidateResource
Repository: syncope Updated Branches: refs/heads/master c34dd05ea -> d35f028dd fixed wrong style in CaptchaValidateResource Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d35f028d Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d35f028d Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d35f028d Branch: refs/heads/master Commit: d35f028dd9aaf955efcb394e5e59d3f59aa2e30b Parents: c34dd05 Author: Andrea PatricelliAuthored: Tue Dec 29 13:00:06 2015 +0100 Committer: Andrea Patricelli Committed: Tue Dec 29 13:00:21 2015 +0100 -- .../client/enduser/resources/CaptchaValidateResource.java | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/d35f028d/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaValidateResource.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaValidateResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaValidateResource.java index 5ae6312..28502b8 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaValidateResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaValidateResource.java @@ -55,9 +55,10 @@ public class CaptchaValidateResource extends AbstractBaseResource { if (StringUtils.isBlank(currentCaptcha) || enteredCaptcha == null) { LOG.info("Could not validate captcha: current session captcha or inserted captcha are empty or null"); -response.setError(Response.Status.BAD_REQUEST.getStatusCode(), new StringBuilder().append( -"ErrorMessage{{ Could not validate captcha: current session captcha or entered captcha are empty or null }}"). -toString()); +response.setError(Response.Status.BAD_REQUEST.getStatusCode(), new StringBuilder() +.append("ErrorMessage{{ Could not validate captcha: current session captcha or entered") +.append(" captcha areempty or null }}") +.toString()); } else { LOG.info("Is entered captcha equal to current session captcha? {}", enteredCaptcha.getValue().equals( currentCaptcha));