eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-04 03:13:49 +00:00
Code Activity

simplify LogoAndTitlePanel in case the screen size is too small

Browse Source
This commit is contained in:
Axel Uhl committed 2012-12-05 23:49:51 +01:00
1 parent ea48a2a042
commit c8adb0880e
9 files changed
+60 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/CommonControls.css
+13 -2
View File
@@ -181,9 +181,19 @@ body ::-webkit-scrollbar-track {
font-family: 'UbuntuMedium', Arial, Verdana, sans-serif;
font-size: 18px;
color: #fff;
margin: 13px 0 0 0;
margin-top: 13px;
}
.titleLabelRight {
text-align: right;
font-family: 'UbuntuMedium', Arial, Verdana, sans-serif;
font-size: 18px;
color: #fff;
margin-top: 13px;
margin-right: 12px;
}
.subTitleLabelWrapper {
position: absolute;
min-width: 200px;
@@ -444,7 +454,8 @@ body ::-webkit-scrollbar-track {
.sapLogo {
float: left;
margin: 13px 0 0 12px;
margin-top: 13px;
margin-left: 12px;
}
.sailingAnalyticsLabelPanel {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/AbstractEntryPoint.java
+6 -1
View File
@@ -75,9 +75,14 @@ public abstract class AbstractEntryPoint implements EntryPoint, ErrorReporter {
reportError(message);
}
}
protected boolean isSmallWidth() {
int width = Window.getClientWidth();
return width <= 720;
}
public void createErrorPage(String message) {
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(stringMessages);
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(stringMessages, isSmallWidth());
logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
RootPanel.get().add(logoAndTitlePanel);
RootPanel.get().add(new Label(message));
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/LogoAndTitlePanel.java
+26 -22
View File
@@ -9,42 +9,46 @@ public class LogoAndTitlePanel extends FlowPanel {
protected Label titleLabel;
protected Label subTitleLabel;
public LogoAndTitlePanel(StringMessages stringConstants) {
this(null, null, stringConstants);
public LogoAndTitlePanel(StringMessages stringConstants, boolean isSmallWidth) {
this(null, null, stringConstants, isSmallWidth);
}
public LogoAndTitlePanel(String title, StringMessages stringConstants) {
this(title, null, stringConstants);
public LogoAndTitlePanel(String title, StringMessages stringConstants, boolean isSmallWidth) {
this(title, null, stringConstants, isSmallWidth);
}
public LogoAndTitlePanel(String title, String subTitle, StringMessages stringConstants) {
public LogoAndTitlePanel(String title, String subTitle, StringMessages stringConstants, boolean isSmallWidth) {
Anchor sapLogo = new Anchor(new SafeHtmlBuilder().appendHtmlConstant(
"<img class=\"linkNoBorder\" src=\"/gwt/images/sap_66_transparent.png\"/>").toSafeHtml());
sapLogo.setHref("http://www.sap.com");
sapLogo.addStyleName("sapLogo");
this.add(sapLogo);
FlowPanel sailingAnalyticsLabelPanel = new FlowPanel();
Label sailingAnalyticsLabel = new Label(stringConstants.sapSailingAnalytics());
sailingAnalyticsLabelPanel.add(sailingAnalyticsLabel);
sailingAnalyticsLabelPanel.addStyleName("sailingAnalyticsLabelPanel");
sailingAnalyticsLabel.addStyleName("sailingAnalyticsLabel boldLabel");
this.add(sailingAnalyticsLabelPanel);
if (title != null) {
FlowPanel subTitleLabelWrapper = new FlowPanel();
subTitleLabelWrapper.addStyleName("titleLabelWrapper");
if (!isSmallWidth) {
FlowPanel sailingAnalyticsLabelPanel = new FlowPanel();
Label sailingAnalyticsLabel = new Label(stringConstants.sapSailingAnalytics());
sailingAnalyticsLabelPanel.add(sailingAnalyticsLabel);
sailingAnalyticsLabelPanel.addStyleName("sailingAnalyticsLabelPanel");
sailingAnalyticsLabel.addStyleName("sailingAnalyticsLabel boldLabel");
this.add(sailingAnalyticsLabelPanel);
}
if (!isSmallWidth && title != null) {
FlowPanel titleLabelWrapper = new FlowPanel();
titleLabelWrapper.addStyleName("titleLabelWrapper");
titleLabel = new Label(title);
titleLabel.addStyleName("titleLabel");
subTitleLabelWrapper.add(titleLabel);
this.add(subTitleLabelWrapper);
titleLabelWrapper.add(titleLabel);
this.add(titleLabelWrapper);
}
if (subTitle != null) {
FlowPanel subTitleLabelWrapper = new FlowPanel();
subTitleLabelWrapper.addStyleName("subTitleLabelWrapper");
subTitleLabel = new Label(subTitle);
subTitleLabel.addStyleName("subTitleLabel");
FlowPanel subTitleLabelWrapper = new FlowPanel();
if (isSmallWidth) {
subTitleLabelWrapper.addStyleName("titleLabelWrapper");
subTitleLabel.addStyleName("titleLabelRight");
} else {
subTitleLabelWrapper.addStyleName("subTitleLabelWrapper");
subTitleLabel.addStyleName("subTitleLabel");
}
subTitleLabelWrapper.add(subTitleLabel);
this.add(subTitleLabelWrapper);
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
+6 -6
View File
@@ -92,15 +92,15 @@ public class LeaderboardEntryPoint extends AbstractEntryPoint {
if (!embedded) {
// Hack to shorten the leaderboardName in case of overall leaderboards
String leaderboardDisplayName = Window.Location.getParameter("displayName");
if(leaderboardDisplayName == null || leaderboardDisplayName.isEmpty()) {
if (leaderboardDisplayName == null || leaderboardDisplayName.isEmpty()) {
leaderboardDisplayName = leaderboardName;
}
logoAndTitlePanel = new LogoAndTitlePanel(leaderboardGroupName, leaderboardDisplayName, stringMessages);
logoAndTitlePanel = new LogoAndTitlePanel(leaderboardGroupName, leaderboardDisplayName, stringMessages, isSmallWidth());
logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
FlowPanel globalNavigationPanel = new GlobalNavigationPanel(stringMessages, true, null, leaderboardGroupName);
logoAndTitlePanel.add(globalNavigationPanel);
if (!isSmallWidth()) {
FlowPanel globalNavigationPanel = new GlobalNavigationPanel(stringMessages, true, null, leaderboardGroupName);
logoAndTitlePanel.add(globalNavigationPanel);
}
mainPanel.addNorth(logoAndTitlePanel, 68);
}
ScrollPanel contentScrollPanel = new ScrollPanel();
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/LeaderboardEditPage.java
+1 -1
View File
@@ -19,7 +19,7 @@ public class LeaderboardEditPage extends AbstractEntryPoint {
public void onSuccess(List<String> leaderboardNames) {
String leaderboardName = Window.Location.getParameter("name");
if (leaderboardNames.contains(leaderboardName)) {
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(stringMessages.editScores(), stringMessages);
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(stringMessages.editScores(), stringMessages, isSmallWidth());
logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
EditableLeaderboardPanel leaderboardPanel = new EditableLeaderboardPanel(sailingService, new AsyncActionsExecutor(), leaderboardName, null,
LeaderboardEditPage.this, stringMessages, userAgent);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/GlobalNavigationPanel.java
+1 -5
View File
@@ -23,16 +23,12 @@ public class GlobalNavigationPanel extends FlowPanel {
public GlobalNavigationPanel(StringMessages stringMessages, boolean showHomeNavigation, String leaderboardName, String leaderboardGroupName) {
super();
setStyleName("globalNavigation");
debugParam = Window.Location.getParameter("gwt.codesvr");
String spectatorViewLink = "/gwt/Spectator.html";
String leaderboardViewLink = "/gwt/Leaderboard.html";
String homeLink = "/";
if(showHomeNavigation) {
if (showHomeNavigation) {
if (leaderboardGroupName != null && !leaderboardGroupName.isEmpty()) {
String leaderBoardGroupLink = spectatorViewLink + "?showRaceDetails=true&leaderboardGroupName=" + leaderboardGroupName;
addNavigationLink(leaderboardGroupName, leaderBoardGroupLink, "leaderBoardGroup", "Go to the Event overview.");
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
+5 -5
View File
@@ -172,12 +172,12 @@ public class RaceBoardEntryPoint extends AbstractEntryPoint {
}
private FlowPanel createLogoAndTitlePanel(RaceBoardPanel raceBoardPanel) {
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(regattaName, selectedRace.name, stringMessages);
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(regattaName, selectedRace.name, stringMessages, isSmallWidth());
logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
FlowPanel globalNavigationPanel = new GlobalNavigationPanel(stringMessages, true, leaderboardName, leaderboardGroupName);
logoAndTitlePanel.add(globalNavigationPanel);
if (!isSmallWidth()) {
FlowPanel globalNavigationPanel = new GlobalNavigationPanel(stringMessages, true, leaderboardName, leaderboardGroupName);
logoAndTitlePanel.add(globalNavigationPanel);
}
return logoAndTitlePanel;
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/SpectatorEntryPoint.java
+1 -3
View File
@@ -56,10 +56,8 @@ public class SpectatorEntryPoint extends AbstractEntryPoint implements RegattaRe
&& Window.Location.getParameter("embedded").equalsIgnoreCase("true");
if (!embedded) {
String title = groupName != null ? groupName : stringMessages.overview();
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(title, stringMessages);
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(title, stringMessages, isSmallWidth());
logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
FlowPanel globalNavigationPanel = new GlobalNavigationPanel(stringMessages, true, null, null);
logoAndTitlePanel.add(globalNavigationPanel);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVEntryPoint.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class TVEntryPoint extends AbstractEntryPoint {
if(leaderboardDisplayName == null || leaderboardDisplayName.isEmpty()) {
leaderboardDisplayName = leaderboardName;
}
logoAndTitlePanel = new LogoAndTitlePanel(leaderboardGroupName, leaderboardDisplayName, stringMessages);
logoAndTitlePanel = new LogoAndTitlePanel(leaderboardGroupName, leaderboardDisplayName, stringMessages, isSmallWidth());
logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
mainPanel.addNorth(logoAndTitlePanel, 68);
}