4 files changed, 43 insertions, 0 deletions
diff --git a/webclient/app.js b/webclient/app.js
index a3d1505f81..576912be46 100644
--- a/webclient/app.js
+++ b/webclient/app.js
@@ -20,6 +20,7 @@ var matrixWebClient = angular.module('matrixWebClient', [
     'LoginController',
     'RoomController',
     'RoomsController',
+    'UserController',
     'matrixService',
     'eventStreamService',
     'eventHandlerService',
@@ -47,6 +48,10 @@ matrixWebClient.config(['$routeProvider', '$provide', '$httpProvider',
                 templateUrl: 'rooms/rooms.html',
                 controller: 'RoomsController'
             }).
+            when('/user/:user_matrix_id', {
+                templateUrl: 'user/user.html',
+                controller: 'UserController'
+            }).
             otherwise({
                 redirectTo: '/rooms'
             });
diff --git a/webclient/index.html b/webclient/index.html
index 455eff4a13..51f6ff1f4d 100644
--- a/webclient/index.html
+++ b/webclient/index.html
@@ -16,6 +16,7 @@
     <script src="login/login-controller.js"></script>
     <script src="room/room-controller.js"></script>
     <script src="rooms/rooms-controller.js"></script>
+    <script src="user/user-controller.js"></script>
     <script src="components/matrix/matrix-service.js"></script>
     <script src="components/matrix/event-stream-service.js"></script>
     <script src="components/matrix/event-handler-service.js"></script>
diff --git a/webclient/user/user-controller.js b/webclient/user/user-controller.js
new file mode 100644
index 0000000000..4b7aa62d42
--- /dev/null
+++ b/webclient/user/user-controller.js
@@ -0,0 +1,25 @@
+/*
+Copyright 2014 matrix.org
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+'use strict';
+
+angular.module('UserController', ['matrixService'])
+.controller('UserController', ['$scope', '$routeParams',
+                              function($scope, $routeParams) {                 
+    $scope.user = {
+        id: $routeParams.user_matrix_id
+    };
+}]);
\ No newline at end of file
diff --git a/webclient/user/user.html b/webclient/user/user.html
new file mode 100644
index 0000000000..f548e05a71
--- /dev/null
+++ b/webclient/user/user.html
@@ -0,0 +1,12 @@
+<div ng-controller="UserController" class="user">
+
+    <div id="page">
+    <div id="wrapper">
+        
+        <div> {{ user.id }}</div>
+    
+        {{ feedback }}
+
+    </div>    
+    </div>
+</div>