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

Corrected some links and added navigation cases.

parent 614129e1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 87 additions and 41 deletions
Kieker.WebGUI/src/main/resources/global.properties
+ 1
− 1
View file @ cc259970
...@@ -22,4 +22,4 @@ kieker.webgui.config.analysisEditor.defaultGridColor = 0080FF ...@@ -22,4 +22,4 @@ kieker.webgui.config.analysisEditor.defaultGridColor = 0080FF
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
kieker.webgui.page.projectOverview = ProjectOverviewPage.xhtml?faces-redirect=true kieker.webgui.page.projectOverview = projectOverview
Kieker.WebGUI/src/main/webapp/AnalysisEditorPage.xhtml
+ 8
− 6
View file @ cc259970
...@@ -68,16 +68,18 @@ ...@@ -68,16 +68,18 @@
<h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentAnalysisEditorBean.projectName, 30)}"/> <h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentAnalysisEditorBean.projectName, 30)}"/>
</p:toolbarGroup> </p:toolbarGroup>
<p:toolbarGroup align="right"> <p:toolbarGroup align="right">
<p:commandButton styleClass="perspective-button" icon="ui-icon-home" action="ProjectOverviewPage.xhtml?faces-redirect=true" /> <p:button styleClass="perspective-button" icon="ui-icon-home" outcome="projectOverview" />
<p:separator/> <p:separator/>
<p:button styleClass="perspective-button" icon="ui-icon-analysisEditor" value="#{localizedMessages.analysisEditor}" disabled="true"/> <p:button styleClass="perspective-button" icon="ui-icon-analysisEditor" value="#{localizedMessages.analysisEditor}" style="white-space: none" disabled="true"/>
<p:button styleClass="perspective-button" icon="ui-icon-analysis" value="#{localizedMessages.analysis}" outcome="ControllerPage.xhtml?faces-redirect=true"> <p:button styleClass="perspective-button" icon="ui-icon-analysis" value="#{localizedMessages.analysis}" style="white-space: none" outcome="controller">
<f:param name="projectName" value="#{currentAnalysisEditorBean.projectName}" rendered="#{not empty currentAnalysisEditorBean.projectName}" /> <f:param name="projectName" value="#{currentAnalysisEditorBean.projectName}" rendered="#{not empty currentAnalysisEditorBean.projectName}"/>
</p:button> </p:button>
<p:separator/> <p:separator/>
<p:button styleClass="perspective-button" icon="ui-icon-cockpitEditor" value="#{localizedMessages.cockpitEditor}" disabled="true"> <p:button styleClass="perspective-button" icon="ui-icon-cockpitEditor" value="#{localizedMessages.cockpitEditor}" style="white-space: none" outcome="cockpitEditor">
<f:param name="projectName" value="#{currentAnalysisEditorBean.projectName}" rendered="#{not empty currentAnalysisEditorBean.projectName}"/>
</p:button> </p:button>
<p:button styleClass="perspective-button" icon="ui-icon-cockpit" value="#{localizedMessages.cockpit}" disabled="true"> <p:button styleClass="perspective-button" icon="ui-icon-cockpit" value="#{localizedMessages.cockpit}" style="white-space: none" outcome="cockpit">
<f:param name="projectName" value="#{currentAnalysisEditorBean.projectName}" rendered="#{not empty currentAnalysisEditorBean.projectName}"/>
</p:button> </p:button>
</p:toolbarGroup> </p:toolbarGroup>
</p:toolbar> </p:toolbar>
......
Kieker.WebGUI/src/main/webapp/CockpitEditorPage.xhtml
+ 9
− 9
View file @ cc259970
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<h:head> <h:head>
<title>Kieker.WebGUI</title> <title>Kieker.WebGUI</title>
<link rel="stylesheet" type="text/css" href="../css/Common.css" /> <link rel="stylesheet" type="text/css" href="../css/Common.css" />
<link rel="stylesheet" type="text/css" href="../css/Icons.css" />
<link rel="stylesheet" type="text/css" href="../css/CockpitEditorPage.css" /> <link rel="stylesheet" type="text/css" href="../css/CockpitEditorPage.css" />
</h:head> </h:head>
...@@ -30,19 +31,18 @@ ...@@ -30,19 +31,18 @@
<h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentCockpitEditorBean.projectName, 30)}"/> <h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentCockpitEditorBean.projectName, 30)}"/>
</p:toolbarGroup> </p:toolbarGroup>
<p:toolbarGroup align="right"> <p:toolbarGroup align="right">
<p:commandButton styleClass="perspective-button" icon="ui-icon-home" action="ProjectOverview.xhtml" /> <p:button styleClass="perspective-button" icon="ui-icon-home" outcome="projectOverview" />
<p:separator/> <p:separator/>
<p:button styleClass="perspective-button" icon="ui-icon-wrench" value="Analysis Editor" style="white-space: none" outcome="AnalysisEditorPage.xhtml"> <p:button styleClass="perspective-button" icon="ui-icon-analysisEditor" value="#{localizedMessages.analysisEditor}" style="white-space: none" outcome="analysisEditor" >
<f:param name="projectName" value="#{currentCockpitEditorBean.projectName}" /> <f:param name="projectName" value="#{currentCockpitEditorBean.projectName}" rendered="#{not empty currentCockpitEditorBean.projectName}"/>
</p:button> </p:button>
<p:button styleClass="perspective-button" icon="ui-icon-circle-triangle-e" value="Analysis" style="white-space: none" outcome="ControllerPage.xhtml"> <p:button styleClass="perspective-button" icon="ui-icon-analysis" value="#{localizedMessages.analysis}" style="white-space: none" outcome="controller">
<f:param name="projectName" value="#{currentCockpitEditorBean.projectName}" /> <f:param name="projectName" value="#{currentCockpitEditorBean.projectName}" rendered="#{not empty currentCockpitEditorBean.projectName}"/>
</p:button> </p:button>
<p:separator/> <p:separator/>
<p:button styleClass="perspective-button" icon="ui-icon-wrench" value="Cockpit Editor" style="white-space: none" disabled="true"> <p:button styleClass="perspective-button" icon="ui-icon-cockpitEditor" value="#{localizedMessages.cockpitEditor}" style="white-space: none" disabled="true"/>
</p:button> <p:button styleClass="perspective-button" icon="ui-icon-cockpit" value="#{localizedMessages.cockpit}" style="white-space: none" outcome="cockpit">
<p:button styleClass="perspective-button" icon="ui-icon-image" value="Cockpit" style="white-space: none" outcome="CockpitPage.xhtml"> <f:param name="projectName" value="#{currentCockpitEditorBean.projectName}" rendered="#{not empty currentCockpitEditorBean.projectName}"/>
<f:param name="projectName" value="#{currentCockpitEditorBean.projectName}" />
</p:button> </p:button>
</p:toolbarGroup> </p:toolbarGroup>
</p:toolbar> </p:toolbar>
......
Kieker.WebGUI/src/main/webapp/CockpitPage.xhtml
+ 9
− 9
View file @ cc259970
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<h:head> <h:head>
<title>Kieker.WebGUI</title> <title>Kieker.WebGUI</title>
<link rel="stylesheet" type="text/css" href="../css/Common.css" /> <link rel="stylesheet" type="text/css" href="../css/Common.css" />
<link rel="stylesheet" type="text/css" href="../css/Icons.css" />
<link rel="stylesheet" type="text/css" href="../css/CockpitPage.css" /> <link rel="stylesheet" type="text/css" href="../css/CockpitPage.css" />
</h:head> </h:head>
...@@ -32,20 +33,19 @@ ...@@ -32,20 +33,19 @@
<h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentCockpitBean.projectName, 30)}"/> <h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentCockpitBean.projectName, 30)}"/>
</p:toolbarGroup> </p:toolbarGroup>
<p:toolbarGroup align="right"> <p:toolbarGroup align="right">
<p:commandButton styleClass="perspective-button" icon="ui-icon-home" action="ProjectOverview.xhtml" /> <p:button styleClass="perspective-button" icon="ui-icon-home" outcome="projectOverview" />
<p:separator/> <p:separator/>
<p:button styleClass="perspective-button" icon="ui-icon-wrench" value="#{localizedMessages.analysisEditor}" style="white-space: none" outcome="AnalysisEditor.xhtml"> <p:button styleClass="perspective-button" icon="ui-icon-analysisEditor" value="#{localizedMessages.analysisEditor}" style="white-space: none" outcome="analysisEditor" >
<f:param name="projectName" value="#{currentCockpitBean.projectName}" /> <f:param name="projectName" value="#{currentCockpitBean.projectName}" rendered="#{not empty currentCockpitBean.projectName}"/>
</p:button> </p:button>
<p:button styleClass="perspective-button" icon="ui-icon-circle-triangle-e" value="#{localizedMessages.analysis}" style="white-space: none" outcome="Controller.xhtml"> <p:button styleClass="perspective-button" icon="ui-icon-analysis" value="#{localizedMessages.analysis}" style="white-space: none" outcome="controller">
<f:param name="projectName" value="#{currentCockpitBean.projectName}" /> <f:param name="projectName" value="#{currentCockpitBean.projectName}" rendered="#{not empty currentCockpitBean.projectName}"/>
</p:button> </p:button>
<p:separator/> <p:separator/>
<p:button styleClass="perspective-button" icon="ui-icon-wrench" value="#{localizedMessages.cockpitEditor}" style="white-space: none" outcome="CockpitEditor.xhtml"> <p:button styleClass="perspective-button" icon="ui-icon-cockpitEditor" value="#{localizedMessages.cockpitEditor}" style="white-space: none" outcome="cockpitEditor">
<f:param name="projectName" value="#{currentCockpitBean.projectName}" /> <f:param name="projectName" value="#{currentCockpitBean.projectName}" rendered="#{not empty currentCockpitBean.projectName}"/>
</p:button>
<p:button styleClass="perspective-button" icon="ui-icon-image" value="#{localizedMessages.cockpit}" style="white-space: none" disabled="true">
</p:button> </p:button>
<p:button styleClass="perspective-button" icon="ui-icon-cockpit" value="#{localizedMessages.cockpit}" style="white-space: none" disabled="true"/>
</p:toolbarGroup> </p:toolbarGroup>
</p:toolbar> </p:toolbar>
<p:menubar> <p:menubar>
......
Kieker.WebGUI/src/main/webapp/ControllerPage.xhtml
+ 8
− 7
View file @ cc259970
...@@ -32,17 +32,18 @@ ...@@ -32,17 +32,18 @@
<h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentControllerBean.projectName, 30)}"/> <h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentControllerBean.projectName, 30)}"/>
</p:toolbarGroup> </p:toolbarGroup>
<p:toolbarGroup align="right"> <p:toolbarGroup align="right">
<p:commandButton styleClass="perspective-button" icon="ui-icon-home" action="ProjectOverviewPage.xhtml?faces-redirect=true" /> <p:button styleClass="perspective-button" icon="ui-icon-home" outcome="projectOverview" />
<p:separator/> <p:separator/>
<p:button styleClass="perspective-button" icon="ui-icon-analysisEditor" value="#{localizedMessages.analysisEditor}" style="white-space: none" outcome="AnalysisEditorPage.xhtml?faces-redirect=true"> <p:button styleClass="perspective-button" icon="ui-icon-analysisEditor" value="#{localizedMessages.analysisEditor}" style="white-space: none" outcome="analysisEditor" >
<f:param name="projectName" value="#{currentControllerBean.projectName}" rendered="#{not empty currentControllerBean.projectName}" /> <f:param name="projectName" value="#{currentControllerBean.projectName}" rendered="#{not empty currentControllerBean.projectName}"/>
</p:button>
<p:button styleClass="perspective-button" icon="ui-icon-analysis" value="#{localizedMessages.analysis}" style="white-space: none" disabled="true">
</p:button> </p:button>
<p:button styleClass="perspective-button" icon="ui-icon-analysis" value="#{localizedMessages.analysis}" style="white-space: none" disabled="true"/>
<p:separator/> <p:separator/>
<p:button styleClass="perspective-button" icon="ui-icon-cockpitEditor" value="#{localizedMessages.cockpitEditor}" disabled="true"> <p:button styleClass="perspective-button" icon="ui-icon-cockpitEditor" value="#{localizedMessages.cockpitEditor}" style="white-space: none" outcome="cockpitEditor">
<f:param name="projectName" value="#{currentControllerBean.projectName}" rendered="#{not empty currentControllerBean.projectName}"/>
</p:button> </p:button>
<p:button styleClass="perspective-button" icon="ui-icon-cockpit" value="#{localizedMessages.cockpit}" disabled="true"> <p:button styleClass="perspective-button" icon="ui-icon-cockpit" value="#{localizedMessages.cockpit}" style="white-space: none" outcome="cockpit">
<f:param name="projectName" value="#{currentControllerBean.projectName}" rendered="#{not empty currentControllerBean.projectName}"/>
</p:button> </p:button>
</p:toolbarGroup> </p:toolbarGroup>
</p:toolbar> </p:toolbar>
......
Kieker.WebGUI/src/main/webapp/LoginPage.xhtml
+ 1
− 1
View file @ cc259970
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<p:spacer width="0" height="40"/> <p:spacer width="0" height="40"/>
<div class="hint-panel"> <div class="hint-panel">
<h:outputText value="#{localizedLoginMessages.hint}"/> <h:outputText value="#{localizedLoginMessages.hint}"/>
</div> </div>
<p:growl sticky="true" autoUpdate="true" widgetVar="growlComp"/> <p:growl sticky="true" autoUpdate="true" widgetVar="growlComp"/>
......
Kieker.WebGUI/src/main/webapp/ProjectOverviewPage.xhtml
+ 10
− 8
View file @ cc259970
...@@ -25,18 +25,20 @@ ...@@ -25,18 +25,20 @@
<h:outputText styleClass="kieker-title" value="Kieker"/> <h:outputText styleClass="kieker-title" value="Kieker"/>
</p:toolbarGroup> </p:toolbarGroup>
<p:toolbarGroup align="right"> <p:toolbarGroup align="right">
<p:commandButton styleClass="perspective-button" icon="ui-icon-home" disabled="true" /> <p:button styleClass="perspective-button" icon="ui-icon-home" disabled="true" />
<p:separator/> <p:separator/>
<p:button styleClass="perspective-button" icon="ui-icon-analysisEditor" value="#{localizedMessages.analysisEditor}" style="white-space: none" outcome="AnalysisEditorPage.xhtml?faces-redirect=true"> <p:button styleClass="perspective-button" icon="ui-icon-analysisEditor" value="#{localizedMessages.analysisEditor}" style="white-space: none" outcome="analysisEditor" >
<f:param name="projectName" value="#{currentProjectOverviewBean.projectName}" rendered="#{not empty currentProjectOverviewBean.projectName}"/> <f:param name="projectName" value="#{currentProjectOverviewBean.projectName}" rendered="#{not empty currentProjectOverviewBean.projectName}"/>
</p:button> </p:button>
<p:button styleClass="perspective-button" icon="ui-icon-analysis" value="#{localizedMessages.analysis}" style="white-space: none" outcome="ControllerPage.xhtml?faces-redirect=true"> <p:button styleClass="perspective-button" icon="ui-icon-analysis" value="#{localizedMessages.analysis}" style="white-space: none" outcome="controller">
<f:param name="projectName" value="#{currentProjectOverviewBean.projectName}" rendered="#{not empty currentProjectOverviewBean.projectName}"/> <f:param name="projectName" value="#{currentProjectOverviewBean.projectName}" rendered="#{not empty currentProjectOverviewBean.projectName}"/>
</p:button> </p:button>
<p:separator/> <p:separator/>
<p:button styleClass="perspective-button" icon="ui-icon-cockpitEditor" value="#{localizedMessages.cockpitEditor}" disabled="true"> <p:button styleClass="perspective-button" icon="ui-icon-cockpitEditor" value="#{localizedMessages.cockpitEditor}" style="white-space: none" outcome="cockpitEditor">
<f:param name="projectName" value="#{currentProjectOverviewBean.projectName}" rendered="#{not empty currentProjectOverviewBean.projectName}"/>
</p:button> </p:button>
<p:button styleClass="perspective-button" icon="ui-icon-cockpit" value="#{localizedMessages.cockpit}" disabled="true"> <p:button styleClass="perspective-button" icon="ui-icon-cockpit" value="#{localizedMessages.cockpit}" style="white-space: none" outcome="cockpit">
<f:param name="projectName" value="#{currentProjectOverviewBean.projectName}" rendered="#{not empty currentProjectOverviewBean.projectName}"/>
</p:button> </p:button>
</p:toolbarGroup> </p:toolbarGroup>
</p:toolbar> </p:toolbar>
...@@ -48,8 +50,8 @@ ...@@ -48,8 +50,8 @@
<p:separator/> <p:separator/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-reload" value=" #{localizedProjectOverviewMessages.refreshProjectsList}" update=":projectsListForm" action="#{currentProjectOverviewBean.updateLists()}" ajax="true"/> <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-reload" value=" #{localizedProjectOverviewMessages.refreshProjectsList}" update=":projectsListForm" action="#{currentProjectOverviewBean.updateLists()}" ajax="true"/>
<p:separator/> <p:separator/>
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-settings" value=" #{localizedMessages.settings}" onclick="settingsDlg.show()" ajax="true"/> <p:menuitem styleClass="element-with-witespace" icon="ui-icon-settings" value=" #{localizedMessages.settings}" onclick="settingsDlg.show()" ajax="true"/>
</p:submenu> </p:submenu>h
<p:submenu label="#{localizedMessages.help}"> <p:submenu label="#{localizedMessages.help}">
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-userGuide" value=" #{localizedMessages.userGuide}" ajax="true" disabled="true"/> <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-userGuide" value=" #{localizedMessages.userGuide}" ajax="true" disabled="true"/>
...@@ -78,7 +80,7 @@ ...@@ -78,7 +80,7 @@
<p:separator/> <p:separator/>
<p:menuitem icon="ui-icon-cockpitEditor" id="editAnalysisViews" styleClass="element-with-whitespace" value=" #{localizedMessages.cockpitEditor}" ajax="false" url="cockpitEditor?projectName=#{project}" /> <p:menuitem icon="ui-icon-cockpitEditor" id="editAnalysisViews" styleClass="element-with-whitespace" value=" #{localizedMessages.cockpitEditor}" ajax="false" url="cockpitEditor?projectName=#{project}" />
<p:menuitem icon="ui-icon-cockpit" id="showAnalysis" styleClass="element-with-whitespace" value=" #{localizedMessages.cockpit}" ajax="false" disabled="true" /> <p:menuitem icon="ui-icon-cockpit" id="showAnalysis" styleClass="element-with-whitespace" value=" #{localizedMessages.cockpit}" ajax="false" url="cockpit?projectName=#{project}" />
<p:separator/> <p:separator/>
<p:menuitem id="copyButton" icon="ui-icon-copy" styleClass="element-with-whitespace" value=" #{localizedProjectOverviewMessages.copyProject}" action="#{currentProjectOverviewBean.setProjectName(project)}" onclick="copyProjectDialog.show()"/> <p:menuitem id="copyButton" icon="ui-icon-copy" styleClass="element-with-whitespace" value=" #{localizedProjectOverviewMessages.copyProject}" action="#{currentProjectOverviewBean.setProjectName(project)}" onclick="copyProjectDialog.show()"/>
<p:menuitem id="renameButton" icon="ui-icon-edit" styleClass="element-with-whitespace" value=" #{localizedProjectOverviewMessages.renameProject}" action="#{currentProjectOverviewBean.setProjectName(project)}" onclick="renameProjectDialog.show()" disabled="true"/> <p:menuitem id="renameButton" icon="ui-icon-edit" styleClass="element-with-whitespace" value=" #{localizedProjectOverviewMessages.renameProject}" action="#{currentProjectOverviewBean.setProjectName(project)}" onclick="renameProjectDialog.show()" disabled="true"/>
......
Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml
+ 41
− 0
View file @ cc259970
...@@ -12,4 +12,45 @@ ...@@ -12,4 +12,45 @@
</locale-config> </locale-config>
</application> </application>
<navigation-rule>
<navigation-case>
<from-outcome>projectOverview</from-outcome>
<to-view-id>ProjectOverviewPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>analysisEditor</from-outcome>
<to-view-id>AnalysisEditorPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>cockpitEditor</from-outcome>
<to-view-id>CockpitEditorPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>cockpit</from-outcome>
<to-view-id>CockpitPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>controller</from-outcome>
<to-view-id>ControllerPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>login</from-outcome>
<to-view-id>LoginPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
</faces-config> </faces-config>
\ No newline at end of file
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