From da00fd8a514135f12cfd122a9ada63236c03e6c0 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Fri, 3 Aug 2012 16:08:05 +0200
Subject: [PATCH] Modified the cockpit
---
Kieker.WebGUI/src/main/webapp/Cockpit.xhtml | 30 +++++++++++--------
.../src/main/webapp/CockpitEditor.xhtml | 2 +-
.../src/main/webapp/Controller.xhtml | 2 +-
.../src/main/webapp/ProjectOverview.xhtml | 2 +-
Kieker.WebGUI/src/main/webapp/css/Cockpit.css | 7 ++++-
5 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/Kieker.WebGUI/src/main/webapp/Cockpit.xhtml b/Kieker.WebGUI/src/main/webapp/Cockpit.xhtml
index d8b1420d..31ecb088 100644
--- a/Kieker.WebGUI/src/main/webapp/Cockpit.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/Cockpit.xhtml
@@ -7,11 +7,11 @@
xmlns:p="http://primefaces.org/ui"
xmlns:c="http://java.sun.com/jsp/jstl/core">
- <f:metadata>
- <f:viewParam name="projectName" value="#{currentCockpitBean.projectName}"/>
- <f:event type="preRenderView" listener="#{currentCockpitBean.initalize()}" />
+ <f:metadata>
+ <f:viewParam name="projectName" value="#{currentCockpitBean.projectName}"/>
+ <f:event type="preRenderView" listener="#{currentCockpitBean.initalize()}" />
</f:metadata>
-
+
<h:head>
<title>Kieker.WebGUI</title>
<link rel="stylesheet" type="text/css" href="../css/Common.css" />
@@ -59,7 +59,7 @@
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-comment" value=" About..." onclick="aboutDlg.show()" ajax="true"/>
</p:submenu>
- <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" disabled="true"/>
+ <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" url="login"/>
</p:menubar>
</h:form>
@@ -77,16 +77,22 @@
</p:layoutUnit>
<p:layoutUnit position="west" size="300" header="Views" resizable="true" collapsible="true">
- <h:form id="viewsForm">
+ <h:form id="viewForm">
<p:poll interval="1" update=":centerForm"/>
- <p:accordionPanel multiple="true" activeIndex="" value="#{currentCockpitBean.project.views}" var="currView">
- <p:tab title="#{currView.name}">
+ <p:dataList value="#{currentCockpitBean.project.views}" var="currView">
+ <p:commandLink style="#{currView == currentCockpitBean.activeView ? 'font-weight:bold' : ''}" value="#{currView.name}" action="#{currentCockpitBean.setActiveView(currView)}" id="viewLink" update=":viewForm"/>
+ <p:tooltip for="viewLink">
+ <b><h:outputText value="#{currView.name}"/></b>
+ <br/>
<h:outputText value="#{currView.description}" rendered="#{not empty currView.description}"/>
<h:outputText value="No description available." rendered="#{empty currView.description}"/>
- <hr/>
- Click <h:commandLink value="here" action="#{currentCockpitBean.setActiveView(currView)}"/> to activate this view.
- </p:tab>
- </p:accordionPanel>
+ <br/><br/>
+ <b><h:outputText value="Displays"/></b>
+ <p:dataList value="#{currView.displayConnectors}" var="connector">
+ #{connector.getName()}
+ </p:dataList>
+ </p:tooltip>
+ </p:dataList>
</h:form>
</p:layoutUnit>
</p:layout>
diff --git a/Kieker.WebGUI/src/main/webapp/CockpitEditor.xhtml b/Kieker.WebGUI/src/main/webapp/CockpitEditor.xhtml
index 452ace23..d0782ba6 100644
--- a/Kieker.WebGUI/src/main/webapp/CockpitEditor.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/CockpitEditor.xhtml
@@ -64,7 +64,7 @@
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-comment" value=" About..." onclick="aboutDlg.show()" ajax="true"/>
</p:submenu>
- <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" disabled="true"/>
+ <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" url="login"/>
</p:menubar>
</h:form>
diff --git a/Kieker.WebGUI/src/main/webapp/Controller.xhtml b/Kieker.WebGUI/src/main/webapp/Controller.xhtml
index 3665b9f1..9c54e906 100644
--- a/Kieker.WebGUI/src/main/webapp/Controller.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/Controller.xhtml
@@ -60,7 +60,7 @@
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-comment" value=" About..." onclick="aboutDlg.show()" ajax="true"/>
</p:submenu>
- <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" disabled="true"/>
+ <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" url="login"/>
</p:menubar>
</h:form>
diff --git a/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml b/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml
index f2b13ec5..387aadcb 100644
--- a/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml
@@ -55,7 +55,7 @@
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-comment" value=" About..." onclick="aboutDlg.show()" ajax="true"/>
</p:submenu>
- <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" disabled="true"/>
+ <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" url="login"/>
</p:menubar>
</h:form>
</p:layoutUnit>
diff --git a/Kieker.WebGUI/src/main/webapp/css/Cockpit.css b/Kieker.WebGUI/src/main/webapp/css/Cockpit.css
index 92fd9a4c..f76427d5 100644
--- a/Kieker.WebGUI/src/main/webapp/css/Cockpit.css
+++ b/Kieker.WebGUI/src/main/webapp/css/Cockpit.css
@@ -1,5 +1,10 @@
-.@charset "UTF-8";
+@charset "UTF-8";
ui-dashboard-column {
width: 50%
+}
+
+/* This is necessary to remove the border from the datalist */
+.ui-datalist * {
+ border : 0px !important;
}
\ No newline at end of file
--
GitLab