diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-13 11:09:30 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-13 11:09:30 +0200 |
| commit | 30efb04060c3b7e4ea99e1d03da9690fe7adc5d2 (patch) | |
| tree | ac0cce3a8587b076133df23a583878b3660d1da9 | |
| parent | add in copyrights to everything, not just the synapse subdir, and add a copyr... (diff) | |
| download | synapse-30efb04060c3b7e4ea99e1d03da9690fe7adc5d2.tar.xz | |
Display image messages from the stream
| -rw-r--r-- | webclient/app.css | 8 | ||||
| -rw-r--r-- | webclient/room/room.html | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/webclient/app.css b/webclient/app.css index fd548c117b..13cd19a2ef 100644 --- a/webclient/app.css +++ b/webclient/app.css @@ -187,6 +187,14 @@ h1 { border: 0px ! important; } +.image { + display: block; + max-width:320px; + max-height:320px; + width: auto; + height: auto; +} + .bubble { padding: 6px; padding-left: 1em; diff --git a/webclient/room/room.html b/webclient/room/room.html index 276c3caa5a..600bc14eb8 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -32,7 +32,8 @@ <td ng-class="!msg.content.membership_target ? (msg.content.msgtype === 'm.emote' ? 'emote text' : 'text') : ''"> <div class="bubble"> {{ msg.content.msgtype === "m.emote" ? ("* " + (members[msg.user_id].displayname || msg.user_id) + " ") : "" }} - {{ msg.content.body }} + {{ msg.content.msgtype === "m.text" ? msg.content.body : "" }} + <img class="image" ng-hide='msg.content.msgtype !== "m.image"' src="{{ msg.content.url }}" alt="{{ msg.content.body }}"/> </div> </td> <td class="rightBlock"> |