Further page refactoring

Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_de.properties

@@ -11,3 +11,5 @@ renameView = Ansicht Umbenennen
 deleteView = Ansicht Löschen
 
 name = Name
+
+edit = Bearbeiten
\ No newline at end of file

Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_en.properties

@@ -11,3 +11,5 @@ renameView = Rename View
 deleteView = Delete View
 
 name = Name
+
+edit = Edit
\ No newline at end of file

Kieker.WebGUI/src/main/webapp/css/CockpitEditorPage.css

@@ -13,3 +13,17 @@
 .ui-panel {
     cursor: pointer;
 }
+
+/* The following code is for icon definition. */
+
+.ui-icon-newView {
+    background: url('../img/icons/NewView.png') no-repeat !important;
+    height:32px;
+    width:32px;
+}
+
+.ui-icon-newViewSmall {
+    background: url('../img/icons/NewViewSmall.png') no-repeat !important;
+    height:16px;
+    width:16px;
+}
\ No newline at end of file

Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml

@@ -113,21 +113,24 @@
                 </p:submenu>
 
                 <p:submenu label="Graph">
+                    <c:if test="#{sec:areAnyGranted('User, Administrator')}">
                         <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-undoSmall" value="  #{localizedMessages.undo}" ajax="true" disabled="true" />
                         <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-redoSmall" value="  #{localizedMessages.redo}" ajax="true" disabled="true" />
                         <p:separator/>
-                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-scaleToFitSmall" value="  #{localizedAnalysisEditorPageMessages.analysisEditorScaleToFit}" ajax="true" action="#{currentAnalysisEditorGraphBean.scaleToFit()}" />
+                    </c:if>
+                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-scaleToFitSmall" value="  #{localizedAnalysisEditorPageMessages.analysisEditorScaleToFit}" ajax="true" action="#{currentAnalysisEditorGraphBean.scaleToFit()}"  disabled="#{empty currentAnalysisEditorBean.project}" />
                     <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: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"  disabled="#{empty currentAnalysisEditorBean.project}"/>
+                    <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"  disabled="#{empty currentAnalysisEditorBean.project}"/>
                     <p:separator/>
-                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-autoLayoutSmall" value="  #{localizedAnalysisEditorPageMessages.autoLayout}" ajax="true" action="#{currentAnalysisEditorGraphBean.startAutoLayout()}"  />
+                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-autoLayoutSmall" value="  #{localizedAnalysisEditorPageMessages.autoLayout}" ajax="true" action="#{currentAnalysisEditorGraphBean.startAutoLayout()}"  disabled="#{empty currentAnalysisEditorBean.project}"  />
                 </p:submenu>
             </ui:define>  
 
             <ui:define name="furtherMenuBar">
                 <p:spacer height="5"/>
                 <p:menubar> 
+                    <c:if test="#{sec:areAnyGranted('User, Administrator')}">
                         <p:menuitem id="btnSaveProject" styleClass="element-with-whitespace" icon="ui-icon-save" ajax="true" onstart="preSaveProject(false)"  disabled="#{empty currentAnalysisEditorBean.project}"/>
                         <!-- A dummy item as a separator between the items. -->
                         <p:menuitem style="width: 15px" disabled="true"/>
@@ -140,19 +143,20 @@
                         <p:menuitem id="btnRedo" styleClass="element-with-whitespace" icon="ui-icon-redo" ajax="true" disabled="true"/>
                         <!-- A dummy item as a separator between the items. -->
                         <p:menuitem style="width: 15px" disabled="true"/>
+                    </c:if>
 
-                    <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" action="#{currentAnalysisEditorGraphBean.startAutoLayout()}" />
+                    <p:menuitem id="btnScaleToFit" styleClass="element-with-whitespace" icon="ui-icon-scaleToFit" ajax="true" action="#{currentAnalysisEditorGraphBean.scaleToFit()}" disabled="#{empty currentAnalysisEditorBean.project}"/>
+                    <p:menuitem id="btnGrid" styleClass="element-with-whitespace" icon="#{currentAnalysisEditorGraphBean.gridEnabled ? 'ui-icon-gridEnabled' : 'ui-icon-gridDisabled'}" ajax="true" action="#{currentAnalysisEditorGraphBean.switchGrid()}" update=":menuForm" disabled="#{empty currentAnalysisEditorBean.project}"/>
+                    <p:menuitem id="btnSnap" styleClass="element-with-whitespace" icon="#{currentAnalysisEditorGraphBean.snapEnabled ? 'ui-icon-snapEnabled' : 'ui-icon-snapDisabled'}" ajax="true" action="#{currentAnalysisEditorGraphBean.switchSnap()}" update=":menuForm" disabled="#{empty currentAnalysisEditorBean.project}"/>
+                    <p:menuitem id="btnAutoLayout" styleClass="element-with-whitespace" icon="ui-icon-autoLayout" ajax="true" action="#{currentAnalysisEditorGraphBean.startAutoLayout()}" disabled="#{empty currentAnalysisEditorBean.project}" />
                 </p:menubar>
-
+                <c:if test="#{sec:areAnyGranted('User, Administrator')}">
                     <p:tooltip for="btnSaveProject"  value="#{localizedAnalysisEditorPageMessages.tooltipSaveProject}"/>
                     <p:tooltip for="btnManageLibraries"  value="#{localizedAnalysisEditorPageMessages.tooltipManageLibraries}"/>
 
                     <p:tooltip for="btnUndo" value="#{localizedMessages.tooltipUndo}"/>
                     <p:tooltip for="btnRedo"  value="#{localizedMessages.tooltipRedo}"/>
-
+                </c:if>
                 <p:tooltip for="btnScaleToFit" value="#{localizedAnalysisEditorPageMessages.tooltipScaleToFit}"/>
                 <p:tooltip for="btnGrid" value="#{localizedAnalysisEditorPageMessages.tooltipGrid}"/>
                 <p:tooltip for="btnSnap" value="#{localizedAnalysisEditorPageMessages.tooltipSnap}"/>

Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml

@@ -40,12 +40,12 @@
             <!-- 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="  Neues View" update=":messages" ajax="true" onclick="newViewDialog.show();" disabled="#{empty currentCockpitEditorBean.project}"/>
+                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-newViewSmall" value="  Neues View" update=":messages" ajax="true" onclick="newViewDialog.show();" disabled="#{empty currentCockpitEditorBean.project}"/>
                     <p:separator />
-                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-save" value="  #{localizedMessages.saveProject}" update=":messages" ajax="true" action="#{currentCockpitEditorBean.saveProject(false)}" disabled="#{empty currentCockpitEditorBean.project}"/>
-                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-saveAs" value="  #{localizedMessages.saveProjectAs}" update=":messages" ajax="true" disabled="#{true or empty currentCockpitEditorBean.project}"/>
+                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-saveSmall" value="  #{localizedMessages.saveProject}" update=":messages" ajax="true" action="#{currentCockpitEditorBean.saveProject(false)}" disabled="#{empty currentCockpitEditorBean.project}"/>
+                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-saveAsSmall" value="  #{localizedMessages.saveProjectAs}" update=":messages" ajax="true" disabled="#{true or empty currentCockpitEditorBean.project}"/>
                     <p:separator />
-                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-reload" value="  #{localizedMessages.reloadProject}" ajax="false" url="cockpitEditor?projectName=#{currentCockpitEditorBean.projectName}" disabled="#{empty currentCockpitEditorBean.project}" />
+                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-reloadSmall" value="  #{localizedMessages.reloadProject}" ajax="false" url="cockpitEditor?projectName=#{currentCockpitEditorBean.projectName}" disabled="#{empty currentCockpitEditorBean.project}" />
                     <p:separator/>
                     <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-settings" value="  #{localizedMessages.settings}" onclick="settingsDlg.show()" ajax="true"/>
                     <p:separator />
@@ -53,12 +53,30 @@
                     <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-close" value="  #{localizedMessages.closeProject}" action="ProjectOverviewPage.xhtml?faces-redirect=true" ajax="false" rendered="#{not currentCockpitEditorBean.unsavedModification}"/>
                 </p:submenu>
 
-                <p:submenu  label="Edit">
-                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-arrowreturnthick-1-w" value="  Undo" ajax="true" />
-                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-arrowreturnthick-1-e" value="  Redo" ajax="true"  />
+                <p:submenu label="#{localizedCockpitEditorPageMessages.edit}">
+                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-undoSmall" value="  #{localizedMessages.undo}" ajax="true" disabled="true" />
+                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-redoSmall" value="  #{localizedMessages.redo}" ajax="true" disabled="true" />
                 </p:submenu>
             </ui:define>  
 
+            <ui:define name="furtherMenuBar">
+                <p:spacer height="5"/>
+                <p:menubar> 
+                    <p:menuitem id="btnNewView" styleClass="element-with-whitespace" icon="ui-icon-newView" update=":messages" ajax="true" onclick="newViewDialog.show();" disabled="#{empty currentCockpitEditorBean.project}"/>
+                    <!-- A dummy item as a separator between the items. -->
+                    <p:menuitem style="width: 15px" disabled="true"/>
+                    
+                    <p:menuitem id="btnSaveProject" styleClass="element-with-whitespace" icon="ui-icon-save" update=":messages" ajax="true"  action="#{currentCockpitEditorBean.saveProject(false)}" disabled="#{empty currentCockpitEditorBean.project}"/>
+                    <!-- A dummy item as a separator between the items. -->
+                    <p:menuitem style="width: 15px" disabled="true"/>
+
+                    <p:menuitem id="btnUndo" styleClass="element-with-whitespace" icon="ui-icon-undo" ajax="true" disabled="true"/>
+                    <p:menuitem id="btnRedo" styleClass="element-with-whitespace" icon="ui-icon-redo" ajax="true" disabled="true"/>
+                </p:menubar>
+
+                <p:tooltip for="btnUndo" value="#{localizedMessages.tooltipUndo}"/>
+                <p:tooltip for="btnRedo"  value="#{localizedMessages.tooltipRedo}"/>
+            </ui:define>
 
             <ui:define name="centerLayout">
                 <p:layoutUnit position="center">

Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml

@@ -34,7 +34,7 @@
             <!-- 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-reload" value="  #{localizedMessages.reloadProject}" ajax="false" url="cockpit?projectName=#{currentCockpitBean.projectName}" disabled="#{empty currentCockpitBean.project}" />
+                    <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-reloadSmall" value="  #{localizedMessages.reloadProject}" ajax="false" url="cockpit?projectName=#{currentCockpitBean.projectName}" disabled="#{empty currentCockpitBean.project}" />
                     <p:separator/>
                     <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-settings" value="  #{localizedMessages.settings}" onclick="settingsDlg.show()" ajax="true"/>
                     <p:separator />

Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml

@@ -45,14 +45,18 @@
             <ui:define name="furtherMenuBar">
                 <p:spacer height="5"/>
                 <p:menubar> 
+                    <c:if test="#{sec:areAnyGranted('User, Administrator')}">
                         <p:menuitem id="btnNewProject" styleClass="element-with-whitespace" icon="ui-icon-newProject" onclick="newProjectDialog.show()" ajax="true" />
                         <p:menuitem id="btnImportProject" styleClass="element-with-whitespace" icon="ui-icon-importProject" onclick="importProjectDialog.show()" ajax="true"  />
                         <!-- A dummy item as a separator between the items. -->
                         <p:menuitem style="width: 15px" disabled="true"/>
+                    </c:if>
                     <p:menuitem id="btnReloadProjectList" styleClass="element-with-whitespace" icon="ui-icon-reload" update=":projectsListForm" action="#{currentProjectOverviewBean.updateAvailableProjects()}" ajax="true"  />
                 </p:menubar>
+                <c:if test="#{sec:areAnyGranted('User, Administrator')}">
                     <p:tooltip for="btnNewProject" value="#{localizedProjectOverviewMessages.tooltipNewProject}"/>
                     <p:tooltip for="btnImportProject"  value="#{localizedProjectOverviewMessages.tooltipImportProject}"/>
+                </c:if>
                 <p:tooltip for="btnReloadProjectList"  value="#{localizedProjectOverviewMessages.tooltipReloadProjectsList}"/>
             </ui:define>