From 424c49b252f4c7e90c6a1a2cddf406f74d14dd58 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Wed, 24 Oct 2012 22:08:10 +0200
Subject: [PATCH] Continued with the user management; Removed some unnecessary
parts of Shiro; Continued with the template
---
Kieker.WebGUI/lib/shiro-core-1.2.0.LICENSE | 59 --
Kieker.WebGUI/lib/shiro-web-1.2.0.LICENSE | 59 --
Kieker.WebGUI/pom.xml | 10 -
.../kieker/webgui/beans/session/UserBean.java | 19 +-
.../src/main/webapp/WEB-INF/faces-config.xml | 4 +-
.../src/main/webapp/WEB-INF/pretty-config.xml | 6 +-
.../webapp/WEB-INF/spring-security-config.xml | 6 +-
Kieker.WebGUI/src/main/webapp/css/Icons.css | 4 +-
.../src/main/webapp/css/UserManagement.css | 16 +
.../dialogs/AnalysisEditorPageDialogs.xhtml | 14 +
.../dialogs/UserManagementDialogs.xhtml | 29 +
.../{UserManagment.png => UserManagement.png} | Bin
.../webapp/pages/AnalysisEditorPage.xhtml | 502 ++++++++----------
.../webapp/pages/admin/UserManagement.xhtml | 58 ++
.../webapp/pages/admin/UserManagment.xhtml | 67 ---
.../main/webapp/templates/PagesTemplate.xhtml | 14 +-
16 files changed, 376 insertions(+), 491 deletions(-)
delete mode 100644 Kieker.WebGUI/lib/shiro-core-1.2.0.LICENSE
delete mode 100644 Kieker.WebGUI/lib/shiro-web-1.2.0.LICENSE
create mode 100644 Kieker.WebGUI/src/main/webapp/css/UserManagement.css
create mode 100644 Kieker.WebGUI/src/main/webapp/dialogs/UserManagementDialogs.xhtml
rename Kieker.WebGUI/src/main/webapp/img/icons/{UserManagment.png => UserManagement.png} (100%)
create mode 100644 Kieker.WebGUI/src/main/webapp/pages/admin/UserManagement.xhtml
delete mode 100644 Kieker.WebGUI/src/main/webapp/pages/admin/UserManagment.xhtml
diff --git a/Kieker.WebGUI/lib/shiro-core-1.2.0.LICENSE b/Kieker.WebGUI/lib/shiro-core-1.2.0.LICENSE
deleted file mode 100644
index c851c25c..00000000
--- a/Kieker.WebGUI/lib/shiro-core-1.2.0.LICENSE
+++ /dev/null
@@ -1,59 +0,0 @@
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-
-You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
-
-You must cause any modified files to carry prominent notices stating that You changed the files; and
-
-
-You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-
-
-If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/Kieker.WebGUI/lib/shiro-web-1.2.0.LICENSE b/Kieker.WebGUI/lib/shiro-web-1.2.0.LICENSE
deleted file mode 100644
index c851c25c..00000000
--- a/Kieker.WebGUI/lib/shiro-web-1.2.0.LICENSE
+++ /dev/null
@@ -1,59 +0,0 @@
-Apache License
-
-Version 2.0, January 2004
-
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-
-You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
-
-You must cause any modified files to carry prominent notices stating that You changed the files; and
-
-
-You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-
-
-If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml
index 4acc4574..e7396299 100644
--- a/Kieker.WebGUI/pom.xml
+++ b/Kieker.WebGUI/pom.xml
@@ -95,16 +95,6 @@
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.6</version>
</dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-web</artifactId>
- <version>1.2.0</version>
- </dependency>
<dependency>
<groupId>com.ocpsoft</groupId>
<artifactId>prettyfaces-jsf2</artifactId>
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
index ae25e107..2d26fd22 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
@@ -17,15 +17,13 @@
package kieker.webgui.beans.session;
import java.io.Serializable;
-import java.util.Map;
-import javax.faces.context.FacesContext;
import org.springframework.beans.factory.annotation.Autowired;
-
-import kieker.webgui.beans.application.GlobalPropertiesBean;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
+import kieker.webgui.beans.application.GlobalPropertiesBean;
+
/**
* This bean contains information about the user of this session (like user name and authorization). It provides methods to perform a login into the application.<br>
* This class is a Spring managed bean with session scope. This means also that it is possible to login the same user multiple times and that is has to implement the
@@ -53,12 +51,17 @@ public final class UserBean implements Serializable {
* @return The user name.
*/
public String getUserName() {
- Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
- UserDetails userDetails = null;
+ final String username;
+
+ final Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
if (principal instanceof UserDetails) {
- userDetails = (UserDetails) principal;
+ final UserDetails userDetails = (UserDetails) principal;
+ username = userDetails.getUsername();
+ } else {
+ username = "N/A";
}
- return userDetails.getUsername();
+
+ return username;
}
/**
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml
index 9ebb72b9..66f1e72d 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml
@@ -71,8 +71,8 @@
<navigation-rule>
<navigation-case>
- <from-outcome>userManagment</from-outcome>
- <to-view-id>/pages/admin/UserManagment.xhtml</to-view-id>
+ <from-outcome>userManagement</from-outcome>
+ <to-view-id>/pages/admin/UserManagement.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
</faces-config>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml
index 969bb9c8..1e63db8a 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml
@@ -49,8 +49,8 @@
<view-id value="/faces/AccessDeniedPage.xhtml" />
</url-mapping>
- <url-mapping id="userManagment">
- <pattern value="/pages/admin/userManagment" />
- <view-id value="/faces/pages/admin/UserManagment.xhtml" />
+ <url-mapping id="userManagement">
+ <pattern value="/pages/admin/userManagement" />
+ <view-id value="/faces/pages/admin/UserManagement.xhtml" />
</url-mapping>
</pretty-config>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-config.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-config.xml
index 0186d4b7..f0d6c0d4 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-config.xml
@@ -17,8 +17,8 @@
<intercept-url pattern="/templates/**" access="denyAll"/>
<!-- The admin area is only accessible by administrators. -->
- <intercept-url pattern="/pages/admin/**" access="hasRole('ROLE_ADMIN')"/>
- <intercept-url pattern="/faces/pages/admin/**" access="hasRole('ROLE_ADMIN')"/>
+ <intercept-url pattern="/pages/admin/**" access="hasAnyRole('ROLE_ADMIN', 'ROLE_SUPER_ADMIN')"/>
+ <intercept-url pattern="/faces/pages/admin/**" access="hasAnyRole('ROLE_ADMIN', 'ROLE_SUPER_ADMIN')"/>
<!-- The is the usual user area. -->
<intercept-url pattern="/pages/**" access="isAuthenticated()"/>
@@ -32,7 +32,7 @@
<authentication-manager>
<authentication-provider>
<user-service>
- <user name="Kieker-Team" password="kieker" authorities="ROLE_USER, ROLE_ADMIN" />
+ <user name="Kieker-Team" password="kieker" authorities="ROLE_USER, ROLE_ADMIN, ROLE_SUPER_ADMIN" />
<user name="Kieker-User" password="kieker" authorities="ROLE_USER" />
</user-service>
</authentication-provider>
diff --git a/Kieker.WebGUI/src/main/webapp/css/Icons.css b/Kieker.WebGUI/src/main/webapp/css/Icons.css
index f735976a..b0df1ce0 100644
--- a/Kieker.WebGUI/src/main/webapp/css/Icons.css
+++ b/Kieker.WebGUI/src/main/webapp/css/Icons.css
@@ -108,8 +108,8 @@
width:16px;
}
-.ui-icon-userManagment {
- background: url('../img/icons/UserManagment.png') no-repeat !important;
+.ui-icon-userManagement {
+ background: url('../img/icons/UserManagement.png') no-repeat !important;
height:16px;
width:16px;
}
diff --git a/Kieker.WebGUI/src/main/webapp/css/UserManagement.css b/Kieker.WebGUI/src/main/webapp/css/UserManagement.css
new file mode 100644
index 00000000..5b51f2ee
--- /dev/null
+++ b/Kieker.WebGUI/src/main/webapp/css/UserManagement.css
@@ -0,0 +1,16 @@
+/*
+ Document : UserManagement
+ Created on : 24.10.2012, 21:58:57
+ Author : Nils Christian Ehmke
+ Description:
+ Purpose of the stylesheet follows.
+*/
+
+.col1 {
+ width: fit-content !important;
+ text-align: right;
+}
+
+.col2 {
+ text-align: left;
+}
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/dialogs/AnalysisEditorPageDialogs.xhtml b/Kieker.WebGUI/src/main/webapp/dialogs/AnalysisEditorPageDialogs.xhtml
index 910b0873..3bb92495 100644
--- a/Kieker.WebGUI/src/main/webapp/dialogs/AnalysisEditorPageDialogs.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/dialogs/AnalysisEditorPageDialogs.xhtml
@@ -40,4 +40,18 @@
</h:form>
</div>
</p:dialog>
+
+ <p:dialog header="#{localizedMessages.saveProject}" resizable="false" modal="true" widgetVar="forceSaveDlg">
+ <h:form>
+ <div style="text-align: center">
+ <h:outputText value="#{localizedAnalysisEditorPageMessages.msgProjectModified}" />
+ </div>
+ <hr/>
+ <div style="text-align: right">
+ <p:commandButton value="#{localizedMessages.yes}" action="#{currentAnalysisEditorBean.saveProject(true)}" oncomplete="forceSaveDlg.hide()" update=":messages" />
+ <p:spacer width="10px" height="10" />
+ <p:commandButton value="#{localizedMessages.cancel}" onclick="forceSaveDlg.hide()" />
+ </div>
+ </h:form>
+ </p:dialog>
</ui:composition>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/dialogs/UserManagementDialogs.xhtml b/Kieker.WebGUI/src/main/webapp/dialogs/UserManagementDialogs.xhtml
new file mode 100644
index 00000000..ef1b65a3
--- /dev/null
+++ b/Kieker.WebGUI/src/main/webapp/dialogs/UserManagementDialogs.xhtml
@@ -0,0 +1,29 @@
+<ui:composition
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:p="http://primefaces.org/ui">
+
+ <p:dialog id="newUserDialog" header="Neuer Benutzer" resizable="false" modal="true" widgetVar="newUserDlg">
+ <h:form>
+
+ <h:panelGrid columnClasses="col1 , col2" columns="2" cellpadding="5">
+ <h:outputText value="Benutzername: " />
+ <p:inputText id="newUserInputText" value="#{stringBean.string}" style="width: 100%" />
+
+ <h:outputText value="Benutzerrollen: " />
+ <p:selectBooleanCheckbox itemLabel="Benutzer"/>
+ <h:outputText value="" />
+ <p:selectBooleanCheckbox itemLabel="Administrator"/>
+ <h:outputText value="" />
+ <p:selectBooleanCheckbox itemLabel="Super-Administrator"/>
+ </h:panelGrid>
+
+ <hr/>
+ <div style="text-align: right">
+ <p:commandButton value="#{localizedMessages.ok}" oncomplete="newUserDlg.hide()"/>
+ </div>
+ </h:form>
+ </p:dialog>
+</ui:composition>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/img/icons/UserManagment.png b/Kieker.WebGUI/src/main/webapp/img/icons/UserManagement.png
similarity index 100%
rename from Kieker.WebGUI/src/main/webapp/img/icons/UserManagment.png
rename to Kieker.WebGUI/src/main/webapp/img/icons/UserManagement.png
diff --git a/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
index aee8aa6e..b3a44b8c 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
@@ -1,304 +1,262 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ xmlns:f="http://java.sun.com/jsf/core">
- <!-- The following part makes sure that the assigned parameter will be used to load the project. -->
- <f:metadata>
- <f:viewParam id="projectNameParam" name="projectName" value="#{currentAnalysisEditorBean.projectName}"/>
- <f:event type="preRenderView" listener="#{currentAnalysisEditorBean.initialize()}" />
- </f:metadata>
+ <h:head/>
- <f:loadBundle var="localizedMessages" basename="lang.Common"/>
- <f:loadBundle var="localizedAnalysisEditorPageMessages" basename="lang.AnalysisEditorPage"/>
+ <h:body>
- <h:head>
- <title>Kieker.WebGUI</title>
- <!-- Load the necessary CSS files. -->
- <link rel="stylesheet" type="text/css" href="../css/FlowEditor.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/AnalysisEditorPage.css" />
+ <ui:composition template="/templates/PagesTemplate.xhtml">
- <!-- Load the necessary JS files. -->
- <script language="javascript" type="text/javascript" src="../js/jit.js"></script>
- <script language="javascript" type="text/javascript" src="../js/flowEditor.js"></script>
+ <ui:param name="projectName" value="#{currentAnalysisEditorBean.projectName}"/>
+ <ui:param name="pagename" value="analysisEditor"/>
+ <ui:param name="showProjectName" value="true"/>
- <script>
- nodeClickListener = function(node, info, e) {
- nodeClickCommand([{name : 'ID', value : node.id}]);
- }
-
- nodeRemoveListener = function(node) {
- nodeRemoveCommand([{name : 'ID', value : node.id}]);
- }
-
- edgeCreateListener = function(sourceNode, targetNode, sourcePort, targetPort) {
- edgeCreateCommand([{name : 'sourcePortID', value : sourcePort.id},{name : 'targetPortID', value : targetPort.id}]);
- }
-
- edgeRemoveListener = function(sourceNode, targetNode, sourcePort, targetPort) {
- edgeRemoveCommand([{name : 'sourcePortID', value : sourcePort.id},{name : 'targetPortID', value : targetPort.id}]);
- }
- </script>
- </h:head>
+ <ui:define name="metaData">
+ <f:metadata>
+ <f:viewParam id="projectNameParam" name="projectName" value="#{currentAnalysisEditorBean.projectName}"/>
+ <f:event type="preRenderView" listener="#{currentAnalysisEditorBean.initialize()}" />
+ </f:metadata>
+ </ui:define>
- <h:body>
- <h:form id="hidden" style="display:none">
- <p:remoteCommand autoRun="true" name="init" action="#{currentAnalysisEditorBean.initializeGraph()}" />
- </h:form>
- <h:form id="hiddenNodeProperties" style="display:none">
- <p:remoteCommand name="nodeClickCommand" action="#{currentAnalysisEditorGraphBean.nodeClicked()}" update=":propertiesForm"/>
- <p:remoteCommand name="nodeRemoveCommand" action="#{currentAnalysisEditorGraphBean.nodeRemoved()}" update=":propertiesForm"/>
- <p:remoteCommand name="edgeCreateCommand" action="#{currentAnalysisEditorGraphBean.edgeCreated()}"/>
- <p:remoteCommand name="edgeRemoveCommand" action="#{currentAnalysisEditorGraphBean.edgeRemoved()}"/>
- </h:form>
+ <ui:define name="bundleIncludes">
+ <f:loadBundle var="localizedAnalysisEditorPageMessages" basename="lang.AnalysisEditorPage"/>
+ </ui:define>
- <p:layout fullPage="true">
+ <ui:define name="cssIncludes">
+ <link rel="stylesheet" type="text/css" href="/css/FlowEditor.css" />
+ <link rel="stylesheet" type="text/css" href="/css/AnalysisEditorPage.css" />
+ </ui:define>
- <p:layoutUnit position="north">
- <h:form id="menuForm">
- <!-- The following is the toolbar to navigate between the different pages. -->
- <p:toolbar>
- <p:toolbarGroup align="left">
- <h:outputText styleClass="kieker-title" value="Kieker » #{stringBean.shortenLongName(currentAnalysisEditorBean.projectName, 30)}"/>
- </p:toolbarGroup>
- <p:toolbarGroup align="right">
- <p:button styleClass="perspective-button" icon="ui-icon-home" outcome="projectOverview" />
- <p:separator/>
- <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}" style="white-space: none" outcome="controller">
- <f:param name="projectName" value="#{currentAnalysisEditorBean.projectName}" rendered="#{not empty currentAnalysisEditorBean.projectName}"/>
- </p:button>
- <p:separator/>
- <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 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:toolbarGroup>
- </p:toolbar>
+ <ui:define name="jsIncludes">
+ <script language="javascript" type="text/javascript" src="/js/jit.js"></script>
+ <script language="javascript" type="text/javascript" src="/js/flowEditor.js"></script>
+ </ui:define>
- <!-- The following is the main menu. -->
- <p:menubar>
- <p:submenu label="#{localizedMessages.file}">
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-save" value=" #{localizedMessages.saveProject}" update=":messages" ajax="true" action="#{currentAnalysisEditorBean.saveProject(false)}" disabled="#{empty currentAnalysisEditorBean.project}"/>
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-saveAs" value=" #{localizedMessages.saveProjectAs}" update=":messages" ajax="true" disabled="#{true or empty currentAnalysisEditorBean.project}"/>
- <p:separator />
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-reload" value=" #{localizedMessages.reloadProject}" ajax="false" url="analysisEditor?projectName=#{currentAnalysisEditorBean.projectName}" disabled="#{empty currentAnalysisEditorBean.project}" />
- <p:separator/>
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-manageLibraries" value=" #{localizedAnalysisEditorPageMessages.manageLibraries}" onclick="manageLibrariesDialog.show()" ajax="true" disabled="#{empty currentAnalysisEditorBean.project}"/>
- <p:separator />
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-settings" value=" #{localizedMessages.settings}" onclick="settingsDlg.show()" ajax="true"/>
- <p:separator />
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-close" value=" #{localizedMessages.closeProject}" action="ProjectOverviewPage.xhtml?faces-redirect=true" ajax="false"/>
- </p:submenu>
+ <ui:define name="js">
+ <script>
+ nodeClickListener = function(node, info, e) {
+ nodeClickCommand([{name : 'ID', value : node.id}]);
+ }
+
+ nodeRemoveListener = function(node) {
+ nodeRemoveCommand([{name : 'ID', value : node.id}]);
+ }
+
+ edgeCreateListener = function(sourceNode, targetNode, sourcePort, targetPort) {
+ edgeCreateCommand([{name : 'sourcePortID', value : sourcePort.id},{name : 'targetPortID', value : targetPort.id}]);
+ }
+
+ edgeRemoveListener = function(sourceNode, targetNode, sourcePort, targetPort) {
+ edgeRemoveCommand([{name : 'sourcePortID', value : sourcePort.id},{name : 'targetPortID', value : targetPort.id}]);
+ }
+ </script>
+ </ui:define>
- <p:submenu label="Graph">
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-scaleToFitSmall" value=" #{localizedAnalysisEditorPageMessages.analysisEditorScaleToFit}" ajax="true" action="#{currentAnalysisEditorGraphBean.scaleToFit()}" />
- <p:separator/>
- <p:menuitem styleClass="element-with-whitespace" icon="#{currentAnalysisEditorGraphBean.gridEnabled ? 'ui-icon-gridEnabledSmall' : 'ui-icon-gridDisabledSmall'}" value=" #{localizedAnalysisEditorPageMessages.grid} #{currentAnalysisEditorGraphBean.gridEnabled ? localizedAnalysisEditorPageMessages.disable : localizedAnalysisEditorPageMessages.enable}" ajax="true" action="#{currentAnalysisEditorGraphBean.switchGrid()}" update=":menuForm"/>
- <p:menuitem styleClass="element-with-whitespace" icon="#{currentAnalysisEditorGraphBean.snapEnabled ? 'ui-icon-snapEnabledSmall' : 'ui-icon-snapDisabledSmall'}" value=" #{localizedAnalysisEditorPageMessages.snap} #{currentAnalysisEditorGraphBean.snapEnabled ? localizedAnalysisEditorPageMessages.disable: localizedAnalysisEditorPageMessages.enable}" ajax="true" action="#{currentAnalysisEditorGraphBean.switchSnap()}" update=":menuForm"/>
- <p:separator/>
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-autoLayoutSmall" value=" #{localizedAnalysisEditorPageMessages.autoLayout}" ajax="true" />
- </p:submenu>
+ <ui:define name="furtherForms">
+ <h:form id="hidden" style="display:none">
+ <p:remoteCommand autoRun="true" name="init" action="#{currentAnalysisEditorBean.initializeGraph()}" />
+ </h:form>
+ <h:form id="hiddenNodeProperties" style="display:none">
+ <p:remoteCommand name="nodeClickCommand" action="#{currentAnalysisEditorGraphBean.nodeClicked()}" update=":propertiesForm"/>
+ <p:remoteCommand name="nodeRemoveCommand" action="#{currentAnalysisEditorGraphBean.nodeRemoved()}" update=":propertiesForm"/>
+ <p:remoteCommand name="edgeCreateCommand" action="#{currentAnalysisEditorGraphBean.edgeCreated()}"/>
+ <p:remoteCommand name="edgeRemoveCommand" action="#{currentAnalysisEditorGraphBean.edgeRemoved()}"/>
+ </h:form>
+ </ui:define>
- <p:submenu label="#{localizedMessages.help}">
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-userGuide" value=" #{localizedMessages.userGuide}" ajax="true" disabled="true"/>
- <p:separator/>
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-about" value=" #{localizedMessages.about}" onclick="aboutDlg.show()" ajax="true"/>
- </p:submenu>
+ <!-- Those are the menu bar entries left from the help-submenu. -->
+ <ui:define name="furtherMenuBarEntries">
+ <p:submenu label="#{localizedMessages.file}">
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-save" value=" #{localizedMessages.saveProject}" update=":messages" ajax="true" action="#{currentAnalysisEditorBean.saveProject(false)}" disabled="#{empty currentAnalysisEditorBean.project}"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-saveAs" value=" #{localizedMessages.saveProjectAs}" update=":messages" ajax="true" disabled="#{true or empty currentAnalysisEditorBean.project}"/>
+ <p:separator />
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-reload" value=" #{localizedMessages.reloadProject}" ajax="false" url="analysisEditor?projectName=#{currentAnalysisEditorBean.projectName}" disabled="#{empty currentAnalysisEditorBean.project}" />
+ <p:separator/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-manageLibraries" value=" #{localizedAnalysisEditorPageMessages.manageLibraries}" onclick="manageLibrariesDialog.show()" ajax="true" disabled="#{empty currentAnalysisEditorBean.project}"/>
+ <p:separator />
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-settings" value=" #{localizedMessages.settings}" onclick="settingsDlg.show()" ajax="true"/>
+ <p:separator />
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-close" value=" #{localizedMessages.closeProject}" action="ProjectOverviewPage.xhtml?faces-redirect=true" ajax="false"/>
+ </p:submenu>
- <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="#{request.contextPath}/j_spring_security_logout"/>
- </p:menubar>
- <p:spacer height="5"/>
- <p:menubar>
- <p:menuitem id="btnScaleToFit" styleClass="element-with-whitespace" icon="ui-icon-scaleToFit" ajax="true" action="#{currentAnalysisEditorGraphBean.scaleToFit()}"/>
- <p:menuitem id="btnGrid" styleClass="element-with-whitespace" icon="#{currentAnalysisEditorGraphBean.gridEnabled ? 'ui-icon-gridEnabled' : 'ui-icon-gridDisabled'}" ajax="true" action="#{currentAnalysisEditorGraphBean.switchGrid()}" update=":menuForm"/>
- <p:menuitem id="btnSnap" styleClass="element-with-whitespace" icon="#{currentAnalysisEditorGraphBean.snapEnabled ? 'ui-icon-snapEnabled' : 'ui-icon-snapDisabled'}" ajax="true" action="#{currentAnalysisEditorGraphBean.switchSnap()}" update=":menuForm"/>
- <p:menuitem id="btnAutoLayout" styleClass="element-with-whitespace" icon="ui-icon-autoLayout" ajax="true" />
- </p:menubar>
- <p:tooltip for="btnScaleToFit" value="#{localizedAnalysisEditorPageMessages.analysisEditorScaleToFit}"/>
- <p:tooltip for="btnGrid" value="#{localizedAnalysisEditorPageMessages.grid}"/>
- <p:tooltip for="btnSnap" value="#{localizedAnalysisEditorPageMessages.snap}"/>
- <p:tooltip for="btnAutoLayout" value="#{localizedAnalysisEditorPageMessages.autoLayout}"/>
- </h:form>
- </p:layoutUnit>
+ <p:submenu label="Graph">
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-scaleToFitSmall" value=" #{localizedAnalysisEditorPageMessages.analysisEditorScaleToFit}" ajax="true" action="#{currentAnalysisEditorGraphBean.scaleToFit()}" />
+ <p:separator/>
+ <p:menuitem styleClass="element-with-whitespace" icon="#{currentAnalysisEditorGraphBean.gridEnabled ? 'ui-icon-gridEnabledSmall' : 'ui-icon-gridDisabledSmall'}" value=" #{localizedAnalysisEditorPageMessages.grid} #{currentAnalysisEditorGraphBean.gridEnabled ? localizedAnalysisEditorPageMessages.disable : localizedAnalysisEditorPageMessages.enable}" ajax="true" action="#{currentAnalysisEditorGraphBean.switchGrid()}" update=":menuForm"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="#{currentAnalysisEditorGraphBean.snapEnabled ? 'ui-icon-snapEnabledSmall' : 'ui-icon-snapDisabledSmall'}" value=" #{localizedAnalysisEditorPageMessages.snap} #{currentAnalysisEditorGraphBean.snapEnabled ? localizedAnalysisEditorPageMessages.disable: localizedAnalysisEditorPageMessages.enable}" ajax="true" action="#{currentAnalysisEditorGraphBean.switchSnap()}" update=":menuForm"/>
+ <p:separator/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-autoLayoutSmall" value=" #{localizedAnalysisEditorPageMessages.autoLayout}" ajax="true" />
+ </p:submenu>
+ </ui:define>
- <!-- This is the center component showing the graph and everything. -->
- <p:layoutUnit style="font-size: 12px" position="center" id="centerLayout">
+ <ui:define name="furtherMenuBar">
+ <p:spacer height="5"/>
+ <p:menubar>
+ <p:menuitem id="btnScaleToFit" styleClass="element-with-whitespace" icon="ui-icon-scaleToFit" ajax="true" action="#{currentAnalysisEditorGraphBean.scaleToFit()}"/>
+ <p:menuitem id="btnGrid" styleClass="element-with-whitespace" icon="#{currentAnalysisEditorGraphBean.gridEnabled ? 'ui-icon-gridEnabled' : 'ui-icon-gridDisabled'}" ajax="true" action="#{currentAnalysisEditorGraphBean.switchGrid()}" update=":menuForm"/>
+ <p:menuitem id="btnSnap" styleClass="element-with-whitespace" icon="#{currentAnalysisEditorGraphBean.snapEnabled ? 'ui-icon-snapEnabled' : 'ui-icon-snapDisabled'}" ajax="true" action="#{currentAnalysisEditorGraphBean.switchSnap()}" update=":menuForm"/>
+ <p:menuitem id="btnAutoLayout" styleClass="element-with-whitespace" icon="ui-icon-autoLayout" ajax="true" />
+ </p:menubar>
+ <p:tooltip for="btnScaleToFit" value="#{localizedAnalysisEditorPageMessages.analysisEditorScaleToFit}"/>
+ <p:tooltip for="btnGrid" value="#{localizedAnalysisEditorPageMessages.grid}"/>
+ <p:tooltip for="btnSnap" value="#{localizedAnalysisEditorPageMessages.snap}"/>
+ <p:tooltip for="btnAutoLayout" value="#{localizedAnalysisEditorPageMessages.autoLayout}"/>
+ </ui:define>
+
+ <ui:define name="centerContent">
<div id="center-container" style="width: 100%;height: 100%">
<div id="infovis"/>
</div>
- </p:layoutUnit>
+ </ui:define>
- <!-- This is the component presenting the available properties. -->
- <p:layoutUnit style="font-size: 12px" position="south" size="150" header="#{localizedMessages.properties}" resizable="true" collapsible="true">
- <h:form id="propertiesForm" >
- <p:dataTable editable="true" value="#{currentAnalysisEditorBean.advancedPluginProperties}" var="property" rowIndexVar="rowIndex" emptyMessage="#{localizedMessages.noPropertiesAvailable}" rendered="#{not empty currentAnalysisEditorBean.selectedPlugin}">
- <p:column headerText="#{localizedMessages.property}" style="width:125px">
- <!-- The first property is always the classname, the second one always the normal name. After that, other properties can follow. -->
- <h:outputText id="classNameProperty" value="#{localizedAnalysisEditorPageMessages.className}" rendered="#{rowIndex == 0}"/>
- <h:outputText id="nameProperty" value="#{localizedAnalysisEditorPageMessages.name}" rendered="#{rowIndex == 1}"/>
- <h:outputText id="normalProperty" value="#{property.name}" rendered="#{rowIndex > 1}"/>
- <p:tooltip for="classNameProperty" value="#{localizedAnalysisEditorPageMessages.tooltipClassName}" rendered="#{rowIndex == 0}"/>
- <p:tooltip for="nameProperty" value="#{localizedAnalysisEditorPageMessages.tooltipName}" rendered="#{rowIndex == 1}"/>
- <p:tooltip for="normalProperty" value="#{currentAnalysisEditorBean.getDescription(currentAnalysisEditorBean.selectedPlugin, property.name)}" rendered="#{rowIndex > 1}"/>
- </p:column>
+ <ui:define name="furtherLayoutUnits">
+ <!-- This is the component presenting the available properties. -->
+ <p:layoutUnit style="font-size: 12px" position="south" size="150" header="#{localizedMessages.properties}" resizable="true" collapsible="true">
+ <h:form id="propertiesForm" >
+ <p:dataTable editable="true" value="#{currentAnalysisEditorBean.advancedPluginProperties}" var="property" rowIndexVar="rowIndex" emptyMessage="#{localizedMessages.noPropertiesAvailable}" rendered="#{not empty currentAnalysisEditorBean.selectedPlugin}">
+ <p:column headerText="#{localizedMessages.property}" style="width:125px">
+ <!-- The first property is always the classname, the second one always the normal name. After that, other properties can follow. -->
+ <h:outputText id="classNameProperty" value="#{localizedAnalysisEditorPageMessages.className}" rendered="#{rowIndex == 0}"/>
+ <h:outputText id="nameProperty" value="#{localizedAnalysisEditorPageMessages.name}" rendered="#{rowIndex == 1}"/>
+ <h:outputText id="normalProperty" value="#{property.name}" rendered="#{rowIndex > 1}"/>
+ <p:tooltip for="classNameProperty" value="#{localizedAnalysisEditorPageMessages.tooltipClassName}" rendered="#{rowIndex == 0}"/>
+ <p:tooltip for="nameProperty" value="#{localizedAnalysisEditorPageMessages.tooltipName}" rendered="#{rowIndex == 1}"/>
+ <p:tooltip for="normalProperty" value="#{currentAnalysisEditorBean.getDescription(currentAnalysisEditorBean.selectedPlugin, property.name)}" rendered="#{rowIndex > 1}"/>
+ </p:column>
- <!-- The classname is not editable, the name is editable with a specific target, other properies are editable normally. -->
- <p:column headerText="#{localizedMessages.value}" style="width:125px">
- <h:outputText id="className" value="#{currentAnalysisEditorBean.selectedPlugin.classname}" rendered="#{rowIndex == 0}"/>
- <p:inplace id="nameEditor" editor="true" rendered="#{rowIndex == 1}" >
- <p:inputText value="#{currentAnalysisEditorBean.selectedPlugin.name}" />
- <p:ajax event="save" listener="#{currentAnalysisEditorGraphBean.renameNode(currentAnalysisEditorBean.selectedPlugin, currentAnalysisEditorBean.selectedPlugin.name)}" />
- </p:inplace>
- <p:inplace id="normalEditor" editor="true" rendered="#{rowIndex > 1}">
- <p:inputText value="#{property.value}" />
- </p:inplace>
- <p:tooltip for="className" value="#{localizedAnalysisEditorPageMessages.tooltipClassName}" rendered="#{rowIndex == 0}"/>
- <p:tooltip for="nameEditor" value="#{localizedAnalysisEditorPageMessages.tooltipName}" rendered="#{rowIndex == 1}"/>
- <p:tooltip for="normalEditor" value="#{currentAnalysisEditorBean.getDescription(currentAnalysisEditorBean.selectedPlugin, property.name)}" rendered="#{rowIndex > 1}"/>
- </p:column>
- </p:dataTable>
- </h:form>
- </p:layoutUnit>
+ <!-- The classname is not editable, the name is editable with a specific target, other properies are editable normally. -->
+ <p:column headerText="#{localizedMessages.value}" style="width:125px">
+ <h:outputText id="className" value="#{currentAnalysisEditorBean.selectedPlugin.classname}" rendered="#{rowIndex == 0}"/>
+ <p:inplace id="nameEditor" editor="true" rendered="#{rowIndex == 1}" >
+ <p:inputText value="#{currentAnalysisEditorBean.selectedPlugin.name}" />
+ <p:ajax event="save" listener="#{currentAnalysisEditorGraphBean.renameNode(currentAnalysisEditorBean.selectedPlugin, currentAnalysisEditorBean.selectedPlugin.name)}" />
+ </p:inplace>
+ <p:inplace id="normalEditor" editor="true" rendered="#{rowIndex > 1}">
+ <p:inputText value="#{property.value}" />
+ </p:inplace>
+ <p:tooltip for="className" value="#{localizedAnalysisEditorPageMessages.tooltipClassName}" rendered="#{rowIndex == 0}"/>
+ <p:tooltip for="nameEditor" value="#{localizedAnalysisEditorPageMessages.tooltipName}" rendered="#{rowIndex == 1}"/>
+ <p:tooltip for="normalEditor" value="#{currentAnalysisEditorBean.getDescription(currentAnalysisEditorBean.selectedPlugin, property.name)}" rendered="#{rowIndex > 1}"/>
+ </p:column>
+ </p:dataTable>
+ </h:form>
+ </p:layoutUnit>
- <!-- The following is the toolpalette, presenting the available plugins etc. -->
- <p:layoutUnit position="east" size="300" header="#{localizedAnalysisEditorPageMessages.availablePlugins}" resizable="true" collapsible="true">
- <h:form id="toolpalette">
- <p:accordionPanel multiple="true" activeIndex="0,1,2">
- <p:tab title="#{localizedAnalysisEditorPageMessages.reader}">
- <ui:repeat value="#{currentAnalysisEditorBean.availableReaders}" var="reader">
- <p:commandLink id="readerLink" value="#{reader.simpleName}" action="#{currentAnalysisEditorBean.addPlugin(reader)}" update=":messages" /><br/>
- <p:tooltip for="readerLink">
- <b><h:outputText value="#{reader.simpleName} (#{reader.name})"/></b>
- <br/>
- <h:outputText value="#{currentAnalysisEditorBean.getDescription(reader)}"/>
- <br/><br/>
- <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getOutputPorts(reader)}">
- <b><h:outputText value="#{localizedAnalysisEditorPageMessages.outputPorts}:"/></b>
- <p:dataList value="#{currentAnalysisEditorBean.getOutputPorts(reader)}" var="port">
- #{port.name()}
- </p:dataList>
- </ui:fragment>
- <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getRepositoryPorts(reader)}">
- <b><h:outputText value="#{localizedAnalysisEditorPageMessages.repositoryPorts}:" /></b>
- <p:dataList value="#{currentAnalysisEditorBean.getRepositoryPorts(reader)}" var="port">
- #{port.name()}
- </p:dataList>
- </ui:fragment>
- <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getProperties(reader)}">
- <b><h:outputText value="#{localizedAnalysisEditorPageMessages.configuration}:"/></b>
- <p:dataList value="#{currentAnalysisEditorBean.getProperties(reader)}" var="property">
- #{property.name()}
- </p:dataList>
- </ui:fragment>
- <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getDependencies(reader)}">
- <b><h:outputText value="#{localizedAnalysisEditorPageMessages.dependencies}:"/></b>
+ <!-- The following is the toolpalette, presenting the available plugins etc. -->
+ <p:layoutUnit position="east" size="300" header="#{localizedAnalysisEditorPageMessages.availablePlugins}" resizable="true" collapsible="true">
+ <h:form id="toolpalette">
+ <p:accordionPanel multiple="true" activeIndex="0,1,2">
+ <p:tab title="#{localizedAnalysisEditorPageMessages.reader}">
+ <ui:repeat value="#{currentAnalysisEditorBean.availableReaders}" var="reader">
+ <p:commandLink id="readerLink" value="#{reader.simpleName}" action="#{currentAnalysisEditorBean.addPlugin(reader)}" update=":messages" /><br/>
+ <p:tooltip for="readerLink">
+ <b><h:outputText value="#{reader.simpleName} (#{reader.name})"/></b>
<br/>
- <h:outputText value="#{currentAnalysisEditorBean.getDependencies(reader)}"/>
- </ui:fragment>
- </p:tooltip>
- </ui:repeat>
- </p:tab>
- <p:tab title="#{localizedAnalysisEditorPageMessages.filter}">
- <ui:repeat value="#{currentAnalysisEditorBean.availableFilters}" var="filter">
- <p:commandLink id="filterLink" value="#{filter.simpleName}" action="#{currentAnalysisEditorBean.addPlugin(filter)}" update=":messages"/><br/>
- <p:tooltip for="filterLink">
- <b><h:outputText value="#{filter.simpleName} (#{filter.name})"/></b>
- <br/>
- <h:outputText value="#{currentAnalysisEditorBean.getDescription(filter)}"/>
- <br/><br/>
- <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getInputPorts(filter)}">
- <b><h:outputText value="#{localizedAnalysisEditorPageMessages.inputPorts}:"/></b>
- <p:dataList value="#{currentAnalysisEditorBean.getInputPorts(filter)}" var="port">
- #{port.name()}
- </p:dataList>
- </ui:fragment>
- <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getOutputPorts(filter)}">
- <b><h:outputText value="#{localizedAnalysisEditorPageMessages.outputPorts}:"/></b>
- <p:dataList value="#{currentAnalysisEditorBean.getOutputPorts(filter)}" var="port">
- #{port.name()}
- </p:dataList>
- </ui:fragment>
- <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getRepositoryPorts(filter)}">
- <b><h:outputText value="#{localizedAnalysisEditorPageMessages.repositoryPorts}:"/></b>
- <p:dataList value="#{currentAnalysisEditorBean.getRepositoryPorts(filter)}" var="port">
- #{port.name()}
- </p:dataList>
- </ui:fragment>
- <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getProperties(filter)}">
- <b><h:outputText value="#{localizedAnalysisEditorPageMessages.configuration}:"/></b>
- <p:dataList value="#{currentAnalysisEditorBean.getProperties(filter)}" var="property">
- #{property.name()}
- </p:dataList>
- </ui:fragment>
- <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getDependencies(filter)}">
- <b><h:outputText value="#{localizedAnalysisEditorPageMessages.dependencies}:"/></b>
+ <h:outputText value="#{currentAnalysisEditorBean.getDescription(reader)}"/>
+ <br/><br/>
+ <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getOutputPorts(reader)}">
+ <b><h:outputText value="#{localizedAnalysisEditorPageMessages.outputPorts}:"/></b>
+ <p:dataList value="#{currentAnalysisEditorBean.getOutputPorts(reader)}" var="port">
+ #{port.name()}
+ </p:dataList>
+ </ui:fragment>
+ <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getRepositoryPorts(reader)}">
+ <b><h:outputText value="#{localizedAnalysisEditorPageMessages.repositoryPorts}:" /></b>
+ <p:dataList value="#{currentAnalysisEditorBean.getRepositoryPorts(reader)}" var="port">
+ #{port.name()}
+ </p:dataList>
+ </ui:fragment>
+ <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getProperties(reader)}">
+ <b><h:outputText value="#{localizedAnalysisEditorPageMessages.configuration}:"/></b>
+ <p:dataList value="#{currentAnalysisEditorBean.getProperties(reader)}" var="property">
+ #{property.name()}
+ </p:dataList>
+ </ui:fragment>
+ <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getDependencies(reader)}">
+ <b><h:outputText value="#{localizedAnalysisEditorPageMessages.dependencies}:"/></b>
+ <br/>
+ <h:outputText value="#{currentAnalysisEditorBean.getDependencies(reader)}"/>
+ </ui:fragment>
+ </p:tooltip>
+ </ui:repeat>
+ </p:tab>
+ <p:tab title="#{localizedAnalysisEditorPageMessages.filter}">
+ <ui:repeat value="#{currentAnalysisEditorBean.availableFilters}" var="filter">
+ <p:commandLink id="filterLink" value="#{filter.simpleName}" action="#{currentAnalysisEditorBean.addPlugin(filter)}" update=":messages"/><br/>
+ <p:tooltip for="filterLink">
+ <b><h:outputText value="#{filter.simpleName} (#{filter.name})"/></b>
<br/>
- <h:outputText value="#{currentAnalysisEditorBean.getDependencies(filter)}"/>
- </ui:fragment>
- </p:tooltip>
- </ui:repeat>
- </p:tab>
- <p:tab title="#{localizedAnalysisEditorPageMessages.repositories}">
- <ui:repeat value="#{currentAnalysisEditorBean.availableRepositories}" var="repository">
- <p:commandLink id="repositoryLink" value="#{repository.simpleName}" action="#{currentAnalysisEditorBean.addRepository(repository)}" update=":messages"/><br/>
- <p:tooltip for="repositoryLink">
- <b><h:outputText value="#{repository.simpleName} (#{repository.name})"/></b>
- <br/>
- <h:outputText value="#{currentAnalysisEditorBean.getDescription(repository)}"/>
- <br/><br/>
- <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getProperties(repository)}">
- <b><h:outputText value="#{localizedAnalysisEditorPageMessages.configuration}:"/></b>
- <p:dataList value="#{currentAnalysisEditorBean.getProperties(repository)}" var="property">
- #{property.name()}
- </p:dataList>
- </ui:fragment>
- <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getDependencies(repository)}">
- <b><h:outputText value="#{localizedAnalysisEditorPageMessages.dependencies}:"/></b>
+ <h:outputText value="#{currentAnalysisEditorBean.getDescription(filter)}"/>
+ <br/><br/>
+ <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getInputPorts(filter)}">
+ <b><h:outputText value="#{localizedAnalysisEditorPageMessages.inputPorts}:"/></b>
+ <p:dataList value="#{currentAnalysisEditorBean.getInputPorts(filter)}" var="port">
+ #{port.name()}
+ </p:dataList>
+ </ui:fragment>
+ <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getOutputPorts(filter)}">
+ <b><h:outputText value="#{localizedAnalysisEditorPageMessages.outputPorts}:"/></b>
+ <p:dataList value="#{currentAnalysisEditorBean.getOutputPorts(filter)}" var="port">
+ #{port.name()}
+ </p:dataList>
+ </ui:fragment>
+ <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getRepositoryPorts(filter)}">
+ <b><h:outputText value="#{localizedAnalysisEditorPageMessages.repositoryPorts}:"/></b>
+ <p:dataList value="#{currentAnalysisEditorBean.getRepositoryPorts(filter)}" var="port">
+ #{port.name()}
+ </p:dataList>
+ </ui:fragment>
+ <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getProperties(filter)}">
+ <b><h:outputText value="#{localizedAnalysisEditorPageMessages.configuration}:"/></b>
+ <p:dataList value="#{currentAnalysisEditorBean.getProperties(filter)}" var="property">
+ #{property.name()}
+ </p:dataList>
+ </ui:fragment>
+ <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getDependencies(filter)}">
+ <b><h:outputText value="#{localizedAnalysisEditorPageMessages.dependencies}:"/></b>
+ <br/>
+ <h:outputText value="#{currentAnalysisEditorBean.getDependencies(filter)}"/>
+ </ui:fragment>
+ </p:tooltip>
+ </ui:repeat>
+ </p:tab>
+ <p:tab title="#{localizedAnalysisEditorPageMessages.repositories}">
+ <ui:repeat value="#{currentAnalysisEditorBean.availableRepositories}" var="repository">
+ <p:commandLink id="repositoryLink" value="#{repository.simpleName}" action="#{currentAnalysisEditorBean.addRepository(repository)}" update=":messages"/><br/>
+ <p:tooltip for="repositoryLink">
+ <b><h:outputText value="#{repository.simpleName} (#{repository.name})"/></b>
<br/>
- <h:outputText value="#{currentAnalysisEditorBean.getDependencies(repository)}"/>
- </ui:fragment>
- </p:tooltip>
- </ui:repeat>
- </p:tab>
- </p:accordionPanel>
- </h:form>
- </p:layoutUnit>
- </p:layout>
+ <h:outputText value="#{currentAnalysisEditorBean.getDescription(repository)}"/>
+ <br/><br/>
+ <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getProperties(repository)}">
+ <b><h:outputText value="#{localizedAnalysisEditorPageMessages.configuration}:"/></b>
+ <p:dataList value="#{currentAnalysisEditorBean.getProperties(repository)}" var="property">
+ #{property.name()}
+ </p:dataList>
+ </ui:fragment>
+ <ui:fragment rendered="#{not empty currentAnalysisEditorBean.getDependencies(repository)}">
+ <b><h:outputText value="#{localizedAnalysisEditorPageMessages.dependencies}:"/></b>
+ <br/>
+ <h:outputText value="#{currentAnalysisEditorBean.getDependencies(repository)}"/>
+ </ui:fragment>
+ </p:tooltip>
+ </ui:repeat>
+ </p:tab>
+ </p:accordionPanel>
+ </h:form>
+ </p:layoutUnit>
+ </ui:define>
- <p:dialog header="#{localizedMessages.saveProject}" resizable="false" modal="true" widgetVar="forceSaveDlg">
- <h:form>
- <div style="text-align: center">
- <h:outputText value="#{localizedAnalysisEditorPageMessages.msgProjectModified}" />
- </div>
- <hr/>
- <div style="text-align: right">
- <p:commandButton value="#{localizedMessages.yes}" action="#{currentAnalysisEditorBean.saveProject(true)}" oncomplete="forceSaveDlg.hide()" update=":messages" />
- <p:spacer width="10px" height="10" />
- <p:commandButton value="#{localizedMessages.cancel}" onclick="forceSaveDlg.hide()" />
- </div>
- </h:form>
- </p:dialog>
+ <ui:define name="furtherDialogIncludes">
+ <ui:include src="../dialogs/AnalysisEditorPageDialogs.xhtml" />
+ </ui:define>
- <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
-
- <!-- Include the dialog for the configuration. -->
- <ui:include src="../dialogs/SettingsDialog.xhtml"/>
-
- <!-- Include the about-dialog. -->
- <ui:include src="../dialogs/AboutDialog.xhtml" />
-
- <!-- Include the dialog the manage the libraries. -->
- <ui:include src="../dialogs/AnalysisEditorPageDialogs.xhtml" />
+ </ui:composition>
</h:body>
-
</html>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagement.xhtml b/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagement.xhtml
new file mode 100644
index 00000000..b74961e2
--- /dev/null
+++ b/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagement.xhtml
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:p="http://primefaces.org/ui"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <h:head/>
+
+ <h:body>
+
+ <ui:composition template="/templates/PagesTemplate.xhtml">
+
+ <ui:param name="pagename" value="userManagement"/>
+ <ui:param name="showProjectName" value="false"/>
+
+ <ui:define name="bundleIncludes">
+
+ </ui:define>
+
+ <ui:define name="cssIncludes">
+ <link rel="stylesheet" type="text/css" href="/css/UserManagement.css" />
+ </ui:define>
+
+ <!-- Those are the menu bar entries left from the help-submenu. -->
+ <ui:define name="furtherMenuBarEntries">
+ <p:submenu label="#{localizedMessages.file}">
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-newProject" value=" Neuer Benutzer" onclick="newUserDlg.show()" ajax="true"/>
+ <p:separator/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-reload" value=" Benutzerliste Aktualisieren" update=":projectsListForm" action="#{currentProjectOverviewBean.updateLists()}" ajax="true"/>
+ <p:separator/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-settings" value=" Einstellungen" onclick="settingsDlg.show()" ajax="true"/>
+ </p:submenu>
+ </ui:define>
+
+ <ui:define name="centerContent">
+ <h:form id="projectsListForm">
+ <p:dataTable emptyMessage="#{localizedMessages.noRecordsFound}" rows="15" paginator="true" paginatorPosition="both" var="project" rowsPerPageTemplate="5,10,15,25,50" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" selectionMode="single">
+ <p:column headerText="Benutzername">
+
+ </p:column>
+
+ <p:column headerText="Benutzerrollen">
+
+ </p:column>
+ </p:dataTable>
+ </h:form>
+ </ui:define>
+
+ <ui:define name="furtherDialogIncludes">
+ <ui:include src="../../dialogs/UserManagementDialogs.xhtml" />
+ </ui:define>
+
+ </ui:composition>
+
+ </h:body>
+</html>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagment.xhtml b/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagment.xhtml
deleted file mode 100644
index b7c36b81..00000000
--- a/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagment.xhtml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:p="http://primefaces.org/ui">
-
- <f:loadBundle var="localizedMessages" basename="lang.Common"/>
-
- <h:head>
- <title>Kieker.WebGUI</title>
- <link rel="stylesheet" type="text/css" href="#{request.contextPath}/css/Common.css" />
- <link rel="stylesheet" type="text/css" href="#{request.contextPath}/css/Icons.css" />
- </h:head>
-
- <h:body>
-
- <p:layout fullPage="true">
- <p:layoutUnit position="north">
- <h:form id="menuForm">
- <p:toolbar>
- <p:toolbarGroup align="left">
- <h:outputText styleClass="kieker-title" value="Kieker"/>
- </p:toolbarGroup>
- <p:toolbarGroup align="right">
- <p:button styleClass="perspective-button" icon="ui-icon-home" outcome="projectOverview" />
- </p:toolbarGroup>
- </p:toolbar>
-
- <p:menubar>
- <p:submenu label="#{localizedMessages.file}">
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-newProject" value=" Neuer Benutzer"/>
- <p:separator/>
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-reload" value=" Benutzerliste Aktualisieren" ajax="true"/>
- <p:separator/>
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-settings" value=" #{localizedMessages.settings}" onclick="settingsDlg.show()" ajax="true"/>
- </p:submenu>h
-
- <p:submenu label="#{localizedMessages.help}">
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-userGuide" value=" #{localizedMessages.userGuide}" ajax="true" disabled="true"/>
- <p:separator/>
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-about" value=" #{localizedMessages.about}" onclick="aboutDlg.show()" ajax="true"/>
- </p:submenu>
-
- <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="#{request.contextPath}/j_spring_security_logout"/>
- </p:menubar>
- </h:form>
- </p:layoutUnit>
-
- <!-- Abstand zu Icons -->
- <p:layoutUnit position="center">
-
- </p:layoutUnit>
-
- </p:layout>
-
- <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
-
- <!-- Include the dialog for the configuration. -->
- <ui:include src="#{request.contextPath}/dialogs/SettingsDialog.xhtml" />
-
- <!-- Include the about-dialog. -->
- <ui:include src="#{request.contextPath}/dialogs/AboutDialog.xhtml" />
-
- </h:body>
-</html>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/templates/PagesTemplate.xhtml b/Kieker.WebGUI/src/main/webapp/templates/PagesTemplate.xhtml
index 17726d2f..c70d4e2b 100644
--- a/Kieker.WebGUI/src/main/webapp/templates/PagesTemplate.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/templates/PagesTemplate.xhtml
@@ -14,6 +14,8 @@
<ui:composition template="#{root}/templates/CommonTemplate.xhtml">
<ui:define name="content">
+ <ui:insert name="furtherForms"/>
+
<p:layout id="layout" fullPage="true">
<p:layoutUnit position="north" collapsible="false">
@@ -24,24 +26,23 @@
</p:toolbarGroup>
<p:toolbarGroup align="right">
<p:button styleClass="perspective-button" icon="ui-icon-home" outcome="projectOverview" disabled="#{pagename == 'projectOverview'}" />
- <f:param name="projectName" value="#{projectName}" rendered="#{not empty projectName}"/>
<p:separator/>
- <p:button styleClass="perspective-button" icon="ui-icon-analysisEditor" value="#{localizedMessages.analysisEditor}" outcome="analysisEditor" disabled="#{pagename == 'analysisEditor'}">
+ <p:button styleClass="perspective-button" icon="ui-icon-analysisEditor" value="#{localizedMessages.analysisEditor}" outcome="analysisEditor" disabled="#{pagename == 'analysisEditor' or empty projectName}">
<f:param name="projectName" value="#{projectName}" rendered="#{not empty projectName}"/>
</p:button>
- <p:button styleClass="perspective-button" icon="ui-icon-analysis" value="#{localizedMessages.analysis}" outcome="controller" disabled="#{pagename == 'controller'}">
+ <p:button styleClass="perspective-button" icon="ui-icon-analysis" value="#{localizedMessages.analysis}" outcome="controller" disabled="#{pagename == 'controller' or empty projectName}">
<f:param name="projectName" value="#{projectName}" rendered="#{not empty projectName}"/>
</p:button>
<p:separator/>
- <p:button styleClass="perspective-button" icon="ui-icon-cockpitEditor" value="#{localizedMessages.cockpitEditor}" outcome="cockpitEditor" disabled="#{pagename == 'cockpitEditor'}">
+ <p:button styleClass="perspective-button" icon="ui-icon-cockpitEditor" value="#{localizedMessages.cockpitEditor}" outcome="cockpitEditor" disabled="#{pagename == 'cockpitEditor' or empty projectName}">
<f:param name="projectName" value="#{projectName}" rendered="#{not empty projectName}"/>
</p:button>
- <p:button styleClass="perspective-button" icon="ui-icon-cockpit" value="#{localizedMessages.cockpit}" outcome="cockpit" disabled="#{pagename == 'cockpit'}">
+ <p:button styleClass="perspective-button" icon="ui-icon-cockpit" value="#{localizedMessages.cockpit}" outcome="cockpit" disabled="#{pagename == 'cockpit' or empty projectName}">
<f:param name="projectName" value="#{projectName}" rendered="#{not empty projectName}"/>
</p:button>
<c:if test="#{sec:areAnyGranted('ROLE_ADMIN')}">
<p:separator/>
- <p:button styleClass="perspective-button" icon="ui-icon-userManagment" value="User Managment" outcome="userManagment" disabled="#{pagename == 'userManagment'}" />
+ <p:button styleClass="perspective-button" icon="ui-icon-userManagement" value="User Management" outcome="userManagement" disabled="#{pagename == 'userManagement'}" />
</c:if>
</p:toolbarGroup>
</p:toolbar>
@@ -58,6 +59,7 @@
<p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="#{request.contextPath}/j_spring_security_logout"/>
</p:menubar>
+ <ui:insert name="furtherMenuBar"/>
</h:form>
</p:layoutUnit>
--
GitLab