From a6efd768aa4205a579195fc1d9e462ffb3e34693 Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Tue, 30 Oct 2012 13:50:14 +0100 Subject: [PATCH] embedd hsarweb in index.jsp --- hsarweb/WebContent/index.jsp | 19 ++++++++++++++++++- .../src/de/hsadmin/web/MainApplication.java | 12 +----------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/hsarweb/WebContent/index.jsp b/hsarweb/WebContent/index.jsp index 28fd4ea..83c6cf9 100644 --- a/hsarweb/WebContent/index.jsp +++ b/hsarweb/WebContent/index.jsp @@ -5,8 +5,25 @@ HSAdmin Web Client + + + - + +

HSAdmin Web

+
\ No newline at end of file diff --git a/hsarweb/src/de/hsadmin/web/MainApplication.java b/hsarweb/src/de/hsadmin/web/MainApplication.java index 9d87716..5a883c9 100644 --- a/hsarweb/src/de/hsadmin/web/MainApplication.java +++ b/hsarweb/src/de/hsadmin/web/MainApplication.java @@ -18,11 +18,9 @@ import com.vaadin.terminal.Terminal; import com.vaadin.terminal.ThemeResource; import com.vaadin.terminal.gwt.server.HttpServletRequestListener; import com.vaadin.ui.Component; -import com.vaadin.ui.CustomLayout; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; import com.vaadin.ui.TabSheet.Tab; -import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; import com.vaadin.ui.Window.Notification; @@ -71,10 +69,6 @@ public class MainApplication extends Application implements HttpServletRequestLi showSystemException(e); } Window mainWindow = new Window(localeConfig.getText("applicationtitle")); - VerticalLayout verticalLayout = new VerticalLayout(); - verticalLayout.setSizeFull(); - CustomLayout banner = new CustomLayout("../../hs/layout/header"); - verticalLayout.addComponent(banner); TabSheet tabs = new TabSheet(); tabs.setSizeFull(); String modulesParamString = localeConfig.getText("modules." + role); @@ -96,11 +90,7 @@ public class MainApplication extends Application implements HttpServletRequestLi } } tabs.addListener(this); - verticalLayout.addComponent(tabs); - verticalLayout.setExpandRatio(tabs, 1.0f); - CustomLayout footer = new CustomLayout("../../hs/layout/footer"); - verticalLayout.addComponent(footer); - mainWindow.setContent(verticalLayout); + mainWindow.setContent(tabs); setMainWindow(mainWindow); setErrorHandler(new Terminal.ErrorListener() { private static final long serialVersionUID = 1L;