safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-919: Fix filtering of project properties in web pages.

Browse Source
This commit is contained in:
Michael Jumper
2014-11-03 16:24:26 -08:00
parent 161c4d2359
commit b655b58267
4 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
guacamole/pom.xml
View File

@@ -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>

2
guacamole/src/main/webapp/app/client/templates/client.html
View File

@@ -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">

6
guacamole/src/main/webapp/app/index/config/indexRouteConfig.js
View File

@@ -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'
}).

4
guacamole/src/main/webapp/translations/en_US.json
View File

@@ -1,6 +1,6 @@
{
"index": {
"title" : "Guacamole 0.9.1"
"application": {
"title" : "Guacamole ${project.version}"
},
"login": {