hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

embedd hsarweb in index.jsp

Browse Source
This commit is contained in:
Peter Hormanns 2012-10-30 13:50:14 +01:00
parent 34242861e7
commit a6efd768aa
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hsarweb/WebContent/index.jsp
View File

@ -5,8 +5,25 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>HSAdmin Web Client</title>
<script type="text/javascript">
var vaadin = {
vaadinConfigurations: {
'hsarweb': {
appUri:'/hsarweb/MainApplication',
pathInfo: '/',
themeUri: '/hsarweb/VAADIN/themes/hs',
versionInfo : {}
}
}};
</script>
<script language='javascript' src='/hsarweb/VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/com.vaadin.terminal.gwt.DefaultWidgetSet.nocache.js'>
</script>
<link rel="stylesheet" type="text/css" href="/hsarweb/VAADIN/themes/reindeer/styles.css"/>
</head>
<body>
<iframe id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe>
<h1>HSAdmin Web</h1>
<div id="hsarweb" style="width:100%;height:800px;"
class="v-app v-app-loading v-theme-reindeer v-app-MainApplication"> </div>
</body>
</html>

12
hsarweb/src/de/hsadmin/web/MainApplication.java
View File

@ -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;