diff options
author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-20 14:09:55 +0200 |
---|---|---|
committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-20 14:09:55 +0200 |
commit | d6a3639269e4beb3f59ff04681801a1d6726965b (patch) | |
tree | 9824ec41eec10dbfe59f33d9c3d1a1aaed0371aa /webclient/room/room.html | |
parent | Disabled sending buttons while a message is being sent. Useful on bad Interne... (diff) | |
download | synapse-d6a3639269e4beb3f59ff04681801a1d6726965b.tar.xz |
Replaced the image URL text input by a file selector button: "Send Image"
Diffstat (limited to 'webclient/room/room.html')
-rw-r--r-- | webclient/room/room.html | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html index 1ca28b20fe..99b0bf681b 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -65,28 +65,14 @@ <td width="*" style="min-width: 100px"> <input id="mainInput" ng-model="textInput" ng-enter="send()" ng-disabled="state.sending" ng-focus="true" auto-complete/> </td> - <td width="1"> + <td width="150px"> <button ng-click="send()" ng-disabled="state.sending">Send</button> + <button m-file-input="imageFileToSend">Send Image</button> </td> <td width="1"> </td> </tr> - <tr> - <td> - </td> - <td> - <input id="mainInput" ng-model="imageURLToSend" ng-enter="sendImage(imageURLToSend)" placeholder="Image URL"/> - </td> - <td width="100px"> - <button ng-click="sendImage(imageURLToSend)" ng-disabled="state.sending">Send URL</button> - </td> - <!-- TODO: To enable once we have an upload server - <td width="100px"> - <button m-file-input="imageFileToSend">Send Image</button> - </td> - --> - </tr> </table> <span> |