diff --git a/Kieker.WebGUI/lib/guava-13.0.1.LICENSE b/Kieker.WebGUI/lib/guava-14.0.1.LICENSE similarity index 100% rename from Kieker.WebGUI/lib/guava-13.0.1.LICENSE rename to Kieker.WebGUI/lib/guava-14.0.1.LICENSE diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml index ab36a142b97ad96280e9b491644f35921b3576e2..5bfa4b3f0256806c69f783acbe786d6de95e2468 100644 --- a/Kieker.WebGUI/pom.xml +++ b/Kieker.WebGUI/pom.xml @@ -29,7 +29,6 @@ <klay.jar>klay_0.2.0.jar</klay.jar> <spring.version>3.1.2.RELEASE</spring.version> <slf4j.version>1.7.2</slf4j.version> - <primefaces.themes.version>1.0.9</primefaces.themes.version> </properties> <repositories> @@ -140,7 +139,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>13.0.1</version> + <version>14.0.1</version> </dependency> <dependency> <groupId>commons-dbcp</groupId> diff --git a/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_de.properties b/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_de.properties index 870ad76d39c513189c616565f1d905186f7c3777..2cbc58d6fd7916c2deb814f66db414a7d0faf9d5 100644 --- a/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_de.properties +++ b/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_de.properties @@ -10,4 +10,7 @@ copyView = Ansicht Kopieren renameView = Ansicht Umbenennen deleteView = Ansicht Löschen -name = Name \ No newline at end of file +name = Name + +msgCockpitEditorWelcomeShort = Entwicklungsphase +msgCockpitEditorWelcome = Der Cockpit Editor befindet sich zur Zeit noch in der Entwicklungsphase. \ No newline at end of file diff --git a/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_en.properties b/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_en.properties index 71f62abfbd817358cd99d65b3c419f8bf7e69f67..55dadc86057a2c0861c1d8e078f944a1cae9ceee 100644 --- a/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_en.properties +++ b/Kieker.WebGUI/src/main/resources/lang/CockpitEditorPage_en.properties @@ -10,4 +10,7 @@ copyView = Copy View renameView = Rename View deleteView = Delete View -name = Name \ No newline at end of file +name = Name + +msgCockpitEditorWelcomeShort = Development Stage +msgCockpitEditorWelcome = The cockpit editor is still in the development stage. \ No newline at end of file diff --git a/Kieker.WebGUI/src/main/resources/lang/CockpitPage_de.properties b/Kieker.WebGUI/src/main/resources/lang/CockpitPage_de.properties index 2e3d90c2b348e1a04d06d723b9bea51cafe630ad..629ae3d31db19b1ab081be39a7a83516c7b0d1e7 100644 --- a/Kieker.WebGUI/src/main/resources/lang/CockpitPage_de.properties +++ b/Kieker.WebGUI/src/main/resources/lang/CockpitPage_de.properties @@ -3,4 +3,7 @@ # Diese Datei beinhaltet sämtliche Nachrichten, Buttonbeschriftungen etc., # welche innerhalb des Cockpits benutzt werden. # -#------------------------------------------------------------------------------ \ No newline at end of file +#------------------------------------------------------------------------------ + +msgCockpitWelcomeShort = Entwicklungsphase +msgCockpitWelcome = Das Cockpit befindet sich zur Zeit noch in der Entwicklungsphase. \ No newline at end of file diff --git a/Kieker.WebGUI/src/main/resources/lang/CockpitPage_en.properties b/Kieker.WebGUI/src/main/resources/lang/CockpitPage_en.properties index 0836a7cfca1631a0e62b6a817c9aec90901673f5..868dd2a1f872ade5acaf34fb00a8a8ed3e8875d7 100644 --- a/Kieker.WebGUI/src/main/resources/lang/CockpitPage_en.properties +++ b/Kieker.WebGUI/src/main/resources/lang/CockpitPage_en.properties @@ -3,4 +3,7 @@ # This file contains all messages, button captions etc. which are used within # the cockpit page. # -#------------------------------------------------------------------------------ \ No newline at end of file +#------------------------------------------------------------------------------ + +msgCockpitWelcomeShort = Development Stage +msgCockpitWelcome = The cockpit is still in the development stage. \ No newline at end of file diff --git a/Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml index bd0356c2094862e1bdfbf434f130d671fa3bf398..1bcca305cd1b6847f1fe6cf752ed8966961cb93f 100644 --- a/Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml +++ b/Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml @@ -36,6 +36,15 @@ <p:remoteCommand autoRun="false" name="nodeSelected" action="#{currentCockpitEditorBean.nodeSelected()}" update=":propertiesForm" /> </h:form> </ui:define> + + <ui:define name="js"> + <!-- This javascript code will be executed in the onload-part of the body and shows a localized message via the growl-component. --> + <script> + bodyLoaded = function() { + msgs.renderMessage({summary : '#{localizedCockpitEditorPageMessages.msgCockpitEditorWelcomeShort}', detail : '#{localizedCockpitEditorPageMessages.msgCockpitEditorWelcome}', severity: 'info'}); + } + </script> + </ui:define> <!-- Those are the menu bar entries left from the help-submenu. --> <ui:define name="furtherMenuBarEntries"> diff --git a/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml index 5fa439fcc5286de7f12f8b264325566aaa7e8b11..93e8108b89a03be7956ac2b3577f10512b7ed0f1 100644 --- a/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml +++ b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml @@ -30,6 +30,15 @@ <ui:define name="cssIncludes"> <link rel="stylesheet" type="text/css" href="#{root}/css/CockpitPage.css" /> </ui:define> + + <ui:define name="js"> + <!-- This javascript code will be executed in the onload-part of the body and shows a localized message via the growl-component. --> + <script> + bodyLoaded = function() { + msgs.renderMessage({summary : '#{localizedCockpitPageMessages.msgCockpitWelcomeShort}', detail : '#{localizedCockpitPageMessages.msgCockpitWelcome}', severity: 'info'}); + } + </script> + </ui:define> <!-- Those are the menu bar entries left from the help-submenu. --> <ui:define name="furtherMenuBarEntries">