eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-17 01:31:01 +00:00
Code Activity

Moved style regarding user management in RaceBoard to RaceBoardResources

Browse Source 
and implemented first adjustments for mobile version depending on device
detection
This commit is contained in:
Benjamin Barth committed 2016-02-01 16:48:46 +01:00
1 parent 7869c51219
commit ec603daada
7 files changed
+54 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/RaceBoard.css
+1
View File
@@ -777,6 +777,7 @@ img.openColumn {
left: inherit !important;
right: 0 !important;
}
.User-Management-View_content_wrapper_mobile
.User-Management-View * {
font-size: 15px;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/SourceRaceboard.gwt.xml
+1
View File
@@ -3,6 +3,7 @@
<module>
<inherits name='com.google.gwt.user.User'/>
<inherits name="com.sap.sse.security.ui.Authentication" />
<inherits name='com.sap.sailing.gwt.common.SourceCommon'/>
<source path="raceboard"/>
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardAuthenticationView.java
+4 -3
View File
@@ -10,7 +10,7 @@ import com.google.gwt.user.client.ui.PopupPanel;
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.sse.gwt.common.CommonSharedResources;
import com.sap.sailing.gwt.common.client.formfactor.DeviceDetector;
import com.sap.sse.security.ui.authentication.UserManagementResources;
import com.sap.sse.security.ui.authentication.UserManagementResources.LocalCss;
import com.sap.sse.security.ui.authentication.view.FlyoutAuthenticationView;
@@ -29,14 +29,15 @@ public class RaceBoardAuthenticationView extends Composite implements FlyoutAuth
@UiField DivElement headingUi;
@UiField SimplePanel contentContainerUi;
@UiField(provided = true) CommonSharedResources res = RaceBoardResources.INSTANCE;
@UiField(provided = true) RaceBoardResources res = RaceBoardResources.INSTANCE;
public RaceBoardAuthenticationView() {
LOCAL_CSS.ensureInjected();
popupPanel.addStyleName(LOCAL_CSS.flyover());
super.initWidget(uiBinder.createAndBindUi(this));
popupPanel.setWidget(this);
popupPanel.setStyleName("User-Management-View");
popupPanel.setStyleName(res.mainCss().usermanagement_view());
popupPanel.setStyleName(res.mainCss().usermanagement_mobile(), DeviceDetector.isMobile());
}
@Override
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardAuthenticationView.ui.xml
+3 -3
View File
@@ -2,10 +2,10 @@
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:s="urn:import:com.sap.sailing.gwt.home.client.shared">
<ui:with field="i18n" type="com.sap.sailing.gwt.ui.client.StringMessages" />
<ui:with field="res" type="com.sap.sse.gwt.common.CommonSharedResources" />
<ui:with field="res" type="com.sap.sailing.gwt.ui.raceboard.RaceBoardResources" />
<ui:with field="local_res" type="com.sap.sse.security.ui.authentication.UserManagementResources" />
<g:HTMLPanel addStyleNames="{local_res.css.flyover_content_wrapper}">
<div class="{local_res.css.flyover_content}">
<g:HTMLPanel addStyleNames="{local_res.css.flyover_content_wrapper} {res.mainCss.usermanagement_view_content_wrapper}">
<div class="{local_res.css.flyover_content} {res.mainCss.usermanagement_view_content}">
<div class="{local_res.css.form_title}" ui:field="headingUi"></div>
<g:SimplePanel ui:field="contentContainerUi"/>
</div>
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
+5 -3
View File
@@ -60,6 +60,7 @@ import com.sap.sailing.gwt.ui.leaderboard.ExplicitRaceColumnSelectionWithPresele
import com.sap.sailing.gwt.ui.leaderboard.LeaderboardPanel;
import com.sap.sailing.gwt.ui.leaderboard.LeaderboardSettings;
import com.sap.sailing.gwt.ui.leaderboard.LeaderboardSettingsFactory;
import com.sap.sailing.gwt.ui.raceboard.RaceBoardResources.RaceBoardMainCss;
import com.sap.sse.common.filter.FilterSet;
import com.sap.sse.common.settings.AbstractSettings;
import com.sap.sse.gwt.client.ErrorReporter;
@@ -130,6 +131,7 @@ public class RaceBoardPanel extends SimplePanel implements LeaderboardUpdateList
private final AuthenticationMenuView userManagementMenuView;
private boolean currentRaceHasBeenSelectedOnce;
private static final RaceBoardMainCss MAIN_CSS = RaceBoardResources.INSTANCE.mainCss();
private static final RaceMapResources raceMapResources = GWT.create(RaceMapResources.class);
/**
@@ -168,8 +170,8 @@ public class RaceBoardPanel extends SimplePanel implements LeaderboardUpdateList
raceInformationHeader.setStyleName("RegattaRaceInformation-Header");
regattaAndRaceTimeInformationHeader = new FlowPanel();
regattaAndRaceTimeInformationHeader.setStyleName("RegattaAndRaceTime-Header");
this.userManagementMenuView = new AuthenticationMenuViewImpl(new Anchor(), "loggedin");
this.userManagementMenuView.asWidget().setStyleName("User-Management-Icon");
this.userManagementMenuView = new AuthenticationMenuViewImpl(new Anchor(), MAIN_CSS.usermanagement_loggedin());
this.userManagementMenuView.asWidget().setStyleName(MAIN_CSS.usermanagement_icon());
timeRangeWithZoomModel = new TimeRangeWithZoomModel();
componentViewers = new ArrayList<ComponentViewer>();
final CompetitorColorProvider colorProvider = new CompetitorColorProviderImpl(selectedRaceIdentifier, competitorsAndTheirBoats);
@@ -298,7 +300,7 @@ public class RaceBoardPanel extends SimplePanel implements LeaderboardUpdateList
}
private void setupUserManagementControlPanel(UserService userService) {
RaceBoardResources.INSTANCE.mainCss().ensureInjected();
MAIN_CSS.ensureInjected();
EventBus eventBus = new SimpleEventBus();
FlyoutAuthenticationView display = new RaceBoardAuthenticationView();
AuthenticationManager manager = new AuthenticationManagerImpl(userService, eventBus,
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardResources.java
+7
View File
@@ -24,6 +24,13 @@ public interface RaceBoardResources extends CommonSharedResources, ClientBundle
String mainsection();
String mainsection_header();
String mainsection_header_title();
String usermanagement_icon();
String usermanagement_loggedin();
String usermanagement_view();
String usermanagement_view_content_wrapper();
String usermanagement_view_content();
String usermanagement_mobile();
}
public interface RaceBoardMediaCss extends CommonMediaCss, CssResource {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/raceboard-main.gss
+33
View File
@@ -74,3 +74,36 @@ body {
color: #008fcc;
text-align: center;
}
.usermanagement_icon {
width: 3rem;
height: 3rem;
vertical-align: middle;
background-repeat: no-repeat;
background-position: center center;
background-size: contain;
background-image: url('images/home/loggedout.svg');
cursor: pointer;
position: absolute;
right: 10px;
top: 6px;
}
.usermanagement_icon.usermanagement_loggedin {
background-image: url('images/home/loggedin.svg');
}
.usermanagement_view {
top: 70px !important;
left: inherit !important;
right: 0 !important;
}
.usermanagement_view.usermanagement_mobile {
top: 60px !important;
left: 0 !important;
z-index: 10;
}
.usermanagement_mobile .usermanagement_view_content_wrapper {
padding: 0;
}
.usermanagement_mobile .usermanagement_view_content {
width: 100%;
}