Use /home everywhere

6 files changed, 12 insertions, 12 deletions

diff --git a/webclient/app.js b/webclient/app.js

index f666a63bf8..e5d8513944 100644
--- a/webclient/app.js
+++ b/webclient/app.js
@@ -19,7 +19,7 @@ var matrixWebClient = angular.module('matrixWebClient', [
     'MatrixWebClientController',
     'LoginController',
     'RoomController',
-    'RoomsController',
+    'HomeController',
     'SettingsController',
     'UserController',
     'matrixService',
@@ -45,9 +45,9 @@ matrixWebClient.config(['$routeProvider', '$provide', '$httpProvider',
                 templateUrl: 'room/room.html',
                 controller: 'RoomController'
             }).
-            when('/rooms', {
-                templateUrl: 'rooms/rooms.html',
-                controller: 'RoomsController'
+            when('/home', {
+                templateUrl: 'home/home.html',
+                controller: 'HomeController'
             }).
             when('/settings', {
                 templateUrl: 'settings/settings.html',
@@ -58,7 +58,7 @@ matrixWebClient.config(['$routeProvider', '$provide', '$httpProvider',
                 controller: 'UserController'
             }).
             otherwise({
-                redirectTo: '/rooms'
+                redirectTo: '/home'
             });
             
         $provide.factory('AccessTokenInterceptor', ['$q', '$rootScope', 
diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js

index d891558be5..a3d7308312 100644
--- a/webclient/home/home-controller.js
+++ b/webclient/home/home-controller.js
@@ -16,8 +16,8 @@ limitations under the License.
 
 'use strict';
 
-angular.module('RoomsController', ['matrixService', 'mFileInput', 'mFileUpload', 'eventHandlerService'])
-.controller('RoomsController', ['$scope', '$location', 'matrixService', 'mFileUpload', 'eventHandlerService', 'eventStreamService', 
+angular.module('HomeController', ['matrixService', 'mFileInput', 'mFileUpload', 'eventHandlerService'])
+.controller('HomeController', ['$scope', '$location', 'matrixService', 'mFileUpload', 'eventHandlerService', 'eventStreamService', 
                                function($scope, $location, matrixService, mFileUpload, eventHandlerService, eventStreamService) {
 
     $scope.config = matrixService.config();
diff --git a/webclient/home/home.html b/webclient/home/home.html

index 2e25c0f084..4818d414b6 100644
--- a/webclient/home/home.html
+++ b/webclient/home/home.html
@@ -1,4 +1,4 @@
-<div ng-controller="RoomsController" class="rooms">
+<div ng-controller="HomeController">
 
     <div id="page">
     <div id="wrapper">
diff --git a/webclient/index.html b/webclient/index.html

index 95f682580e..ed1d9bb031 100644
--- a/webclient/index.html
+++ b/webclient/index.html
@@ -15,10 +15,10 @@
     <script src="app-controller.js"></script>
     <script src="app-directive.js"></script>
     <script src="app-filter.js"></script>
+    <script src="home/home-controller.js"></script>
     <script src="login/login-controller.js"></script>
     <script src="room/room-controller.js"></script>
     <script src="room/room-directive.js"></script>
-    <script src="rooms/rooms-controller.js"></script>
     <script src="settings/settings-controller.js"></script>
     <script src="user/user-controller.js"></script>
     <script src="components/matrix/matrix-service.js"></script>
diff --git a/webclient/login/login-controller.js b/webclient/login/login-controller.js

index 2f1f224a94..cd13dcea82 100644
--- a/webclient/login/login-controller.js
+++ b/webclient/login/login-controller.js
@@ -53,7 +53,7 @@ angular.module('LoginController', ['matrixService'])
                 matrixService.saveConfig();
                 eventStreamService.resume();
                  // Go to the user's rooms list page
-                $location.url("rooms");
+                $location.url("home");
             },
             function(error) {
                 if (error.data) {
@@ -84,7 +84,7 @@ angular.module('LoginController', ['matrixService'])
                     });
                     matrixService.saveConfig();
                     eventStreamService.resume();
-                    $location.url("rooms");
+                    $location.url("home");
                 }
                 else {
                     $scope.feedback = "Failed to login: " + JSON.stringify(response.data);
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js

index 26d1836fc2..65a33dd60b 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -364,7 +364,7 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
         matrixService.leave($scope.room_id).then(
             function(response) {
                 console.log("Left room ");
-                $location.url("rooms");
+                $location.url("home");
             },
             function(error) {
                 $scope.feedback = "Failed to leave room: " + error.data.error;