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

More page refactoring

parent 48b30c5c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 141 additions and 74 deletions
Kieker.WebGUI/src/main/resources/lang/AnalysisEditorPage_de.properties
+ 7
− 0
View file @ 185abcba
......@@ -21,6 +21,13 @@ className = ClassName
tooltipClassName = Der Klassenname der Komponente.
tooltipName = Der Name der Komponente.
tooltipSaveProject = Speichert das aktuelle Projekt
tooltipManageLibraries = Verwaltet die Bibliotheken des Projekts
tooltipScaleToFit = Passt den Graphen an die Fenstergr\u00f6\u00dfe an
tooltipGrid = Aktiviert und Deaktiviert das Gitter
tooltipSnap = Aktiviert und Deaktiviert das Einrasten am Gitter
tooltipAutoLayout = Layoutet den Graphen
availablePlugins = Verf\u00fcgbare Plugins
......
Kieker.WebGUI/src/main/resources/lang/AnalysisEditorPage_en.properties
+ 7
− 0
View file @ 185abcba
......@@ -21,6 +21,13 @@ className = ClassName
tooltipClassName = The class name of this component.
tooltipName = The name of this component.
tooltipSaveProject = Saves the current project
tooltipManageLibraries = Manages the libraries of the project
tooltipScaleToFit = Scales to graph to fit the windows size
tooltipGrid = Enables and disables the grid
tooltipSnap = Enables and disables the grid snap
tooltipAutoLayout = Performs an auto layout
availablePlugins = Available Plugins
......
Kieker.WebGUI/src/main/resources/lang/Common_de.properties
+ 6
− 0
View file @ 185abcba
......@@ -50,6 +50,12 @@ stateTerminated = Beendet
stateFailed = Absturz
stateTerminating = Beim Beenden
tooltipUndo = Macht den letzten Schritt rckgngig
tooltipRedo = Stellt den letzten Schritt wieder her
undo = Rckgngig
redo = Wiederherstellen
#------------------------------------------------------------------------------
#
# These are the messages for the settings dialog.
......
Kieker.WebGUI/src/main/resources/lang/Common_en.properties
+ 5
− 0
View file @ 185abcba
......@@ -50,6 +50,11 @@ stateTerminated = Terminated
stateFailed = Failed
stateTerminating = Terminating
tooltipUndo = Undos the last step
tooltipRedo = Redos the last step
undo = Undo
redo = Redo
#------------------------------------------------------------------------------
#
# These are the messages for the settings dialog.
......
Kieker.WebGUI/src/main/resources/lang/UserManagementPage_de.properties
+ 3
− 1
View file @ 185abcba
......@@ -18,4 +18,6 @@ editPassword = Password
username = Benutzername
userrole = Benutzerrolle
password = Passwort
enabled = Aktiviert
\ No newline at end of file
enabled = Aktiviert
state = Status
\ No newline at end of file
Kieker.WebGUI/src/main/resources/lang/UserManagementPage_en.properties
+ 3
− 1
View file @ 185abcba
......@@ -18,4 +18,6 @@ editPassword = Edit Password
username = Username
userrole = Userrole
password = Password
enabled = Enabled
\ No newline at end of file
enabled = Enabled
state = State
\ No newline at end of file
Kieker.WebGUI/src/main/webapp/css/ControllerPage.css
+ 0
− 8
View file @ 185abcba
......@@ -3,12 +3,4 @@
/* This is necessary to remove the border from the datalist */
.ui-datalist * {
border : 0px !important;
}
.col1 {
width: 50% !important;
}
.col2 {
width: 50% !important;
}
\ No newline at end of file
Kieker.WebGUI/src/main/webapp/css/Icons.css
+ 23
− 0
View file @ 185abcba
......@@ -199,3 +199,26 @@
width:16px;
}
.ui-icon-undo {
background: url('../img/icons/Undo.png') no-repeat !important;
height:32px;
width:32px;
}
.ui-icon-redo {
background: url('../img/icons/Redo.png') no-repeat !important;
height:32px;
width:32px;
}
.ui-icon-undoSmall {
background: url('../img/icons/UndoSmall.png') no-repeat !important;
height:16px;
width:16px;
}
.ui-icon-redoSmall {
background: url('../img/icons/RedoSmall.png') no-repeat !important;
height:16px;
width:16px;
}
\ No newline at end of file
Kieker.WebGUI/src/main/webapp/css/UserManagement.css
+ 18
− 0
View file @ 185abcba
......@@ -13,4 +13,22 @@
.col2 {
text-align: left;
}
.ui-layout-center {
border-style: none !important;
}
/* The following code is for icon definition. */
.ui-icon-newUserSmall {
background: url('../img/icons/NewUserSmall.png') no-repeat !important;
height:16px;
width:16px;
}
.ui-icon-newUser {
background: url('../img/icons/NewUser.png') no-repeat !important;
height:32px;
width:32px;
}
\ No newline at end of file
Kieker.WebGUI/src/main/webapp/dialogs/UserManagementDialogs.xhtml
+ 8
− 8
View file @ 185abcba
......@@ -6,7 +6,7 @@
xmlns:p="http://primefaces.org/ui"
xmlns:c="http://java.sun.com/jsp/jstl/core">
<p:dialog id="newUserDialog" header="Neuer Benutzer" resizable="false" modal="true" widgetVar="newUserDlg">
<p:dialog id="newUserDialog" header="#{localizedUserManagementMessages.newUser}" resizable="false" modal="true" widgetVar="newUserDlg">
<!-- Make sure that closing of the dialog also clears the input fields. -->
<p:ajax event="close" update=":newUserDialogForm" />
<h:form id="newUserDialogForm">
......@@ -38,7 +38,7 @@
</h:form>
</p:dialog>
<p:dialog id="editUserDialog" header="Benutzer Bearbeiten" resizable="false" modal="true" widgetVar="editUserDlg">
<p:dialog id="editUserDialog" header="#{localizedUserManagementMessages.editUser}" resizable="false" modal="true" widgetVar="editUserDlg">
<!-- Make sure that closing of the dialog also clears the input field. -->
<p:ajax event="close" update=":editUserDialogForm" />
<h:form id="editUserDialogForm">
......@@ -47,14 +47,14 @@
<h:outputText value="#{localizedUserManagementMessages.username}: " />
<p:inputText value="#{currentUserManagementBean.selectedUserCopy.name}" style="width: 100%" disabled="true" />
<h:outputText value="Benutzerrolle: " />
<h:outputText value="#{localizedUserManagementMessages.userrole}: " />
<p:selectOneRadio value="#{currentUserManagementBean.selectedUserCopy.role}" converter="roleStringConverter">
<f:selectItem itemLabel="Gast" itemValue="#{ROLE_GUEST}" />
<f:selectItem itemLabel="Benutzer" itemValue="#{ROLE_USER}" />
<f:selectItem itemLabel="Administrator" itemValue="#{ROLE_ADMIN}" />
</p:selectOneRadio>
<h:outputText value="Status: " />
<h:outputText value="#{localizedUserManagementMessages.state}: " />
<p:selectOneRadio value="#{currentUserManagementBean.selectedUserCopy.enabled}">
<f:selectItem itemLabel="Aktiviert" itemValue="#{true}" />
<f:selectItem itemLabel="Deaktiviert" itemValue="#{false}" />
......@@ -69,16 +69,16 @@
</h:form>
</p:dialog>
<p:dialog id="editPasswordDialog" header="Passwort Bearbeiten" resizable="false" modal="true" widgetVar="editPasswordDlg">
<p:dialog id="editPasswordDialog" header="#{localizedUserManagementMessages.editPassword}" resizable="false" modal="true" widgetVar="editPasswordDlg">
<!-- Make sure that closing of the dialog also clears the input field. -->
<p:ajax event="close" update=":editPasswordDialogForm" />
<h:form id="editPasswordDialogForm">
<ui:fragment rendered="#{not empty currentUserManagementBean.selectedUser}">
<h:panelGrid columnClasses="col1 , col2" columns="2" cellpadding="5">
<h:outputText value="Benutzername: " />
<h:outputText value="#{localizedUserManagementMessages.username}: " />
<p:inputText value="#{currentUserManagementBean.selectedUserCopy.name}" style="width: 100%" disabled="true" />
<h:outputText value="Passwort: " />
<h:outputText value="#{localizedUserManagementMessages.password}: " />
<p:password feedback="true" value="#{currentUserManagementBean.selectedUserCopy.password}" style="width: 100%" />
</h:panelGrid>
</ui:fragment>
......@@ -90,7 +90,7 @@
</h:form>
</p:dialog>
<p:dialog id="deleteUserDialog" header="#{localizedProjectOverviewMessages.deleteProject}" resizable="false" modal="true" widgetVar="deleteUserDlg">
<p:dialog id="deleteUserDialog" header="#{localizedUserManagementMessages.deleteUser}}" resizable="false" modal="true" widgetVar="deleteUserDlg">
<h:form>
<div style="text-align: center">
<h:outputText value="Wollen Sie den Benutzer wirklich löschen?" />
......
Kieker.WebGUI/src/main/webapp/img/icons/NewUser.png 0 → 100644
+ 0
− 0
View file @ 185abcba
Kieker.WebGUI/src/main/webapp/img/icons/NewUser.png

4.12 KiB

Kieker.WebGUI/src/main/webapp/img/icons/NewUserSmall.png 0 → 100644
+ 0
− 0
View file @ 185abcba
Kieker.WebGUI/src/main/webapp/img/icons/NewUserSmall.png

1.1 KiB

Kieker.WebGUI/src/main/webapp/img/icons/Redo.png 0 → 100644
+ 0
− 0
View file @ 185abcba
Kieker.WebGUI/src/main/webapp/img/icons/Redo.png

4.1 KiB

Kieker.WebGUI/src/main/webapp/img/icons/RedoSmall.png 0 → 100644
+ 0
− 0
View file @ 185abcba
Kieker.WebGUI/src/main/webapp/img/icons/RedoSmall.png

1.1 KiB

Kieker.WebGUI/src/main/webapp/img/icons/Undo.png 0 → 100644
+ 0
− 0
View file @ 185abcba
Kieker.WebGUI/src/main/webapp/img/icons/Undo.png

4.1 KiB

Kieker.WebGUI/src/main/webapp/img/icons/UndoSmall.png 0 → 100644
+ 0
− 0
View file @ 185abcba
Kieker.WebGUI/src/main/webapp/img/icons/UndoSmall.png

1.1 KiB

Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
+ 27
− 12
View file @ 185abcba
......@@ -113,8 +113,8 @@
</p:submenu>
<p:submenu label="Graph">
<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: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()}" />
<p:separator/>
......@@ -128,11 +128,16 @@
<ui:define name="furtherMenuBar">
<p:spacer height="5"/>
<p:menubar>
<p:menuitem id="b1" styleClass="element-with-whitespace" icon="ui-icon-save" ajax="true" onstart="preSaveProject(false)" disabled="#{empty currentAnalysisEditorBean.project}"/>
<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"/>
<p:menuitem id="b2" styleClass="element-with-whitespace" icon="ui-icon-manageLibraries" onclick="manageLibrariesDialog.show()" ajax="true" disabled="#{empty currentAnalysisEditorBean.project}"/>
<p:menuitem id="btnManageLibraries" styleClass="element-with-whitespace" icon="ui-icon-manageLibraries" onclick="manageLibrariesDialog.show()" ajax="true" disabled="#{empty currentAnalysisEditorBean.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"/>
<!-- A dummy item as a separator between the items. -->
<p:menuitem style="width: 15px" disabled="true"/>
......@@ -141,16 +146,26 @@
<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: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}"/>
<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}"/>
<p:tooltip for="btnScaleToFit" value="#{localizedAnalysisEditorPageMessages.tooltipScaleToFit}"/>
<p:tooltip for="btnGrid" value="#{localizedAnalysisEditorPageMessages.tooltipGrid}"/>
<p:tooltip for="btnSnap" value="#{localizedAnalysisEditorPageMessages.tooltipSnap}"/>
<p:tooltip for="btnAutoLayout" value="#{localizedAnalysisEditorPageMessages.tooltipAutoLayout}"/>
</ui:define>
<ui:define name="centerContent">
<div id="center-container" style="width: 100%;height: 100%">
<div id="infovis"/>
</div>
<ui:define name="centerLayout">
<p:layoutUnit position="center" id="centerLayout">
<div id="center-container" style="width: 100%;height: 100%">
<div id="infovis"/>
</div>
</p:layoutUnit>
</ui:define>
<ui:define name="furtherLayoutUnits">
......
Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml
+ 16
− 14
View file @ 185abcba
......@@ -60,20 +60,22 @@
</ui:define>
<ui:define name="centerContent">
<h:form id="centerForm">
<ui:fragment rendered="#{not empty currentCockpitEditorBean.activeView}">
<!-- The following is a workaround necessary due to a bug in Primefaces. -->
<script type="text/javascript">
$('.ui-panel').click(function(event) {
nodeSelected([{name: 'id', value: event.currentTarget.id}]);
});
</script>
<p:dashboard id="dynamicDashboard" binding="#{currentCockpitEditorBean.dashboard}">
<p:ajax event="reorder" listener="#{currentCockpitEditorBean.handleReorder}"/>
</p:dashboard>
</ui:fragment>
</h:form>
<ui:define name="centerLayout">
<p:layoutUnit position="center">
<h:form id="centerForm">
<ui:fragment rendered="#{not empty currentCockpitEditorBean.activeView}">
<!-- The following is a workaround necessary due to a bug in Primefaces. -->
<script type="text/javascript">
$('.ui-panel').click(function(event) {
nodeSelected([{name: 'id', value: event.currentTarget.id}]);
});
</script>
<p:dashboard id="dynamicDashboard" binding="#{currentCockpitEditorBean.dashboard}">
<p:ajax event="reorder" listener="#{currentCockpitEditorBean.handleReorder}"/>
</p:dashboard>
</ui:fragment>
</h:form>
</p:layoutUnit>
</ui:define>
<ui:define name="furtherLayoutUnits">
......
Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
+ 6
− 4
View file @ 185abcba
......@@ -42,10 +42,12 @@
</p:submenu>
</ui:define>
<ui:define name="centerContent">
<h:form id="centerForm">
<p:dashboard disabled="true" id="dynamicDashboard" binding="#{currentCockpitBean.dashboard}"/>
</h:form>
<ui:define name="centerLayout">
<p:layoutUnit position="center">
<h:form id="centerForm">
<p:dashboard disabled="true" id="dynamicDashboard" binding="#{currentCockpitBean.dashboard}"/>
</h:form>
</p:layoutUnit>
</ui:define>
<ui:define name="furtherLayoutUnits">
......
Kieker.WebGUI/src/main/webapp/pages/ControllerPage.xhtml
+ 12
− 26
View file @ 185abcba
......@@ -39,28 +39,14 @@
</p:submenu>
</ui:define>
<ui:define name="centerContent">
<h:panelGrid columns="2" columnClasses="col1 , col2" cellpadding="5" style="width: 99%; height: 100%">
<p:panel style="width: 100%; height:100%" header="#{localizedControllerPageMessages.personalLog}" >
<h:form id="currentViewLog" style="width: 100%">
<p:dataList value="#{currentControllerBean.viewLog}" var="logEntry">
#{logEntry}
</p:dataList>
</h:form>
</p:panel>
<p:panel style="width: 100%; height:100%" header="#{localizedControllerPageMessages.analysisControllerLog}">
<h:form id="analysisControllerLog" style="width: 100%">
<p:dataList value="#{currentControllerBean.analysisLog}" var="logEntry">
#{logEntry}
</p:dataList>
</h:form>
</p:panel>
</h:panelGrid>
<ui:define name="centerLayout">
<p:layoutUnit header="#{localizedControllerPageMessages.analysisControllerLog}" position="center" id="centerLayout">
<h:form id="analysisControllerLog" style="width: 100%">
<p:dataList value="#{currentControllerBean.analysisLog}" var="logEntry">
#{logEntry}
</p:dataList>
</h:form>
</p:layoutUnit>
</ui:define>
<ui:define name="furtherLayoutUnits">
......@@ -69,13 +55,13 @@
<h:form id="controllerForm">
<div align="center">
<h:panelGrid columns="4" cellpadding="15">
<p:commandButton value="#{localizedControllerPageMessages.analysisControllerInstantiateAnalysisController}" action="#{currentControllerBean.instantiateAnalysis()}" update=":messages :currentViewLog" disabled="#{empty currentControllerBean.projectName}"/>
<p:commandButton value="#{localizedControllerPageMessages.analysisControllerInstantiateAnalysisController}" action="#{currentControllerBean.instantiateAnalysis()}" update=":messages" disabled="#{empty currentControllerBean.projectName}"/>
<p:commandButton value="#{localizedControllerPageMessages.analysisControllerCleaAnalysisController}" action="#{currentControllerBean.cleanAnalysis()}" update=":messages :currentViewLog" disabled="#{empty currentControllerBean.projectName}"/>
<p:commandButton value="#{localizedControllerPageMessages.analysisControllerCleaAnalysisController}" action="#{currentControllerBean.cleanAnalysis()}" update=":messages" disabled="#{empty currentControllerBean.projectName}"/>
<p:commandButton value="#{localizedControllerPageMessages.analysisControllerStartAnalysis}" action="#{currentControllerBean.startAnalysis()}" update=":messages :currentViewLog" disabled="#{empty currentControllerBean.projectName}"/>
<p:commandButton value="#{localizedControllerPageMessages.analysisControllerStartAnalysis}" action="#{currentControllerBean.startAnalysis()}" update=":messages" disabled="#{empty currentControllerBean.projectName}"/>
<p:commandButton value="#{localizedControllerPageMessages.analysisControllerStopAnalysis}" action="#{currentControllerBean.stopAnalysis()}" update=":messages :currentViewLog" disabled="#{empty currentControllerBean.projectName}"/>
<p:commandButton value="#{localizedControllerPageMessages.analysisControllerStopAnalysis}" action="#{currentControllerBean.stopAnalysis()}" update=":messages" disabled="#{empty currentControllerBean.projectName}"/>
</h:panelGrid>
<p:poll interval="1" update=":ledsForm :analysisControllerLog"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment