diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-01 13:29:17 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-01 13:29:17 +0100 |
| commit | a9512d0994bba12cd3684d37030ce68ebe9330b3 (patch) | |
| tree | 6a80e8f1fa89fccf0cd90ea251edb7c1fb28224c /webclient/user/user.html | |
| parent | Merge branch 'develop' into server2server_tls (diff) | |
| parent | add another public wishlist item (diff) | |
| download | synapse-a9512d0994bba12cd3684d37030ce68ebe9330b3.tar.xz | |
Merge branch 'develop' into server2server_tls
Diffstat (limited to 'webclient/user/user.html')
| -rw-r--r-- | webclient/user/user.html | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/webclient/user/user.html b/webclient/user/user.html index 4c91c8a48a..2aa981437b 100644 --- a/webclient/user/user.html +++ b/webclient/user/user.html @@ -1,31 +1,25 @@ <div ng-controller="UserController" class="user"> - <h1 id="logo">[matrix]</h1> - <div id="page"> <div id="wrapper"> - + + <div id="genericHeading"> + <a href ng-click="goToPage('/')"><img src="img/logo-small.png" width="100" height="43" alt="[matrix]"/></a> + </div> + + <h1>{{ user.displayname || user.id }}</h1> + <div> - <form> - <table> - <tr> - <td> - <div class="profile-avatar"> - <img ng-src="{{ user.avatar_url || 'img/default-profile.jpg' }}"/> - </div> - </td> - <td> - <div id="user-ids"> - <div id="user-displayname">{{ user.displayname }}</div> - <div>{{ user.id }}</div> - </div> - </td> - </tr> - </table> - </form> + <div class="profile-avatar"> + <img ng-src="{{ user.avatar_url || 'img/default-profile.png' }}"/> + </div> + <div id="user-ids"> + <div>{{ user.id }}</div> + </div> </div> + <button ng-hide="user.id == user_id" ng-click="messageUser()" style="font-size: 14pt; margin-top: 40px; margin-bottom: 40px">Start chat</button> + <br/> {{ feedback }} - </div> </div> </div> |