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/rooms | |
| 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/rooms')
| -rw-r--r-- | webclient/rooms/rooms.html | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/webclient/rooms/rooms.html b/webclient/rooms/rooms.html index c3ee85f8a0..007ad29999 100644 --- a/webclient/rooms/rooms.html +++ b/webclient/rooms/rooms.html @@ -1,7 +1,7 @@ <div ng-controller="RoomsController" class="rooms"> - <div class="page"> - <div class="wrapper"> + <div id="page"> + <div id="wrapper"> <div> <form> @@ -13,10 +13,12 @@ </div> </td> <td> + <!-- TODO: To enable once we have an upload server <button m-file-input="newProfileInfo.avatarFile">Upload new Avatar</button> or use an existing image URL: + --> <div> - <input size="40" ng-model="newProfileInfo.avatar" ng-enter="setAvatar(newProfileInfo.avatar)" /> + <input size="40" ng-model="newProfileInfo.avatar" ng-enter="setAvatar(newProfileInfo.avatar)" placeholder="Image URL"/> <button ng-disabled="!newProfileInfo.avatar" ng-click="setAvatar(newProfileInfo.avatar)">Update Avatar</button> </div> </td> |