mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-30 17:36:40 +00:00
Merge remote-tracking branch 'server/gwt' into gwt
This commit is contained in:
commit
3acab78f5b
2 files changed
-9
No files matched your search
-6
@@ -70,7 +70,6 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget
|
||||
}
|
||||
|
||||
mainPanel = new FlowPanel();
|
||||
mainPanel.setWidth("95%");
|
||||
add(mainPanel);
|
||||
loadGroup(groupName);
|
||||
}
|
||||
@@ -122,7 +121,6 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget
|
||||
if (group.leaderboards.size() <= MAX_COLUMNS_IN_ROW) {
|
||||
LeaderboardGroupFullTableResources tableResources = GWT.create(LeaderboardGroupFullTableResources.class);
|
||||
CellTable<Integer> leaderboardsTable = new CellTable<Integer>(200, tableResources);
|
||||
leaderboardsTable.setWidth("100%");
|
||||
leaderboardsTable.setSelectionModel(new NoSelectionModel<Integer>());
|
||||
|
||||
int maxRacesNum = 0;
|
||||
@@ -172,13 +170,10 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget
|
||||
|
||||
LeaderboardGroupCompactTableResources tableResources = GWT.create(LeaderboardGroupCompactTableResources.class);
|
||||
CellTable<LeaderboardDTO> leaderboardsTable = new CellTable<LeaderboardDTO>(200, tableResources);
|
||||
leaderboardsTable.setWidth("100%");
|
||||
leaderboardsTable.setSelectionModel(new NoSelectionModel<LeaderboardDTO>());
|
||||
|
||||
leaderboardsTable.addColumn(nameColumn, stringConstants.name());
|
||||
leaderboardsTable.setColumnWidth(nameColumn, "30%");
|
||||
leaderboardsTable.addColumn(racesColumn, stringConstants.races());
|
||||
leaderboardsTable.setColumnWidth(racesColumn, "70%");
|
||||
|
||||
leaderboardsTable.setRowData(group.leaderboards);
|
||||
mainPanel.add(leaderboardsTable);
|
||||
@@ -255,7 +250,6 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget
|
||||
public void setWelcomeWidget(WelcomeWidget welcome) {
|
||||
boolean needsToBeInserted = welcomeWidget == null;
|
||||
welcomeWidget = welcome;
|
||||
welcomeWidget.setWidth("100%");
|
||||
if (needsToBeInserted) {
|
||||
mainPanel.insert(welcomeWidget, 0);
|
||||
}
|
||||
|
||||
-3
@@ -43,13 +43,11 @@ public class SpectatorEntryPoint extends AbstractEntryPoint implements EventRefr
|
||||
root = (root.equals("leaderboardGroupPanel") || root.equals("overview")) ? root : null;
|
||||
}
|
||||
RootPanel rootPanel = RootPanel.get();
|
||||
rootPanel.setSize("100%", "100%");
|
||||
|
||||
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(stringMessages);
|
||||
logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
|
||||
rootPanel.add(logoAndTitlePanel);
|
||||
|
||||
//TODO Create LeaderboardGroupPanel if groupName is filled
|
||||
FormPanel panelToDisplay = null;
|
||||
if (groupName == null) {
|
||||
panelToDisplay = new OverviewEventPanel(sailingService, this, this, stringMessages);
|
||||
@@ -59,7 +57,6 @@ public class SpectatorEntryPoint extends AbstractEntryPoint implements EventRefr
|
||||
groupPanel.setWelcomeWidget(new ClosableWelcomeWidget(true, stringMessages.welcomeToSailingAnalytics(),
|
||||
"Ipsum lorum\nHello World!", stringMessages));
|
||||
}
|
||||
panelToDisplay.setSize("100%", "100%");
|
||||
rootPanel.add(panelToDisplay);
|
||||
|
||||
fillEvents();
|
||||
|
||||
Reference in new issue
Block a user