diff --git a/Kieker.WebGUI/src/main/resources/lang/Common_de.properties b/Kieker.WebGUI/src/main/resources/lang/Common_de.properties index 418ca5572f452013af3021a12780aa22e4b6740a..70b373b8b76f63631e13a8750d158d80e9e4bc63 100644 --- a/Kieker.WebGUI/src/main/resources/lang/Common_de.properties +++ b/Kieker.WebGUI/src/main/resources/lang/Common_de.properties @@ -53,6 +53,9 @@ lists = Listen gridSize = Gittergr\u00f6\u00dfe gridColor = Gitterfarbe +showUninitializedComponents = Zeige uninitialisierte Komponenten an +showComponentsWithoutDisplays = Zeige Komponenten ohne Displays an + #------------------------------------------------------------------------------ # # The following are error, exception and log messages. diff --git a/Kieker.WebGUI/src/main/resources/lang/Common_en.properties b/Kieker.WebGUI/src/main/resources/lang/Common_en.properties index db7a6787e6088f3820a395cd76387bdfa7d2e0e9..dddf48c9832840699ad25df8c07e92da1707bef6 100644 --- a/Kieker.WebGUI/src/main/resources/lang/Common_en.properties +++ b/Kieker.WebGUI/src/main/resources/lang/Common_en.properties @@ -53,6 +53,9 @@ lists = Lists gridSize = Grid-Size gridColor = Grid-Color +showUninitializedComponents = Show uninitialized components +showComponentsWithoutDisplays = Show components without displays + #------------------------------------------------------------------------------ # # The following are error, exception and log messages. diff --git a/Kieker.WebGUI/src/main/resources/lang/UserManagementPage_de.properties b/Kieker.WebGUI/src/main/resources/lang/UserManagementPage_de.properties index 2669b5ffab436eef92636f0213e50af2b1ddd240..545660e1edb20ed4ced14cd50532509da482f9a4 100644 --- a/Kieker.WebGUI/src/main/resources/lang/UserManagementPage_de.properties +++ b/Kieker.WebGUI/src/main/resources/lang/UserManagementPage_de.properties @@ -17,4 +17,5 @@ editPassword = Password username = Benutzername userrole = Benutzerrolle +password = Passwort enabled = Aktiviert \ No newline at end of file diff --git a/Kieker.WebGUI/src/main/resources/lang/UserManagementPage_en.properties b/Kieker.WebGUI/src/main/resources/lang/UserManagementPage_en.properties index a76b097a357307f7d9ef941db1a8b5e83578afff..971b6db55f33a6d3713bbb80d467409308d9e8c6 100644 --- a/Kieker.WebGUI/src/main/resources/lang/UserManagementPage_en.properties +++ b/Kieker.WebGUI/src/main/resources/lang/UserManagementPage_en.properties @@ -17,4 +17,5 @@ editPassword = Edit Password username = Username userrole = Userrole +password = Password enabled = Enabled \ 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 a1d1aaa13956456a76e9c333395b5dce52bff892..3b3056106e3340df068cef8fe0260f2bc4f28309 100644 --- a/Kieker.WebGUI/src/main/webapp/dialogs/AnalysisEditorPageDialogs.xhtml +++ b/Kieker.WebGUI/src/main/webapp/dialogs/AnalysisEditorPageDialogs.xhtml @@ -6,7 +6,7 @@ <p:dialog id="manageLibrariesDlg" header="#{localizedAnalysisEditorPageMessages.libraries}" resizable="false" modal="true" widgetVar="manageLibrariesDialog"> <h:form id="dependenciesForm"> - <p:dataTable id="currentDependencies" value="#{currentAnalysisEditorBean.libraries}" var="dependency" paginator="true" rows="10" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" > + <p:dataTable id="currentDependencies" value="#{currentAnalysisEditorBean.libraries}" rowIndexVar="rowIndex" var="dependency" paginator="true" rows="10" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" > <p:column headerText="#{localizedAnalysisEditorPageMessages.fileName}"> <h:outputText value="#{dependency}"/> @@ -17,8 +17,8 @@ </p:column> <p:column headerText="#{localizedAnalysisEditorPageMessages.libOptions}" style="text-align: center; width:40px"> - <p:commandButton id="deleteButton" icon="ui-icon-delete" action="#{currentAnalysisEditorBean.deleteLibrary(dependency)}" update=":dependenciesForm :messages :toolpalette"/> - <p:tooltip for="deleteButton" value="Delete Library"/> + <p:commandButton id="deleteButton" icon="ui-icon-delete" rendered="#{rowIndex != 0}" action="#{currentAnalysisEditorBean.deleteLibrary(dependency)}" update=":dependenciesForm :messages :toolpalette"/> + <p:tooltip for="deleteButton" rendered="#{rowIndex != 0}" value="Delete Library"/> </p:column> </p:dataTable> </h:form> diff --git a/Kieker.WebGUI/src/main/webapp/dialogs/SettingsDialog.xhtml b/Kieker.WebGUI/src/main/webapp/dialogs/SettingsDialog.xhtml index 5244b01b9ce537c591f046cf362fd85402b89f1c..fe1a2d7202d54997ed85d9e0195e323c8591bcf6 100644 --- a/Kieker.WebGUI/src/main/webapp/dialogs/SettingsDialog.xhtml +++ b/Kieker.WebGUI/src/main/webapp/dialogs/SettingsDialog.xhtml @@ -35,20 +35,23 @@ <h:outputText value="#{localizedMessages.gridColor}:"/> <p:colorPicker style="width: 100%" value="#{userBean.gridColor}" valueChangeListener="#{currentAnalysisEditorBean.gridColorListener}"/> + + <h:outputText value="#{localizedMessages.showUninitializedComponents}:"/> + <p:selectBooleanCheckbox disabled="true"/> </h:panelGrid> </p:tab> <p:tab title="#{localizedMessages.analysisController}" disabled="true"> </p:tab> <p:tab title="#{localizedMessages.cockpitEditor}"> <h:panelGrid columns="2" cellpadding="10" columnClasses="rightAlignedColumn, normalColumn"> - <h:outputText value="Show components without displays:"/> - <p:selectBooleanCheckbox> - - </p:selectBooleanCheckbox> + <h:outputText value="#{localizedMessages.showComponentsWithoutDisplays}:"/> + <p:selectBooleanCheckbox disabled="true"/> </h:panelGrid> </p:tab> <p:tab title="#{localizedMessages.cockpit}" disabled="true"> </p:tab> + <p:tab title="User Managment" disabled="true"> + </p:tab> </p:tabView> <hr/> <div style="text-align: right"> diff --git a/Kieker.WebGUI/src/main/webapp/dialogs/UserManagementDialogs.xhtml b/Kieker.WebGUI/src/main/webapp/dialogs/UserManagementDialogs.xhtml index ce56e1e7c515c88f90b324c094ca906ca9509086..6422c33fb6e554178e8d4901e9f73da924f897a8 100644 --- a/Kieker.WebGUI/src/main/webapp/dialogs/UserManagementDialogs.xhtml +++ b/Kieker.WebGUI/src/main/webapp/dialogs/UserManagementDialogs.xhtml @@ -17,14 +17,14 @@ <h:outputText value="#{localizedUserManagementMessages.password}: " /> <p:password feedback="true" value="#{newUserBean.password}" style="width: 100%" /> - <h:outputText value="Benutzerrolle: " /> + <h:outputText value="#{localizedUserManagementMessages.userrole}: " /> <p:selectOneRadio value="#{newUserBean.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.enabled}: " /> <p:selectOneRadio value="#{newUserBean.active}"> <f:selectItem itemLabel="Aktiviert" itemValue="#{true}" /> <f:selectItem itemLabel="Deaktiviert" itemValue="#{false}" /> diff --git a/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml index 97d97a2aaad7fca64a3cbe636027bd7c0543a0ee..598930a3c3ff6cf6d49573b7a4e1b58c4fb7d8db 100644 --- a/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml +++ b/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml @@ -53,7 +53,7 @@ <f:param name="projectName" value="#{project}"/> </p:menuitem> <c:if test="#{sec:areAnyGranted('User, Administrator')}"> - <p:menuitem icon="ui-icon-analysis" id="controlAnalysis" styleClass="element-with-whitespace" value=" #{localizedMessages.analysis}" ajax="false" outcome="controller"> + <p:menuitem icon="ui-icon-analysis" id="controlAnalysis" styleClass="element-with-whitespace" value=" #{localizedMessages.analysis}" ajax="false" outcome="controller"> <f:param name="projectName" value="#{project}"/> </p:menuitem> </c:if>