diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-18 11:14:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-18 11:14:57 +0100 |
| commit | 1c2caacd67d5c00fe96c302749e30da3dc4a213f (patch) | |
| tree | 4ce4c26aeef0ef31471ce238cbae91e7225bccb1 /webclient/login | |
| parent | Change the MemoryDataStore to implement new storage api (diff) | |
| parent | webclient: Tweak namespace of auto-complete directive. ng- should really only... (diff) | |
| download | synapse-1c2caacd67d5c00fe96c302749e30da3dc4a213f.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Diffstat (limited to 'webclient/login')
| -rw-r--r-- | webclient/login/login-controller.js | 2 | ||||
| -rw-r--r-- | webclient/login/login.html | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/webclient/login/login-controller.js b/webclient/login/login-controller.js index aa928ef48d..67d0b7b90c 100644 --- a/webclient/login/login-controller.js +++ b/webclient/login/login-controller.js @@ -16,7 +16,7 @@ angular.module('LoginController', ['matrixService']) desired_user_name: "", user_id: "", password: "", - identityServer: "http://localhost:8090", + identityServer: "", pwd1: "", pwd2: "" }; diff --git a/webclient/login/login.html b/webclient/login/login.html index a8b2b1f12d..b1488b37f0 100644 --- a/webclient/login/login.html +++ b/webclient/login/login.html @@ -1,6 +1,6 @@ <div ng-controller="LoginController" class="login"> - <div class="page"> - <div class="wrapper"> + <div id="page"> + <div id="wrapper"> {{ feedback }} @@ -15,7 +15,7 @@ <!-- New user registration --> <div> <br/> - <button ng-click="register()" ng-disabled="!account.desired_user_name || !account.homeserver || !account.identityServer || !account.pwd1 || !account.pwd2 || account.pwd1 !== account.pwd2">Register</button> + <button ng-click="register()" ng-disabled="!account.desired_user_name || !account.homeserver || !account.pwd1 || !account.pwd2 || account.pwd1 !== account.pwd2">Register</button> </div> </form> @@ -28,7 +28,7 @@ <br /> <input id="password" size="70" type="password" ng-model="account.password" placeholder="Password"/><br /> <br/> - <button ng-click="login()" ng-disabled="!account.user_id || !account.password || !account.homeserver || !account.identityServer">Login</button> + <button ng-click="login()" ng-disabled="!account.user_id || !account.password || !account.homeserver">Login</button> </div> </form> |