From commits-return-13369-archive-asf-public=cust-asf.ponee.io@syncope.apache.org Wed Apr 17 09:14:48 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id F039B180675 for ; Wed, 17 Apr 2019 11:14:46 +0200 (CEST) Received: (qmail 75786 invoked by uid 500); 17 Apr 2019 09:14:46 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 75776 invoked by uid 99); 17 Apr 2019 09:14:46 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Apr 2019 09:14:46 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 906DB8A0AC; Wed, 17 Apr 2019 09:14:40 +0000 (UTC) Date: Wed, 17 Apr 2019 09:14:40 +0000 To: "commits@syncope.apache.org" Subject: [syncope] branch master updated: [SYNCOPE-1421] Added 'Confirm password reset' page in Enduser, added style to 'Password reset' page in Enduser, added new style for 'Must change password' page in Admin Console, other fixes MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155549248026.26280.6751673482291183957@gitbox.apache.org> From: skylark17@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: syncope X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 62dad9ebd4ae80c645764deb0e7febe43983af41 X-Git-Newrev: f7f4f0ab2b79c4d7adfc993d2c3235a351040137 X-Git-Rev: f7f4f0ab2b79c4d7adfc993d2c3235a351040137 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/master by this push: new f7f4f0a [SYNCOPE-1421] Added 'Confirm password reset' page in Enduser, added style to 'Password reset' page in Enduser, added new style for 'Must change password' page in Admin Console, other fixes f7f4f0a is described below commit f7f4f0ab2b79c4d7adfc993d2c3235a351040137 Author: skylark17 AuthorDate: Wed Apr 17 10:26:52 2019 +0200 [SYNCOPE-1421] Added 'Confirm password reset' page in Enduser, added style to 'Password reset' page in Enduser, added new style for 'Must change password' page in Admin Console, other fixes --- .../client/console/pages/MustChangePassword.java | 3 + .../META-INF/resources/css/syncopeConsole.scss | 25 ++- .../apache/syncope/client/console/pages/Login.html | 1 + .../client/console/pages/MustChangePassword.html | 71 +++++-- .../client/enduser/SyncopeWebApplication.java | 6 +- .../Navbar.java} | 18 +- .../client/enduser/pages/BaseEnduserWebPage.java | 8 + .../enduser/pages/SelfConfirmPasswordReset.java | 135 ++++++++++++ .../client/enduser/pages/SelfPasswordReset.java | 5 +- .../META-INF/resources/css/syncopeEnduser.scss | 87 ++++++-- .../syncope/client/enduser/navigation/Navbar.html | 88 ++++++++ .../client/enduser/pages/BaseEnduserWebPage.html | 52 +---- .../apache/syncope/client/enduser/pages/Login.html | 4 +- .../enduser/pages/SelfConfirmPasswordReset.html | 59 ++++++ .../SelfConfirmPasswordReset.properties} | 16 +- .../SelfConfirmPasswordReset_it.properties} | 14 +- .../SelfConfirmPasswordReset_ja.properties} | 16 +- .../SelfConfirmPasswordReset_pt_BR.properties} | 16 +- .../pages/SelfConfirmPasswordReset_ru.properties | 24 +++ .../client/enduser/pages/SelfPasswordReset.html | 23 +- .../SelfPasswordReset.properties} | 2 +- .../SelfPasswordReset_it.properties} | 2 +- .../SelfPasswordReset_ja.properties} | 2 +- .../SelfPasswordReset_pt_BR.properties} | 2 +- .../SelfPasswordReset_ru.properties} | 2 +- .../client/enduser/panels/SelfPwdResetPanel.html | 27 ++- .../enduser/panels/SelfPwdResetPanel_it.properties | 2 +- .../panels/SelfPwdResetPanel_pt_BR.properties | 4 +- .../enduser/panels/SelfPwdResetPanel_ru.properties | 4 +- .../wizards/any/AbstractCaptchaPanel.properties | 2 +- ...operties => AbstractCaptchaPanel_it.properties} | 2 +- ...operties => AbstractCaptchaPanel_ja.properties} | 2 +- ...rties => AbstractCaptchaPanel_pt_BR.properties} | 2 +- .../any/AbstractCaptchaPanel_ru.properties} | 9 +- .../ui/commons/SyncopeUIRequestCycleListener.java | 3 +- .../resources/ui-commons/css/animations.scss | 61 ++---- .../META-INF/resources/ui-commons/css/login.scss | 3 +- .../resources/ui-commons/css/syncopeUI.scss | 232 ++++++++++----------- .../META-INF/resources/ui-commons/css/utils.scss | 30 ++- .../src/main/resources/domains/MasterContent.xml | 4 +- .../src/test/resources/domains/MasterContent.xml | 4 +- .../src/main/resources/domains/MasterContent.xml | 4 +- .../src/test/resources/domains/MasterContent.xml | 4 +- .../core/provisioning/java/MailTemplateTest.java | 4 +- core/upgrade/src/test/resources/syncopedb20.sql | 2 +- .../resources/domains/MasterContent.xml.pgjsonb | 4 +- 46 files changed, 739 insertions(+), 351 deletions(-) diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java index f83ca8f..2ce4798 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java @@ -24,6 +24,7 @@ import org.apache.syncope.client.console.commons.Constants; import org.apache.syncope.client.console.rest.UserSelfRestClient; import org.apache.syncope.client.ui.commons.markup.html.form.AjaxPasswordFieldPanel; import org.apache.syncope.client.ui.commons.panels.NotificationPanel; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.markup.html.WebPage; @@ -113,5 +114,7 @@ public class MustChangePassword extends WebPage { form.setDefaultButton(submitButton); add(form); + + add(new AttributeModifier("style", "height: \"100%\"")); } } diff --git a/client/idrepo/console/src/main/resources/META-INF/resources/css/syncopeConsole.scss b/client/idrepo/console/src/main/resources/META-INF/resources/css/syncopeConsole.scss index 55ce70b..be5c813 100644 --- a/client/idrepo/console/src/main/resources/META-INF/resources/css/syncopeConsole.scss +++ b/client/idrepo/console/src/main/resources/META-INF/resources/css/syncopeConsole.scss @@ -19,6 +19,7 @@ $background_console_darker: rgb(104, 145, 162); $background_console_dark: #00a65a; +$background_console_white: #eee; @@ -35,7 +36,6 @@ $background_console_dark: #00a65a; - /* General ============================================================================= */ @@ -68,4 +68,25 @@ body { background-color: $background_console_dark; } } -} \ No newline at end of file +} + + + +/* Must Change Password +============================================================================= */ + +#mcp_wrapper { + height: 100%; + + #mcp_logo { + background: $background_console_white; + } + + .card { + height: 100%; + } + + .custom_content_wrapper { + padding: 2% 2% 0 2%; + } +} diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html index c86fb43..dec4611 100644 --- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html +++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Login.html @@ -53,6 +53,7 @@ under the License. +