Skip to content
Snippets Groups Projects
Commit 846f0878 authored by Nils Christian Ehmke's avatar Nils Christian Ehmke
Browse files

Updated the Kieker logo to a correct version; Reorganized some of the menus,... 

Updated the Kieker logo to a correct version; Reorganized some of the menus, including the icons; Set the message-components to 'sticky'; Made the data table in the overview selectable
parent 9e6e7586
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 74 additions and 63 deletions
Kieker.WebGUI/src/main/webapp/AnalysisEditor.xhtml
+ 3
− 3
View file @ 846f0878
...@@ -54,9 +54,9 @@ ...@@ -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-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: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: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: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>
<p:submenu label="Help"> <p:submenu label="Help">
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<!-- ******************************************************************************** --> <!-- ******************************************************************************** -->
</p:layout> </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. --> <!-- Include the dialog for the configuration. -->
<ui:include src="dialogs/settingsDialog.xhtml" /> <ui:include src="dialogs/settingsDialog.xhtml" />
......
Kieker.WebGUI/src/main/webapp/Cockpit.xhtml
+ 21
− 17
View file @ 846f0878
...@@ -18,32 +18,36 @@ ...@@ -18,32 +18,36 @@
<!-- This is the layout for the whole page. --> <!-- This is the layout for the whole page. -->
<p:layout id="layout" fullPage="true"> <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> <h:form>
<p:menubar> <p:toolbar>
<p:submenu label="File"> <p:toolbarGroup align="left">
<p:menuitem value="Close Cockpit" action="#{currentAnalysisCockpitProjectBean.clearProject()}" ajax="false"/> <h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentWorkSpaceProjectBean.projectName, 30)}"/>
</p:toolbarGroup>
<p:toolbarGroup align="right">
<p:commandButton styleClass="perspective-button" icon="ui-icon-home" />
<p:separator/> <p:separator/>
<p:menuitem value="Settings" onclick="settingsDlg.show()" ajax="true"/> <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:submenu> <p:commandButton styleClass="perspective-button" icon="ui-icon-circle-triangle-e" value="Analysis" ajax="false" action="#{currentControllerBean.setProject(projectsBean.openProject(project), project)}" />
<p:submenu label="View">
<p:menuitem value="Project Overview"/>
<p:separator/> <p:separator/>
<p:menuitem value="Analysis Editor"/> <p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Cockpit Editor" ajax="false" action="#{currentCockpitEditorBean.setProject(projectsBean.openProject(project), project)}" />
<p:menuitem value="Cockpit Editor"/> <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:separator/>
<p:menuitem value="Controller"/> <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-circle-close" value=" Close Project" action="#{currentAnalysisCockpitProjectBean.clearProject()}" ajax="false"/>
<p:menuitem value="Cockpit" disabled="true"/>
</p:submenu> </p:submenu>
<p:submenu label="Help"> <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: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: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> </p:menubar>
</h:form> </h:form>
...@@ -75,7 +79,7 @@ ...@@ -75,7 +79,7 @@
</p:layoutUnit> </p:layoutUnit>
</p:layout> </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. --> <!-- Include the dialog for the configuration. -->
<ui:include src="dialogs/settingsDialog.xhtml" /> <ui:include src="dialogs/settingsDialog.xhtml" />
......
Kieker.WebGUI/src/main/webapp/CockpitEditor.xhtml
+ 26
− 24
View file @ 846f0878
...@@ -16,42 +16,44 @@ ...@@ -16,42 +16,44 @@
<h:body> <h:body>
<p:layout id="layout" fullPage="true"> <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> <h:form>
<p:menubar> <p:toolbar>
<p:submenu label="File"> <p:toolbarGroup align="left">
<p:menuitem value="New View" onclick="newViewDialog.show()" ajax="true"/> <h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentWorkSpaceProjectBean.projectName, 30)}"/>
</p:toolbarGroup>
<p:toolbarGroup align="right">
<p:commandButton styleClass="perspective-button" icon="ui-icon-home" />
<p:separator/> <p:separator/>
<p:menuitem value="Save Project" update=":messages" ajax="true" action="#{currentCockpitEditorBean.saveProject(false)}" 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:menuitem value="Save Project As" update=":messages" ajax="true" disabled="#{empty currentWorkSpaceProjectBean.project}"/> <p:commandButton styleClass="perspective-button" icon="ui-icon-circle-triangle-e" value="Analysis" ajax="false" action="#{currentControllerBean.setProject(projectsBean.openProject(project), 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:separator/> <p:separator/>
<p:menuitem value="Reload Project" ajax="true" disabled="#{empty currentCockpitEditorBean.project or 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:separator/> <p:commandButton styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" ajax="false" action="#{currentAnalysisCockpitProjectBean.setProject(projectsBean.openProject(project), project)}" />
<p:menuitem value="New View" ajax="true" disabled="true"/> </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: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:separator/>
<p:menuitem value="Settings" onclick="settingsDlg.show()" ajax="true"/> <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-refresh" value=" Reload Project" ajax="true" disabled="#{empty currentCockpitEditorBean.project or true}"/>
</p:submenu>
<p:submenu label="View">
<p:menuitem value="Project Overview"/>
<p:separator/> <p:separator/>
<p:menuitem value="Analysis Editor"/> <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-gear" value=" Settings" onclick="settingsDlg.show()" ajax="true"/>
<p:menuitem value="Cockpit Editor" disabled="true"/>
<p:separator/> <p:separator/>
<p:menuitem value="Controller"/> <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-circle-close" value=" Close Project" action="#{currentCockpitEditorBean.clearProject()}" ajax="false"/>
<p:menuitem value="Cockpit"/>
</p:submenu> </p:submenu>
<p:submenu label="Help"> <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: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: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> </p:menubar>
</h:form> </h:form>
...@@ -99,7 +101,7 @@ ...@@ -99,7 +101,7 @@
</p:layoutUnit> </p:layoutUnit>
</p:layout> </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. --> <!-- Include the dialog for the configuration. -->
<ui:include src="dialogs/settingsDialog.xhtml" /> <ui:include src="dialogs/settingsDialog.xhtml" />
......
Kieker.WebGUI/src/main/webapp/Controller.xhtml
+ 22
− 17
View file @ 846f0878
...@@ -18,32 +18,37 @@ ...@@ -18,32 +18,37 @@
<!-- This is the layout for the whole page. --> <!-- This is the layout for the whole page. -->
<p:layout id="layout" fullPage="true"> <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> <h:form>
<p:menubar> <p:toolbar>
<p:submenu label="File"> <p:toolbarGroup align="left">
<p:menuitem value="Close Controller" action="#{currentControllerBean.clearProject()}" ajax="false"/> <h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentWorkSpaceProjectBean.projectName, 30)}"/>
</p:toolbarGroup>
<p:toolbarGroup align="right">
<p:commandButton styleClass="perspective-button" icon="ui-icon-home" />
<p:separator/> <p:separator/>
<p:menuitem value="Settings" onclick="settingsDlg.show()" ajax="true"/> <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:submenu> <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:submenu label="View">
<p:menuitem value="Project Overview"/>
<p:separator/> <p:separator/>
<p:menuitem value="Analysis Editor"/> <p:commandButton styleClass="perspective-button" icon="ui-icon-wrench" value="Cockpit Editor" ajax="false" action="#{currentCockpitEditorBean.setProject(projectsBean.openProject(project), project)}" />
<p:menuitem value="Cockpit Editor"/> <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:separator/>
<p:menuitem value="Controller" disabled="true"/> <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-circle-close" value=" Close Controller" action="#{currentControllerBean.clearProject()}" ajax="false"/>
<p:menuitem value="Cockpit"/>
</p:submenu> </p:submenu>
<p:submenu label="Help"> <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: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: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> </p:menubar>
</h:form> </h:form>
...@@ -90,7 +95,7 @@ ...@@ -90,7 +95,7 @@
</p:layoutUnit> </p:layoutUnit>
</p:layout> </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. --> <!-- Include the dialog for the configuration. -->
<ui:include src="dialogs/settingsDialog.xhtml" /> <ui:include src="dialogs/settingsDialog.xhtml" />
......
Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml
+ 2
− 2
View file @ 846f0878
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<!-- Abstand zu Icons --> <!-- Abstand zu Icons -->
<p:layoutUnit position="center"> <p:layoutUnit position="center">
<h:form id="projectsListForm"> <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:column headerText="Project Name" id="modelHeader" sortBy="#{project}">
<p:commandLink id="dynaButton" value="#{project}"/> <p:commandLink id="dynaButton" value="#{project}"/>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</p:layout> </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. --> <!-- Include the about-dialog. -->
<ui:include src="dialogs/aboutDialog.xhtml" /> <ui:include src="dialogs/aboutDialog.xhtml" />
......
Kieker.WebGUI/src/main/webapp/img/kieker-logo-transparent.png
+ 0
− 0
View replaced file @ 9e6e7586 View file @ 846f0878
Kieker.WebGUI/src/main/webapp/img/kieker-logo-transparent.png

22.7 KiB | W: | H:

Kieker.WebGUI/src/main/webapp/img/kieker-logo-transparent.png

15.1 KiB | W: | H:

Kieker.WebGUI/src/main/webapp/img/kieker-logo-transparent.png
Kieker.WebGUI/src/main/webapp/img/kieker-logo-transparent.png
Kieker.WebGUI/src/main/webapp/img/kieker-logo-transparent.png
Kieker.WebGUI/src/main/webapp/img/kieker-logo-transparent.png
  • 2-up
  • Swipe
  • Onion skin
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment