From 6033c559522d7d9a6a4a6c0ccec6cbe2c1fa008d Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Sat, 16 Mar 2013 23:00:32 +0100
Subject: [PATCH] Added some localization strings.
---
.../src/main/resources/lang/Common_de.properties | 3 +++
.../src/main/resources/lang/Common_en.properties | 3 +++
.../resources/lang/UserManagementPage_de.properties | 1 +
.../resources/lang/UserManagementPage_en.properties | 1 +
.../webapp/dialogs/AnalysisEditorPageDialogs.xhtml | 6 +++---
.../src/main/webapp/dialogs/SettingsDialog.xhtml | 11 +++++++----
.../main/webapp/dialogs/UserManagementDialogs.xhtml | 4 ++--
.../src/main/webapp/pages/ProjectOverviewPage.xhtml | 2 +-
8 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/Kieker.WebGUI/src/main/resources/lang/Common_de.properties b/Kieker.WebGUI/src/main/resources/lang/Common_de.properties
index 418ca557..70b373b8 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 db7a6787..dddf48c9 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 2669b5ff..545660e1 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 a76b097a..971b6db5 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 a1d1aaa1..3b305610 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 5244b01b..fe1a2d72 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 ce56e1e7..6422c33f 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 97d97a2a..598930a3 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>
--
GitLab