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

minor layout adjustments to the leaderboard group view

Browse Source
This commit is contained in:
fmittag committed 2012-06-17 15:58:58 +02:00
1 parent 2596ab9ee3
commit c0a49b7a0f
2 files changed
+39 -85
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/Spectator.css
+16 -68
View File
@@ -143,28 +143,6 @@ input.magnifier {
margin: 3px auto 0 auto !important;
}
.timeLinePanel {
width: 100%;
position: fixed;
bottom: 0;
height: 101px;
z-index: 1000;
}
.timeLineInnerPanel {
height: 100%;
margin: 0 12px;
background: #dddcdc;
padding: 24px 24px 0 24px;
}
.timeLineInnerBgPanel {
background: #f6f6f6;
border-top-left-radius: 6px;
border-top-right-radius: 6px;
height: 80px;
}
.footerShadowPanel {
position: fixed;
height: 50px;
@@ -183,43 +161,6 @@ input.magnifier {
width: 100%;
}
.raceBoardPanelHeader {
}
.raceBoardPanelHeader-name {
font-size: 24px;
text-transform: uppercase;
color: #a1a1a1;
font-weight: 400;
}
.raceBoardNavigation {
float: right;
margin: 26px 0 0 0;
}
.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;
}
.leaderboardGroupPanel-GroupName {
margin: 0 0 10px 0;
}
@@ -268,7 +209,7 @@ input.magnifier {
-webkit-border-radius: 4px;
}
.leaderboardGroupPanel-ActiveRace, .leaderboardGroupPanel-ActiveLeaderboard, .leaderboardGroupPanel-InactiveRace {
.leaderboardGroupPanel-ActiveRace, .leaderboardGroupPanel-InactiveRace {
padding: 5px 8px;
display: block;
float: left;
@@ -283,6 +224,21 @@ input.magnifier {
font-family: 'UbuntuBold', Arial, Verdana, sans-serif;
}
.leaderboardGroupPanel-ActiveLeaderboard {
padding: 5px 8px;
display: block;
float: left;
margin: 5px 5px 5px 10px;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
background: url("images/btn-cta-orangeleft.png") repeat-x -10px 0 #e7e7e7;
text-decoration: none;
color: #fff;
/*border: 1px solid #a6a6a6;*/
font-family: 'UbuntuBold', Arial, Verdana, sans-serif;
}
.leaderboardGroupPanel-ActiveRace:visited, .leaderboardGroupPanel-ActiveLeaderboard:visited{
color: #fff;
}
@@ -294,14 +250,6 @@ input.magnifier {
/*border: 1px solid #f1af10;*/
}
.leaderboardGroupPanel-ActiveRace {
}
.leaderboardGroupPanel-InactiveRace {
}
.welcomeWidget-WelcomePanel{
float: left;
max-width: 1000px;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java
+23 -17
View File
@@ -185,7 +185,7 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget
}
}
};
LeaderboardGroupFullTableResources tableResources = GWT.create(LeaderboardGroupFullTableResources.class);
CellTable<StrippedLeaderboardDTO> leaderboardsTable = new CellTable<StrippedLeaderboardDTO>(200, tableResources);
leaderboardsTable.setSelectionModel(new NoSelectionModel<StrippedLeaderboardDTO>());
@@ -242,30 +242,36 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget
}
// the fleetGroups each are assumed to correspond to a fleet
boolean hasMultipleFleetGroups = fleetGroups.size() > 1;
for (Map<String,Pair<FleetDTO, List<RaceColumnDTO>>> fleetGroup : fleetGroups) {
b.appendHtmlConstant("<div style=\"float:left; margin-left:20px;\">");
// one row per fleet
boolean hasMultipleFleet = fleetGroup.keySet().size() > 1;
for (String fleetName : fleetGroup.keySet()) {
Pair<FleetDTO, List<RaceColumnDTO>> pair = fleetGroup.get(fleetName);
FleetDTO fleet = pair.getA();
List<RaceColumnDTO> raceColumns = pair.getB();
Color color = fleet.getColor();
if (color != null) {
b.append(COLORBOXTEMPLATE.colorBox(color.getAsHtml(), STYLE_NAME_PREFIX + "ColorBox"));
} else {
b.append(COLORBOXTEMPLATE.nocolorBox(STYLE_NAME_PREFIX + "ColorBox"));
// show the "fleet" and the color only if there are more than one fleet in this fleet group and a color has been set
if (hasMultipleFleet) {
if(color != null) {
b.append(COLORBOXTEMPLATE.colorBox(color.getAsHtml(), STYLE_NAME_PREFIX + "ColorBox"));
}
b.append(TEXTTEMPLATE.textWithClass(fleetName, 50, STYLE_NAME_PREFIX + "Fleet"));
} else if(hasMultipleFleetGroups) {
String displayName = fleetName;
if("Default".equals(fleetName)) {
if(raceColumns.get(0) != null && raceColumns.get(0).isMedalRace()) {
displayName = stringConstants.medalRace();
} else {
displayName = stringConstants.race();
}
}
b.append(TEXTTEMPLATE.textWithClass(displayName, 50, STYLE_NAME_PREFIX + "Fleet"));
}
// show the "fleet" name only if there are more than one fleet in this fleet group and a color has been set
String displayFleetName;
if (fleetGroup.keySet().size() > 1 || color != null) {
displayFleetName = fleetName;
} else {
displayFleetName = "";
}
b.append(TEXTTEMPLATE.textWithClass(displayFleetName, 50, STYLE_NAME_PREFIX + "Fleet"));
for (RaceColumnDTO race : pair.getB()) {
for (RaceColumnDTO race : raceColumns) {
String linkText = race.getRaceColumnName();
if (race.getRaceIdentifier(pair.getA()) != null) {
RegattaNameAndRaceName raceId = (RegattaNameAndRaceName) race.getRaceIdentifier(pair.getA());
if (race.getRaceIdentifier(fleet) != null) {
RegattaNameAndRaceName raceId = (RegattaNameAndRaceName) race.getRaceIdentifier(fleet);
String link = URLFactory.INSTANCE.encode("/gwt/RaceBoard.html?leaderboardName=" + leaderboard.name
+ "&raceName=" + raceId.getRaceName() + "&root=" + root + raceId.getRaceName()
+ "&regattaName=" + raceId.getRegattaName() + "&leaderboardGroupName=" + group.name);