From 5616ed88d5c200acefa2c33c4e321126a68c85df Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Wed, 20 Jan 2016 13:35:02 +0100 Subject: [PATCH] Using resources interface of SSE in several more user management UI parts (first step of the refactoring to SSE) --- .../shared/usermanagement/create/CreateAccountViewImpl.java | 5 +++++ .../usermanagement/create/CreateAccountViewImpl.ui.xml | 2 +- .../usermanagement/recovery/PasswordRecoveryViewImpl.java | 5 +++++ .../usermanagement/recovery/PasswordRecoveryViewImpl.ui.xml | 2 +- .../home/shared/usermanagement/signin/SignInViewImpl.java | 5 +++++ .../home/shared/usermanagement/signin/SignInViewImpl.ui.xml | 2 +- .../usermanagement/view/UserManagementViewDesktop.java | 5 +++++ .../usermanagement/view/UserManagementViewDesktop.ui.xml | 2 +- .../shared/usermanagement/view/UserManagementViewMobile.java | 5 +++++ .../usermanagement/view/UserManagementViewMobile.ui.xml | 2 +- .../client/usermanagement/UserManagementSharedResources.java | 5 +++++ 11 files changed, 35 insertions(+), 5 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountViewImpl.java index ff609160d8e..99fb58545b0 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountViewImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountViewImpl.java @@ -13,8 +13,10 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.PasswordTextBox; import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.Widget; +import com.sap.sailing.gwt.common.client.SharedResources; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementResources; import com.sap.sse.security.ui.client.i18n.StringMessages; +import com.sap.sse.security.ui.client.usermanagement.UserManagementSharedResources; public class CreateAccountViewImpl extends Composite implements CreateAccountView { @@ -31,6 +33,9 @@ public class CreateAccountViewImpl extends Composite implements CreateAccountVie @UiField Anchor signInUi; @UiField DivElement formErrorUi; + + @UiField(provided = true) + UserManagementSharedResources res = SharedResources.INSTANCE; private Presenter presenter; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountViewImpl.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountViewImpl.ui.xml index 6b6d438e807..cd4d37cb878 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountViewImpl.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/create/CreateAccountViewImpl.ui.xml @@ -3,7 +3,7 @@ xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared"> - +
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryViewImpl.java index 38251369575..49645f1fc14 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryViewImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryViewImpl.java @@ -11,7 +11,9 @@ import com.google.gwt.uibinder.client.UiHandler; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.Widget; +import com.sap.sailing.gwt.common.client.SharedResources; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementResources; +import com.sap.sse.security.ui.client.usermanagement.UserManagementSharedResources; public class PasswordRecoveryViewImpl extends Composite implements PasswordRecoveryView { @@ -24,6 +26,9 @@ public class PasswordRecoveryViewImpl extends Composite implements PasswordRecov @UiField TextBox usernameUi; @UiField DivElement formErrorUi; + + @UiField(provided = true) + UserManagementSharedResources res = SharedResources.INSTANCE; private Presenter presenter; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryViewImpl.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryViewImpl.ui.xml index aaae4fdc517..5f5d7ab2e8c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryViewImpl.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/recovery/PasswordRecoveryViewImpl.ui.xml @@ -3,7 +3,7 @@ xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared"> - +
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInViewImpl.java index a2fef3877da..a73de70cc96 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInViewImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInViewImpl.java @@ -13,8 +13,10 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.PasswordTextBox; import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.Widget; +import com.sap.sailing.gwt.common.client.SharedResources; import com.sap.sailing.gwt.home.shared.ExperimentalFeatures; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementResources; +import com.sap.sse.security.ui.client.usermanagement.UserManagementSharedResources; public class SignInViewImpl extends Composite implements SignInView { @@ -33,6 +35,9 @@ public class SignInViewImpl extends Composite implements SignInView { @UiField DivElement formErrorUi; @UiField DivElement socialLoginUi; + + @UiField(provided = true) + UserManagementSharedResources res = SharedResources.INSTANCE; private Presenter presenter; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInViewImpl.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInViewImpl.ui.xml index 6d18a5b2506..2380a0e8a97 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInViewImpl.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/signin/SignInViewImpl.ui.xml @@ -3,7 +3,7 @@ xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared"> - +
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewDesktop.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewDesktop.java index 9ec7fa89fa4..6cbb07dd812 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewDesktop.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewDesktop.java @@ -13,8 +13,10 @@ import com.google.gwt.user.client.ui.PopupPanel.PositionCallback; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.UIObject; import com.google.gwt.user.client.ui.Widget; +import com.sap.sailing.gwt.common.client.SharedResources; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementResources; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementResources.LocalCss; +import com.sap.sse.security.ui.client.usermanagement.UserManagementSharedResources; public class UserManagementViewDesktop extends Composite implements UserManagementView { @@ -29,6 +31,9 @@ public class UserManagementViewDesktop extends Composite implements UserManageme @UiField DivElement headingUi; @UiField SimplePanel contentContainerUi; + + @UiField(provided = true) + UserManagementSharedResources res = SharedResources.INSTANCE; public UserManagementViewDesktop() { LOCAL_CSS.ensureInjected(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewDesktop.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewDesktop.ui.xml index 801e54cd023..3ef357fb3d0 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewDesktop.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewDesktop.ui.xml @@ -2,7 +2,7 @@ - +
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewMobile.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewMobile.java index fa9dfcd3982..33f91c3a4a1 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewMobile.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewMobile.java @@ -7,10 +7,12 @@ import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.IsWidget; import com.google.gwt.user.client.ui.Widget; +import com.sap.sailing.gwt.common.client.SharedResources; import com.sap.sailing.gwt.home.mobile.partials.section.MobileSection; import com.sap.sailing.gwt.home.mobile.partials.sectionHeader.SectionHeaderContent; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementResources; import com.sap.sailing.gwt.home.shared.usermanagement.UserManagementResources.LocalCss; +import com.sap.sse.security.ui.client.usermanagement.UserManagementSharedResources; public class UserManagementViewMobile extends Composite implements UserManagementView { @@ -23,6 +25,9 @@ public class UserManagementViewMobile extends Composite implements UserManagemen @UiField SectionHeaderContent sectionHeaderUi; private final MobileSection contentContainerUi; + + @UiField(provided = true) + UserManagementSharedResources res = SharedResources.INSTANCE; public UserManagementViewMobile() { LOCAL_CSS.ensureInjected(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewMobile.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewMobile.ui.xml index 882e0ec03da..ebdf4b343a4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewMobile.ui.xml +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/usermanagement/view/UserManagementViewMobile.ui.xml @@ -2,7 +2,7 @@ - + diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/usermanagement/UserManagementSharedResources.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/usermanagement/UserManagementSharedResources.java index 3273626c807..4ed5330bfe7 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/usermanagement/UserManagementSharedResources.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/usermanagement/UserManagementSharedResources.java @@ -9,10 +9,15 @@ public interface UserManagementSharedResources { public interface UserManagementMainCss { String button(); + String buttonprimary(); String buttonprimaryoutlined(); + String buttonarrowrightwhite(); } public interface UserManagementMediaCss { + String grid(); + String column(); + String small12(); } } \ No newline at end of file