From b655b58267a40c9f106f784c615e98b272da73b9 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Mon, 3 Nov 2014 16:24:26 -0800
Subject: [PATCH] GUAC-919: Fix filtering of project properties in web pages.

---
 guacamole/pom.xml                             | 44 +++++++++++--------
 .../webapp/app/client/templates/client.html   |  2 +-
 .../app/index/config/indexRouteConfig.js      |  6 +--
 .../src/main/webapp/translations/en_US.json   |  4 +-
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 27ccde6e6..ab2a830c8 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -63,29 +63,35 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+
+                    <!-- Filter translation strings -->
+                    <webResources>
+                        <resource>
+                            <directory>src/main/webapp</directory>
+                            <filtering>true</filtering>
+                            <includes>
+                                <include>translations/*.json</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+
+                    <!-- Add files from guacamole-common-js -->
+                    <overlays>
+                        <overlay>
+                            <groupId>org.glyptodon.guacamole</groupId>
+                            <artifactId>guacamole-common-js</artifactId>
+                            <type>zip</type>
+                        </overlay>
+                    </overlays>
+            
+                </configuration>
                 <executions>
                     <execution>
                         <id>default-cli</id>
                         <phase>process-resources</phase>
                         <configuration>
-
-                            <!-- Filter webapp dir --> 
-                            <webResources>
-                                <resource>
-                                    <directory>src/main/webapp</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </webResources>
-                            
-                            <!-- Add files from guacamole-common-js -->
-                            <overlays>
-                                <overlay>
-                                    <groupId>org.glyptodon.guacamole</groupId>
-                                    <artifactId>guacamole-common-js</artifactId>
-                                    <type>zip</type>
-                                </overlay>
-                            </overlays>
-                            
+                            <webappDirectory>${project.build.directory}/minify</webappDirectory>
                         </configuration>
                         <goals>
                             <goal>exploded</goal>
@@ -105,7 +111,7 @@
                         <configuration>
                             <charset>UTF-8</charset>
 
-                            <webappSourceDir>${project.build.directory}/${project.build.finalName}</webappSourceDir>
+                            <webappSourceDir>${project.build.directory}/minify</webappSourceDir>
 
                             <cssSourceDir>/</cssSourceDir>
                             <cssTargetDir>/</cssTargetDir>
diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html
index 7c2d6da11..0ec1fd43a 100644
--- a/guacamole/src/main/webapp/app/client/templates/client.html
+++ b/guacamole/src/main/webapp/app/client/templates/client.html
@@ -42,7 +42,7 @@
 
     <!-- Menu -->
     <div ng-class="{open: menuShown}" id="menu">
-        <h2 id="menu-title">Guacamole ${project.version}</h2>
+        <h2 id="menu-title">{{'application.title' | translate}}</h2>
 
         <h3>{{'client.clipboard' | translate}}</h3>
         <div class="content" id="clipboard-settings">
diff --git a/guacamole/src/main/webapp/app/index/config/indexRouteConfig.js b/guacamole/src/main/webapp/app/index/config/indexRouteConfig.js
index c1bebccaa..8f2c9c8d7 100644
--- a/guacamole/src/main/webapp/app/index/config/indexRouteConfig.js
+++ b/guacamole/src/main/webapp/app/index/config/indexRouteConfig.js
@@ -31,17 +31,17 @@ angular.module('index').config(['$routeProvider', '$locationProvider',
     
     $routeProvider.
         when('/', {
-            title: 'index.title',
+            title: 'application.title',
             templateUrl: 'app/home/templates/home.html',
             controller: 'homeController'
         }).
         when('/manage/', {
-            title: 'index.title',
+            title: 'application.title',
             templateUrl: 'app/manage/templates/manage.html',
             controller: 'manageController'
         }).
         when('/login/', {
-            title: 'index.title',
+            title: 'application.title',
             templateUrl: 'app/login/templates/login.html',
             controller: 'loginController'
         }).
diff --git a/guacamole/src/main/webapp/translations/en_US.json b/guacamole/src/main/webapp/translations/en_US.json
index a19b79083..cdba3b00c 100644
--- a/guacamole/src/main/webapp/translations/en_US.json
+++ b/guacamole/src/main/webapp/translations/en_US.json
@@ -1,6 +1,6 @@
 {
-    "index": {
-        "title" : "Guacamole 0.9.1"
+    "application": {
+        "title" : "Guacamole ${project.version}"
     },
     
     "login": {