diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 09:26:33 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 09:26:33 +0100 |
| commit | 47c3a089c5c3016197964f16f611f72bc4aadde6 (patch) | |
| tree | f0a4d1a660e4ae2a58077ad1c250353781445cff /webclient/index.html | |
| parent | Removed member list servlet: now using generic state paths. (diff) | |
| parent | Order 'get_recent_events_for_room' correctly. (diff) | |
| download | synapse-47c3a089c5c3016197964f16f611f72bc4aadde6.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
Diffstat (limited to 'webclient/index.html')
| -rw-r--r-- | webclient/index.html | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/webclient/index.html b/webclient/index.html index 27d9208193..938d70c86d 100644 --- a/webclient/index.html +++ b/webclient/index.html @@ -2,10 +2,12 @@ <html xmlns:ng="http://angularjs.org" ng-app="matrixWebClient" ng-controller="MatrixWebClientController"> <head> <title>[matrix]</title> - + <link rel="stylesheet" href="app.css"> <link rel="icon" href="favicon.ico"> + <meta name="viewport" content="width=device-width"> + <script type='text/javascript' src='js/jquery-1.8.3.min.js'></script> <script src="js/angular.min.js"></script> <script src="js/angular-route.min.js"></script> @@ -15,10 +17,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 +36,11 @@ <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> |