summary refs log tree commit diff
path: root/webclient/index.html
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-22 18:18:27 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-22 18:18:27 +0200
commit41d1db2d4ab26bc87840de879e45210c9d3284a3 (patch)
tree9c9614b665e2a878862cffc5d854fd5c6c4630e6 /webclient/index.html
parentMerge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1 (diff)
parentUse /home everywhere (diff)
downloadsynapse-41d1db2d4ab26bc87840de879e45210c9d3284a3.tar.xz
Merge branch 'settings-page' into develop
Diffstat (limited to 'webclient/index.html')
-rw-r--r--webclient/index.html14
1 files changed, 3 insertions, 11 deletions
diff --git a/webclient/index.html b/webclient/index.html
index 27d9208193..ed1d9bb031 100644
--- a/webclient/index.html
+++ b/webclient/index.html
@@ -15,10 +15,11 @@
     <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>
     <script src="components/matrix/event-stream-service.js"></script>
@@ -33,22 +34,13 @@
     <header id="header">
         <!-- Do not show buttons on the login page -->
         <div id="header-buttons" ng-hide="'/login' == location ">
-            <button ng-click="showConfig()">Config</button>
+            <button ng-click='go("settings")'>Settings</button>
             <button ng-click="logout()">Log out</button>
         </div>
 
         <h1>[matrix]</h1>
     </header>
 
-    <div id="config" ng-hide="!config">
-        <div>Home server: {{ config.homeserver }} </div>
-        <div>User ID: {{ config.user_id }} </div>
-        <div>Access token: {{ config.access_token }} </div>
-        <div><button ng-click="requestNotifications()">Request notifications</button></div>
-        <div><button ng-click="closeConfig()">Close</button></div>
-    </div>
-
-
     <div ng-view></div>
 
 </body>