mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-25 06:58:39 +00:00
Merge branch 'master' into permission-vertical
This commit is contained in:
@@ -5,8 +5,8 @@ Bundle-SymbolicName: com.sap.sse.gwt.adminconsole
|
||||
Bundle-Version: 1.0.0.qualifier
|
||||
Bundle-Vendor: SAP
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Require-Bundle: com.google.gwt.user;bundle-version="2.8.1";resolution:=optional,
|
||||
com.google.gwt.servlet;bundle-version="2.8.1",
|
||||
Require-Bundle: com.google.gwt.user;bundle-version="2.8.2";resolution:=optional,
|
||||
com.google.gwt.servlet;bundle-version="2.8.2",
|
||||
com.sap.sse.gwt,
|
||||
com.sap.sse.security.ui,
|
||||
com.sap.sse.security,
|
||||
|
||||
+8
-8
@@ -12,9 +12,9 @@ import com.google.gwt.event.logical.shared.SelectionEvent;
|
||||
import com.google.gwt.event.logical.shared.SelectionHandler;
|
||||
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
|
||||
import com.google.gwt.user.client.ui.Anchor;
|
||||
import com.google.gwt.user.client.ui.DockLayoutPanel;
|
||||
import com.google.gwt.user.client.ui.DockPanel;
|
||||
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
|
||||
import com.google.gwt.user.client.ui.HeaderPanel;
|
||||
import com.google.gwt.user.client.ui.ScrollPanel;
|
||||
import com.google.gwt.user.client.ui.TabLayoutPanel;
|
||||
import com.google.gwt.user.client.ui.Widget;
|
||||
@@ -67,7 +67,7 @@ import com.sap.sse.security.ui.shared.UserDTO;
|
||||
* @author Axel Uhl (D043530)
|
||||
*
|
||||
*/
|
||||
public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelectable{
|
||||
public class AdminConsolePanel extends HeaderPanel implements HandleTabSelectable {
|
||||
private final UserService userService;
|
||||
|
||||
/**
|
||||
@@ -153,7 +153,6 @@ public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelec
|
||||
public AdminConsolePanel(UserService userService, PermissionsForRoleProvider permissionsForRoleProvider,
|
||||
ServerInfoRetriever buildVersionRetriever, String releaseNotesAnchorLabel,
|
||||
String releaseNotesURL, ErrorReporter errorReporter, LoginPanelCss loginPanelCss, StringMessages stringMessages) {
|
||||
super(Unit.EM);
|
||||
this.permissionsForRoleProvider = permissionsForRoleProvider;
|
||||
this.permissionsAnyOfWhichIsRequiredToSeeWidget = new HashMap<>();
|
||||
this.userService = userService;
|
||||
@@ -161,7 +160,7 @@ public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelec
|
||||
this.panelsByWidget = new HashMap<>();
|
||||
getUserService().addUserStatusEventHandler(new UserStatusEventHandler() {
|
||||
@Override
|
||||
public void onUserStatusChange(UserDTO user) {
|
||||
public void onUserStatusChange(UserDTO user, boolean preAuthenticated) {
|
||||
updateTabDisplayForCurrentUser(user);
|
||||
}
|
||||
});
|
||||
@@ -203,7 +202,7 @@ public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelec
|
||||
}
|
||||
};
|
||||
final DockPanel informationPanel = new DockPanel();
|
||||
informationPanel.setSize("100%", "95%");
|
||||
informationPanel.setWidth("100%");
|
||||
informationPanel.setSpacing(10);
|
||||
informationPanel.add(errorReporter.getPersistentInformationWidget(), DockPanel.CENTER);
|
||||
SystemInformationPanel sysinfoPanel = new SystemInformationPanel(buildVersionRetriever, errorReporter, stringMessages);
|
||||
@@ -211,9 +210,10 @@ public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelec
|
||||
final Anchor releaseNotesLink = new Anchor(new SafeHtmlBuilder().appendEscaped(releaseNotesAnchorLabel).toSafeHtml(), releaseNotesURL);
|
||||
sysinfoPanel.add(releaseNotesLink);
|
||||
informationPanel.add(sysinfoPanel, DockPanel.EAST);
|
||||
informationPanel.setCellHorizontalAlignment(sysinfoPanel, HasHorizontalAlignment.ALIGN_RIGHT);
|
||||
this.addSouth(informationPanel, 2.5);
|
||||
this.add(topLevelTabPanel);
|
||||
informationPanel.setCellHorizontalAlignment(sysinfoPanel, HasHorizontalAlignment.ALIGN_RIGHT);
|
||||
this.setFooterWidget(informationPanel);
|
||||
topLevelTabPanel.setSize("100%", "100%");
|
||||
this.setContentWidget(topLevelTabPanel);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user