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

css cleanup of leaderboard page and LogoAndTitlePanel

Browse Source
This commit is contained in:
fmittag committed 2012-06-12 13:59:51 +02:00
1 parent 2ca6ac3cd1
commit 751d6597e6
9 files changed
+61 -120
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 -1
View File
@@ -144,6 +144,18 @@
}
.titleLabelWrapper {
text-align: center;
vertical-align: middle;
font-family: 'UbuntuMedium', Arial, Verdana, sans-serif;
font-size: 20px;
color: #fff;
}
.titleLabel {
height: 26px;
}
.subTitleLabelWrapper {
position: absolute;
min-width: 400px;
text-align: right;
@@ -156,7 +168,7 @@
//background: url(images/titleLabelWrapper.png) right center no-repeat;
}
.titleLabel {
.subTitleLabel {
background: url(images/titleLabelInner.png) left center no-repeat;
height: 26px;
padding: 42px 7px 0 130px;
java/com.sap.sailing.gwt.ui/Leaderboard.css
+7 -69
View File
@@ -53,44 +53,12 @@ table td,table th {
padding-top: 2px;
}
.LogoAndTitlePanel {
height: 68px;
font-family: Arial, Verdana, sans-serif;
position: fixed;
width: 100%;
top: 0;
background-image: url(images/white_gradient_header.png), url(images/header_bg_modern.png);
background-position: center top, 0 0;
background-repeat: no-repeat, repeat-x;
box-shadow: 0 0 20px #858585;
-moz-box-shadow: 0 0 20px #858585;
-webkit-box-shadow: 0 0 20px #858585;
.leaderboardContent {
margin: 5px;
}
.LogoAndTitlePanel:after {
content: " ";
display: block;
height: 0;
clear: both;
visibility: hidden;
}
.sapLogo {
float: left;
margin: 13px 0 0 12px;
}
.sailingAnalyticsLabelPanel {
margin: 10px 0 0 0;
}
.sailingAnalyticsLabel {
float: left;
color: #fff;
font-size: 14px;
font-weight: bold;
margin: 15px 0 0 0;
.leaderboardContent-toolbar {
}
.leaderboardLabel {
@@ -105,16 +73,12 @@ table td,table th {
border-top: 2px solid #fff;
height: 30px; }
.refreshAndSettings table td {
.refreshAndSettings table td {
padding: 0 10px 0 0;}
.refreshAndSettings table table td{
.refreshAndSettings table table td{
padding: 0 0 0 0;}
.race-name {
margin: 2px 10px 0 0;
line-height: 1.0;
float: left;}
input.magnifier{
display: block;
margin: 3px auto 0 auto !important;
@@ -133,32 +97,6 @@ body, table td, select, button {
color: #FF0000;
}
.raceBoardNavigation {
float: right;
margin:6px 0 0 0;
font-family: 'UbuntuLight', Arial, Verdana, sans-serif;
}
.raceBoardNavigation-navigationitem {
color: #dddcdc;
text-transform: uppercase;
font-weight: 500;
margin: 0 12px 0 0;
padding: 0 0 5px 0;
}
.raceBoardNavigation-navigationitem:hover {
border-bottom: 4px solid #f0ab00;
color: #dddcdc;
text-decoration: none;
}
.raceBoardNavigation-navigationitem:active {
border-bottom: 4px solid #f0ab00;
color: #dddcdc;
text-decoration: none;
}
.abstractChartPanel-importantMessageOfChart {
font-family: 'UbuntuBold',Arial,Verdana,sans-serif;
font-size: 20px;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/AbstractEntryPoint.java
+1 -1
View File
@@ -77,7 +77,7 @@ public abstract class AbstractEntryPoint implements EntryPoint, ErrorReporter {
}
public void createErrorPage(String message) {
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel("", stringMessages);
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(stringMessages);
logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
RootPanel.get().add(logoAndTitlePanel);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/LogoAndTitlePanel.java
+31 -12
View File
@@ -6,29 +6,48 @@ import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.Label;
public class LogoAndTitlePanel extends FlowPanel {
protected Label titleLabel;
protected Label subTitleLabel;
public LogoAndTitlePanel(StringMessages stringConstants) {
this(null, null, stringConstants);
}
protected final Label titleLabel;
public LogoAndTitlePanel(String title, StringMessages stringConstants) {
this(title, null, stringConstants);
}
public LogoAndTitlePanel(String title, String subTitle, StringMessages stringConstants) {
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 labelPanel = new FlowPanel();
FlowPanel sailingAnalyticsLabelPanel = new FlowPanel();
Label sailingAnalyticsLabel = new Label(stringConstants.sapSailingAnalytics());
labelPanel.add(sailingAnalyticsLabel);
labelPanel.addStyleName("sailingAnalyticsLabelPanel");
sailingAnalyticsLabelPanel.add(sailingAnalyticsLabel);
sailingAnalyticsLabelPanel.addStyleName("sailingAnalyticsLabelPanel");
sailingAnalyticsLabel.addStyleName("sailingAnalyticsLabel boldLabel");
this.add(labelPanel);
this.add(sailingAnalyticsLabelPanel);
FlowPanel titleLabelWrapper = new FlowPanel();
titleLabelWrapper.addStyleName("titleLabelWrapper");
titleLabel = new Label(title);
titleLabel.addStyleName("titleLabel");
titleLabelWrapper.add(titleLabel);
this.add(titleLabelWrapper);
if(title != null) {
FlowPanel subTitleLabelWrapper = new FlowPanel();
subTitleLabelWrapper.addStyleName("titleLabelWrapper");
titleLabel = new Label(title);
titleLabel.addStyleName("titleLabel");
subTitleLabelWrapper.add(titleLabel);
this.add(subTitleLabelWrapper);
}
if(subTitle != null) {
FlowPanel subTitleLabelWrapper = new FlowPanel();
subTitleLabelWrapper.addStyleName("subTitleLabelWrapper");
subTitleLabel = new Label(subTitle);
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
+1 -1
View File
@@ -45,7 +45,7 @@ public class LeaderboardEntryPoint extends AbstractEntryPoint {
}
private void createUI() {
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(leaderboardName, stringMessages);
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(leaderboardGroupName, stringMessages.leaderboard() + " " +leaderboardName, stringMessages);
logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
DockLayoutPanel mainPanel = new DockLayoutPanel(Unit.PX);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
+3 -11
View File
@@ -36,7 +36,6 @@ import com.google.gwt.user.client.ui.FormPanel;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.view.client.ListDataProvider;
@@ -172,7 +171,6 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
private final RaceIdentifier preSelectedRace;
private final VerticalPanel contentPanel;
private final DockPanel headerPanel;
private final HorizontalPanel refreshAndSettingsPanel;
private boolean isEmbedded = false;
@@ -234,7 +232,7 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
@Override
public Widget getHeaderWidget() {
return headerPanel;
return null;
}
@Override
@@ -985,19 +983,15 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
isEmbedded = true;
}
contentPanel = new VerticalPanel();
headerPanel = new DockPanel();
contentPanel.setStyleName("leaderboardContent");
DockPanel toolbarPanel = new DockPanel();
toolbarPanel.setStyleName("leaderboardContent-toolbar");
busyIndicator = new SimpleBusyIndicator(false, 0.8f);
if (!isEmbedded) {
toolbarPanel.add(busyIndicator, DockPanel.WEST);
}
headerPanel.setWidth("100%");
headerPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
toolbarPanel.setWidth("100%");
toolbarPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
Label leaderboardLabel = new Label(stringMessages.leaderboard() + " " + leaderboardName.toUpperCase());
leaderboardLabel.addStyleName("leaderboardLabel boldLabel");
headerPanel.add(leaderboardLabel, DockPanel.WEST);
ClickHandler playPauseHandler = new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
@@ -1019,7 +1013,6 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
refreshPanel.setSpacing(5);
refreshPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
refreshPanel.addStyleName("refreshPanel");
headerPanel.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_RIGHT);
toolbarPanel.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_RIGHT);
toolbarPanel.addStyleName("refreshAndSettings");
playPause = new Anchor(getPlayPauseImgHtml(timer.getPlayState()));
@@ -1042,7 +1035,6 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
refreshAndSettingsPanel.add(settingsAnchor);
toolbarPanel.add(refreshAndSettingsPanel, DockPanel.EAST);
if (!isEmbedded) {
contentPanel.add(headerPanel);
contentPanel.add(toolbarPanel);
}
contentPanel.add(getLeaderboardTable());
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);
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(stringMessages.editScores(), stringMessages);
logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
EditableLeaderboardPanel leaderboardPanel = new EditableLeaderboardPanel(sailingService, new AsyncActionsExecutor(), leaderboardName, null,
LeaderboardEditPage.this, stringMessages, userAgentType);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
+4 -3
View File
@@ -12,6 +12,7 @@ import com.google.gwt.user.client.ui.RootLayoutPanel;
import com.sap.sailing.domain.common.DefaultLeaderboardName;
import com.sap.sailing.domain.common.RegattaAndRaceIdentifier;
import com.sap.sailing.gwt.ui.client.AbstractEntryPoint;
import com.sap.sailing.gwt.ui.client.LogoAndTitlePanel;
import com.sap.sailing.gwt.ui.client.ParallelExecutionCallback;
import com.sap.sailing.gwt.ui.client.ParallelExecutionHolder;
import com.sap.sailing.gwt.ui.client.RaceSelectionModel;
@@ -60,7 +61,7 @@ public class RaceBoardEntryPoint extends AbstractEntryPoint {
leaderboardGroupName = leaderboardGroupNameParamValue;
}
if (regattaName == null || regattaName.isEmpty() || raceName == null || raceName.isEmpty()) {
createErrorPage("This page requires a valid event name and race name.");
createErrorPage("This page requires a valid regatta name and race name.");
return;
}
final ParallelExecutionCallback<List<String>> getLeaderboardNamesCallback = new ParallelExecutionCallback<List<String>>();
@@ -119,7 +120,7 @@ public class RaceBoardEntryPoint extends AbstractEntryPoint {
}
selectedRace = findRace(regattaName, raceName, regattas);
if (selectedRace == null) {
createErrorPage("Could not obtain a race with name " + raceName + " for an regatta with name " + regattaName);
createErrorPage("Could not obtain a race with name " + raceName + " for a regatta with name " + regattaName);
return;
}
@@ -168,7 +169,7 @@ public class RaceBoardEntryPoint extends AbstractEntryPoint {
}
private FlowPanel createLogoAndTitlePanel(RaceBoardPanel raceBoardPanel) {
RaceBoardLogoAndTitlePanel logoAndTitlePanel = new RaceBoardLogoAndTitlePanel(selectedRace, stringMessages);
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(regattaName, selectedRace.name, stringMessages);
logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
FlowPanel globalNavigationPanel = new GlobalNavigationPanel(stringMessages, true, leaderboardName, leaderboardGroupName);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardLogoAndTitlePanel.java
-21
View File
@@ -1,21 +0,0 @@
package com.sap.sailing.gwt.ui.raceboard;
import com.google.gwt.i18n.client.DateTimeFormat;
import com.sap.sailing.gwt.ui.client.LogoAndTitlePanel;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.shared.RaceDTO;
public class RaceBoardLogoAndTitlePanel extends LogoAndTitlePanel {
private final DateTimeFormat dateFormatter = DateTimeFormat.getFormat(DateTimeFormat.PredefinedFormat.DATE_MEDIUM);
public RaceBoardLogoAndTitlePanel(RaceDTO raceDTO, StringMessages stringConstants) {
super(raceDTO.name, stringConstants);
String headlineText = raceDTO.name;
if(raceDTO.startOfRace != null) {
headlineText += " / " + dateFormatter.format(raceDTO.startOfRace);
}
titleLabel.setText(headlineText);
}
}