From 4c34220c65d1400d136d129fb86893c5e7138735 Mon Sep 17 00:00:00 2001
From: James Muehlner <james.muehlner@guac-dev.org>
Date: Wed, 5 Nov 2014 22:41:46 -0800
Subject: [PATCH] GUAC-807 Fixed login page error, minify button usage, and
 menu initial state.

---
 guacamole/pom.xml                                            | 5 +----
 .../main/webapp/app/client/controllers/clientController.js   | 2 +-
 .../webapp/app/index/services/authenticationInterceptor.js   | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index ab2a830c8..058987118 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -90,9 +90,6 @@
                     <execution>
                         <id>default-cli</id>
                         <phase>process-resources</phase>
-                        <configuration>
-                            <webappDirectory>${project.build.directory}/minify</webappDirectory>
-                        </configuration>
                         <goals>
                             <goal>exploded</goal>
                         </goals>
@@ -111,7 +108,7 @@
                         <configuration>
                             <charset>UTF-8</charset>
 
-                            <webappSourceDir>${project.build.directory}/minify</webappSourceDir>
+                            <webappSourceDir>${project.build.directory}/${project.build.finalName}</webappSourceDir>
 
                             <cssSourceDir>/</cssSourceDir>
                             <cssTargetDir>/</cssTargetDir>
diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js
index 328b74e59..d82d009c1 100644
--- a/guacamole/src/main/webapp/app/client/controllers/clientController.js
+++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js
@@ -44,7 +44,7 @@ angular.module('home').controller('clientController', ['$scope', '$routeParams',
     $scope.clientProperties = {scale: 1};
     
     // Hide menu by default
-    $scope.menuShown        = true;
+    $scope.menuShown        = false;
             
     /*
      * Parse the type, name, and id out of the url paramteres, 
diff --git a/guacamole/src/main/webapp/app/index/services/authenticationInterceptor.js b/guacamole/src/main/webapp/app/index/services/authenticationInterceptor.js
index f2ad9526a..744e08924 100644
--- a/guacamole/src/main/webapp/app/index/services/authenticationInterceptor.js
+++ b/guacamole/src/main/webapp/app/index/services/authenticationInterceptor.js
@@ -31,7 +31,7 @@ angular.module('index').factory('authenticationInterceptor', ['$location', '$q',
         'responseError': function(rejection) {
             // Do not redirect failed login requests to the login page.
             if ((rejection.status === 401 || rejection.status === 403)
-                    && rejection.config.url.search('api/login') === -1) {
+                    && rejection.config.url.search('api/token') === -1) {
                 $location.path('/login');
             }
             return $q.reject(rejection);