diff --git a/Kieker.WebGUI/src/main/webapp/AnalysisEditor.xhtml b/Kieker.WebGUI/src/main/webapp/AnalysisEditor.xhtml
index d7179a7b797b8705c34bb128a8bcfc8ebf617eaa..1713f9e4625e6bf95b6eaab124ea64c30533a1c5 100644
--- a/Kieker.WebGUI/src/main/webapp/AnalysisEditor.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/AnalysisEditor.xhtml
@@ -54,9 +54,9 @@
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-bookmark" value=" Manage Libraries" onclick="manageLibrariesDialog.show()" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project}"/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-shuffle" ajax="true" value=" Edit Connections" update=":connectionDialogForm" onclick="connectionDialog.show();" disabled="#{empty currentWorkSpaceProjectBean.project}"/>
<p:separator />
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-circle-close" value=" Close Project" action="#{currentWorkSpaceProjectBean.clearProject()}" ajax="false"/>
- <p:separator />
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-gear" value=" Settings" onclick="settingsDlg.show()" ajax="true"/>
+ <p:separator />
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-circle-close" value=" Close Project" action="#{currentWorkSpaceProjectBean.clearProject()}" ajax="false"/>
</p:submenu>
<p:submenu label="Help">
@@ -172,7 +172,7 @@
<!-- ******************************************************************************** -->
</p:layout>
- <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="false"/>
+ <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
<!-- Include the dialog for the configuration. -->
<ui:include src="dialogs/settingsDialog.xhtml" />
diff --git a/Kieker.WebGUI/src/main/webapp/Cockpit.xhtml b/Kieker.WebGUI/src/main/webapp/Cockpit.xhtml
index 314bc14d340767b4c92d7c5c3f656c2f4da816c2..91d887692ed60d6bae2300951fc7f8ff4e1474ea 100644
--- a/Kieker.WebGUI/src/main/webapp/Cockpit.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/Cockpit.xhtml
@@ -18,32 +18,36 @@
<!-- This is the layout for the whole page. -->
<p:layout id="layout" fullPage="true">
- <p:layoutUnit position="north" collapsible="false" header="Kieker.WebGUI - Cockpit (#{currentAnalysisCockpitProjectBean.projectName})">
+ <p:layoutUnit position="north" collapsible="false">
<h:form>
- <p:menubar>
- <p:submenu label="File">
- <p:menuitem value="Close Cockpit" action="#{currentAnalysisCockpitProjectBean.clearProject()}" ajax="false"/>
+ <p:toolbar>
+ <p:toolbarGroup align="left">
+ <h:outputText styleClass="kieker-title" value="Kieker » #{stringBean.shortenLongName(currentWorkSpaceProjectBean.projectName, 30)}"/>
+ </p:toolbarGroup>
+ <p:toolbarGroup align="right">
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-home" />
<p:separator/>
- <p:menuitem value="Settings" onclick="settingsDlg.show()" ajax="true"/>
- </p:submenu>
-
- <p:submenu label="View">
- <p:menuitem value="Project Overview"/>
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Analysis Editor" style="white-space: none" ajax="false" action="#{currentWorkSpaceProjectBean.setProject(projectsBean.openProject(project), project)}"/>
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-circle-triangle-e" value="Analysis" ajax="false" action="#{currentControllerBean.setProject(projectsBean.openProject(project), project)}" />
<p:separator/>
- <p:menuitem value="Analysis Editor"/>
- <p:menuitem value="Cockpit Editor"/>
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Cockpit Editor" ajax="false" action="#{currentCockpitEditorBean.setProject(projectsBean.openProject(project), project)}" />
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" ajax="false" disabled="true" action="#{currentAnalysisCockpitProjectBean.setProject(projectsBean.openProject(project), project)}" />
+ </p:toolbarGroup>
+ </p:toolbar>
+ <p:menubar>
+ <p:submenu label="File">
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-gear" value=" Settings" onclick="settingsDlg.show()" ajax="true"/>
<p:separator/>
- <p:menuitem value="Controller"/>
- <p:menuitem value="Cockpit" disabled="true"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-circle-close" value=" Close Project" action="#{currentAnalysisCockpitProjectBean.clearProject()}" ajax="false"/>
</p:submenu>
<p:submenu label="Help">
- <p:menuitem value="User Guide" ajax="true" disabled="true"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-help" value=" User Guide" ajax="true" disabled="true"/>
<p:separator/>
- <p:menuitem value="About..." onclick="aboutDlg.show()" ajax="true"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-comment" value=" About..." onclick="aboutDlg.show()" ajax="true"/>
</p:submenu>
- <p:menuitem styleClass="logOutButton" disabled="true" value="#{userBean.userName} [Log Out]" ajax="true"/>
+ <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" disabled="true"/>
</p:menubar>
</h:form>
@@ -75,7 +79,7 @@
</p:layoutUnit>
</p:layout>
- <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="false"/>
+ <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
<!-- Include the dialog for the configuration. -->
<ui:include src="dialogs/settingsDialog.xhtml" />
diff --git a/Kieker.WebGUI/src/main/webapp/CockpitEditor.xhtml b/Kieker.WebGUI/src/main/webapp/CockpitEditor.xhtml
index 2721e26aac9020eed291cb43cbc93c48b82a5977..c6c9567022267284aa48a991f31770e08dc837e1 100644
--- a/Kieker.WebGUI/src/main/webapp/CockpitEditor.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/CockpitEditor.xhtml
@@ -16,42 +16,44 @@
<h:body>
<p:layout id="layout" fullPage="true">
- <p:layoutUnit position="north" collapsible="false" header="Kieker.WebGUI - Cockpit Editor (#{currentCockpitEditorBean.projectName})">
+ <p:layoutUnit position="north" collapsible="false">
<h:form>
- <p:menubar>
- <p:submenu label="File">
- <p:menuitem value="New View" onclick="newViewDialog.show()" ajax="true"/>
+ <p:toolbar>
+ <p:toolbarGroup align="left">
+ <h:outputText styleClass="kieker-title" value="Kieker » #{stringBean.shortenLongName(currentWorkSpaceProjectBean.projectName, 30)}"/>
+ </p:toolbarGroup>
+ <p:toolbarGroup align="right">
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-home" />
<p:separator/>
- <p:menuitem value="Save Project" update=":messages" ajax="true" action="#{currentCockpitEditorBean.saveProject(false)}" disabled="#{empty currentCockpitEditorBean.project}"/>
- <p:menuitem value="Save Project As" update=":messages" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project}"/>
- <p:menuitem styleClass="Force-Save-Project-Button" value="Force Save Project" update=":messages" ajax="true" action="#{currentCockpitEditorBean.saveProject(true)}" disabled="#{empty currentCockpitEditorBean.project}"/>
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Analysis Editor" style="white-space: none" ajax="false" action="#{currentWorkSpaceProjectBean.setProject(projectsBean.openProject(project), project)}"/>
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-circle-triangle-e" value="Analysis" ajax="false" action="#{currentControllerBean.setProject(projectsBean.openProject(project), project)}" />
<p:separator/>
- <p:menuitem value="Reload Project" ajax="true" disabled="#{empty currentCockpitEditorBean.project or true}"/>
- <p:separator/>
- <p:menuitem value="New View" ajax="true" disabled="true"/>
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Cockpit Editor" ajax="false" disabled="true" action="#{currentCockpitEditorBean.setProject(projectsBean.openProject(project), project)}" />
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" ajax="false" action="#{currentAnalysisCockpitProjectBean.setProject(projectsBean.openProject(project), project)}" />
+ </p:toolbarGroup>
+ </p:toolbar>
+ <p:menubar>
+ <p:submenu label="File">
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-document" value=" New View" onclick="newViewDialog.show()" ajax="true"/>
<p:separator/>
- <p:menuitem value="Close Project" action="#{currentCockpitEditorBean.clearProject()}" ajax="false"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-disk" value=" Save Project" update=":messages" ajax="true" action="#{currentCockpitEditorBean.saveProject(false)}" disabled="#{empty currentCockpitEditorBean.project}"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-disk" value=" Save Project As" update=":messages" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project}"/>
+ <p:menuitem styleClass="element-with-whitespace Force-Save-Project-Button" icon="ui-icon-alert" value=" Force Save Project" update=":messages" ajax="true" action="#{currentCockpitEditorBean.saveProject(true)}" disabled="#{empty currentCockpitEditorBean.project}"/>
<p:separator/>
- <p:menuitem value="Settings" onclick="settingsDlg.show()" ajax="true"/>
- </p:submenu>
-
- <p:submenu label="View">
- <p:menuitem value="Project Overview"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-refresh" value=" Reload Project" ajax="true" disabled="#{empty currentCockpitEditorBean.project or true}"/>
<p:separator/>
- <p:menuitem value="Analysis Editor"/>
- <p:menuitem value="Cockpit Editor" disabled="true"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-gear" value=" Settings" onclick="settingsDlg.show()" ajax="true"/>
<p:separator/>
- <p:menuitem value="Controller"/>
- <p:menuitem value="Cockpit"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-circle-close" value=" Close Project" action="#{currentCockpitEditorBean.clearProject()}" ajax="false"/>
</p:submenu>
<p:submenu label="Help">
- <p:menuitem value="User Guide" ajax="true" disabled="true"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-help" value=" User Guide" ajax="true" disabled="true"/>
<p:separator/>
- <p:menuitem value="About..." onclick="aboutDlg.show()" ajax="true"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-comment" value=" About..." onclick="aboutDlg.show()" ajax="true"/>
</p:submenu>
- <p:menuitem styleClass="logOutButton" disabled="true" value="#{userBean.userName} [Log Out]" ajax="true"/>
+ <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" disabled="true"/>
</p:menubar>
</h:form>
@@ -99,7 +101,7 @@
</p:layoutUnit>
</p:layout>
- <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="false"/>
+ <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
<!-- Include the dialog for the configuration. -->
<ui:include src="dialogs/settingsDialog.xhtml" />
diff --git a/Kieker.WebGUI/src/main/webapp/Controller.xhtml b/Kieker.WebGUI/src/main/webapp/Controller.xhtml
index c1c873d1ebd858dd606b98c7a7c515b727e4f95c..92a6902822876ac96e3ba5b3eaa31b551a8f9d7a 100644
--- a/Kieker.WebGUI/src/main/webapp/Controller.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/Controller.xhtml
@@ -18,32 +18,37 @@
<!-- This is the layout for the whole page. -->
<p:layout id="layout" fullPage="true">
- <p:layoutUnit position="north" collapsible="false" header="Kieker.WebGUI - Controller (#{currentControllerBean.projectName})">
+ <p:layoutUnit position="north" collapsible="false">
<h:form>
- <p:menubar>
- <p:submenu label="File">
- <p:menuitem value="Close Controller" action="#{currentControllerBean.clearProject()}" ajax="false"/>
+ <p:toolbar>
+ <p:toolbarGroup align="left">
+ <h:outputText styleClass="kieker-title" value="Kieker » #{stringBean.shortenLongName(currentWorkSpaceProjectBean.projectName, 30)}"/>
+ </p:toolbarGroup>
+ <p:toolbarGroup align="right">
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-home" />
<p:separator/>
- <p:menuitem value="Settings" onclick="settingsDlg.show()" ajax="true"/>
- </p:submenu>
-
- <p:submenu label="View">
- <p:menuitem value="Project Overview"/>
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Analysis Editor" style="white-space: none" ajax="false" action="#{currentWorkSpaceProjectBean.setProject(projectsBean.openProject(project), project)}"/>
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-circle-triangle-e" value="Analysis" ajax="false" disabled="true" action="#{currentControllerBean.setProject(projectsBean.openProject(project), project)}" />
<p:separator/>
- <p:menuitem value="Analysis Editor"/>
- <p:menuitem value="Cockpit Editor"/>
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Cockpit Editor" ajax="false" action="#{currentCockpitEditorBean.setProject(projectsBean.openProject(project), project)}" />
+ <p:commandButton styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" ajax="false" action="#{currentAnalysisCockpitProjectBean.setProject(projectsBean.openProject(project), project)}" />
+ </p:toolbarGroup>
+ </p:toolbar>
+
+ <p:menubar>
+ <p:submenu label="File">
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-gear" value=" Settings" onclick="settingsDlg.show()" ajax="true"/>
<p:separator/>
- <p:menuitem value="Controller" disabled="true"/>
- <p:menuitem value="Cockpit"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-circle-close" value=" Close Controller" action="#{currentControllerBean.clearProject()}" ajax="false"/>
</p:submenu>
<p:submenu label="Help">
- <p:menuitem value="User Guide" ajax="true" disabled="true"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-help" value=" User Guide" ajax="true" disabled="true"/>
<p:separator/>
- <p:menuitem value="About..." onclick="aboutDlg.show()" ajax="true"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-comment" value=" About..." onclick="aboutDlg.show()" ajax="true"/>
</p:submenu>
- <p:menuitem styleClass="logOutButton" disabled="true" value="#{userBean.userName} [Log Out]" ajax="true"/>
+ <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" disabled="true"/>
</p:menubar>
</h:form>
@@ -90,7 +95,7 @@
</p:layoutUnit>
</p:layout>
- <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="false"/>
+ <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
<!-- Include the dialog for the configuration. -->
<ui:include src="dialogs/settingsDialog.xhtml" />
diff --git a/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml b/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml
index 1b8ba6a791cae247367396ad2e1f0477b1b48aca..5b0cc5b58239468d330aa7edc3198b4b7acd6b34 100644
--- a/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml
@@ -54,7 +54,7 @@
<!-- Abstand zu Icons -->
<p:layoutUnit position="center">
<h:form id="projectsListForm">
- <p:dataTable rows="15" paginator="true" paginatorPosition="both" var="project" rowsPerPageTemplate="5,10,15,25,50" value="#{currentProjectOverviewBean.projects}" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}">
+ <p:dataTable rows="15" paginator="true" paginatorPosition="both" var="project" rowsPerPageTemplate="5,10,15,25,50" value="#{currentProjectOverviewBean.projects}" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" selection="#{currentProjectOverviewBean.projectName}" rowKey="#{project}" selectionMode="single">
<p:column headerText="Project Name" id="modelHeader" sortBy="#{project}">
<p:commandLink id="dynaButton" value="#{project}"/>
@@ -89,7 +89,7 @@
</p:layout>
- <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="false"/>
+ <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
<!-- Include the about-dialog. -->
<ui:include src="dialogs/aboutDialog.xhtml" />
diff --git a/Kieker.WebGUI/src/main/webapp/img/kieker-logo-transparent.png b/Kieker.WebGUI/src/main/webapp/img/kieker-logo-transparent.png
index 148262685e69a5e2f6808fb641f8a6f00934ef1e..78a143c849e7bdc1274d47a748897ad017919aa3 100644
Binary files a/Kieker.WebGUI/src/main/webapp/img/kieker-logo-transparent.png and b/Kieker.WebGUI/src/main/webapp/img/kieker-logo-transparent.png differ