bug4338 Integrated language selection widget into AdminConsole.html and

adjusted footer to avoid hiding on lower resolution screens
This commit is contained in:
Benjamin Barth
2017-10-13 14:55:39 +02:00
parent 249bb6f54a
commit e62b9c03e4
3 changed files with 12 additions and 10 deletions
@@ -12,9 +12,9 @@ import com.google.gwt.event.logical.shared.SelectionEvent;
import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.event.logical.shared.SelectionHandler;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.user.client.ui.Anchor; 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.DockPanel;
import com.google.gwt.user.client.ui.HasHorizontalAlignment; 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.ScrollPanel;
import com.google.gwt.user.client.ui.TabLayoutPanel; import com.google.gwt.user.client.ui.TabLayoutPanel;
import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.Widget;
@@ -22,6 +22,7 @@ import com.sap.sse.common.Util.Triple;
import com.sap.sse.gwt.client.AbstractEntryPoint; import com.sap.sse.gwt.client.AbstractEntryPoint;
import com.sap.sse.gwt.client.ErrorReporter; import com.sap.sse.gwt.client.ErrorReporter;
import com.sap.sse.gwt.client.ServerInfoRetriever; import com.sap.sse.gwt.client.ServerInfoRetriever;
import com.sap.sse.gwt.client.controls.languageselect.LanguageSelector;
import com.sap.sse.gwt.client.panels.AbstractTabLayoutPanel; import com.sap.sse.gwt.client.panels.AbstractTabLayoutPanel;
import com.sap.sse.gwt.client.panels.HorizontalTabLayoutPanel; import com.sap.sse.gwt.client.panels.HorizontalTabLayoutPanel;
import com.sap.sse.gwt.client.panels.VerticalTabLayoutPanel; import com.sap.sse.gwt.client.panels.VerticalTabLayoutPanel;
@@ -67,7 +68,7 @@ import com.sap.sse.security.ui.shared.UserDTO;
* @author Axel Uhl (D043530) * @author Axel Uhl (D043530)
* *
*/ */
public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelectable{ public class AdminConsolePanel extends HeaderPanel implements HandleTabSelectable {
private final UserService userService; private final UserService userService;
/** /**
@@ -153,7 +154,6 @@ public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelec
public AdminConsolePanel(UserService userService, PermissionsForRoleProvider permissionsForRoleProvider, public AdminConsolePanel(UserService userService, PermissionsForRoleProvider permissionsForRoleProvider,
ServerInfoRetriever buildVersionRetriever, String releaseNotesAnchorLabel, ServerInfoRetriever buildVersionRetriever, String releaseNotesAnchorLabel,
String releaseNotesURL, ErrorReporter errorReporter, LoginPanelCss loginPanelCss, StringMessages stringMessages) { String releaseNotesURL, ErrorReporter errorReporter, LoginPanelCss loginPanelCss, StringMessages stringMessages) {
super(Unit.EM);
this.permissionsForRoleProvider = permissionsForRoleProvider; this.permissionsForRoleProvider = permissionsForRoleProvider;
this.permissionsAnyOfWhichIsRequiredToSeeWidget = new HashMap<>(); this.permissionsAnyOfWhichIsRequiredToSeeWidget = new HashMap<>();
this.userService = userService; this.userService = userService;
@@ -203,17 +203,21 @@ public class AdminConsolePanel extends DockLayoutPanel implements HandleTabSelec
} }
}; };
final DockPanel informationPanel = new DockPanel(); final DockPanel informationPanel = new DockPanel();
informationPanel.setSize("100%", "95%"); informationPanel.setWidth("100%");
informationPanel.setSpacing(10); informationPanel.setSpacing(10);
informationPanel.add(errorReporter.getPersistentInformationWidget(), DockPanel.CENTER); informationPanel.add(errorReporter.getPersistentInformationWidget(), DockPanel.CENTER);
SystemInformationPanel sysinfoPanel = new SystemInformationPanel(buildVersionRetriever, errorReporter, stringMessages); SystemInformationPanel sysinfoPanel = new SystemInformationPanel(buildVersionRetriever, errorReporter, stringMessages);
sysinfoPanel.ensureDebugId("SystemInformation"); sysinfoPanel.ensureDebugId("SystemInformation");
final Anchor releaseNotesLink = new Anchor(new SafeHtmlBuilder().appendEscaped(releaseNotesAnchorLabel).toSafeHtml(), releaseNotesURL); final Anchor releaseNotesLink = new Anchor(new SafeHtmlBuilder().appendEscaped(releaseNotesAnchorLabel).toSafeHtml(), releaseNotesURL);
sysinfoPanel.add(releaseNotesLink); sysinfoPanel.add(releaseNotesLink);
final LanguageSelector languageSelector = new LanguageSelector();
languageSelector.getElement().getStyle().setMarginLeft(1, Unit.EM);
sysinfoPanel.add(languageSelector);
informationPanel.add(sysinfoPanel, DockPanel.EAST); informationPanel.add(sysinfoPanel, DockPanel.EAST);
informationPanel.setCellHorizontalAlignment(sysinfoPanel, HasHorizontalAlignment.ALIGN_RIGHT); informationPanel.setCellHorizontalAlignment(sysinfoPanel, HasHorizontalAlignment.ALIGN_RIGHT);
this.addSouth(informationPanel, 2.5); this.setFooterWidget(informationPanel);
this.add(topLevelTabPanel); topLevelTabPanel.setSize("100%", "100%");
this.setContentWidget(topLevelTabPanel);
} }
/** /**
@@ -29,6 +29,7 @@ Export-Package: com.google.gwt.user.client.rpc.core.java.util,
com.sap.sse.gwt.client.controls.busyindicator, com.sap.sse.gwt.client.controls.busyindicator,
com.sap.sse.gwt.client.controls.carousel, com.sap.sse.gwt.client.controls.carousel,
com.sap.sse.gwt.client.controls.filestorage, com.sap.sse.gwt.client.controls.filestorage,
com.sap.sse.gwt.client.controls.languageselect,
com.sap.sse.gwt.client.controls.listedit, com.sap.sse.gwt.client.controls.listedit,
com.sap.sse.gwt.client.controls.slider, com.sap.sse.gwt.client.controls.slider,
com.sap.sse.gwt.client.dialog, com.sap.sse.gwt.client.dialog,
@@ -1,7 +1,4 @@
@external gwt-VerticalTabLayoutPanel; @external gwt-VerticalTabLayoutPanel;
.gwt-VerticalTabLayoutPanel {
margin-left: 5px;
}
.gwt-VerticalTabLayoutPanel>div { .gwt-VerticalTabLayoutPanel>div {
position: static !important; position: static !important;
} }