tweaks to settings page

This commit is contained in:
Matthew Hodgson 2014-08-30 00:50:51 +01:00
parent f64ce52305
commit 2a0e79bbfa
2 changed files with 16 additions and 28 deletions

View File

@ -428,15 +428,12 @@ h1 {
} }
.profile-avatar img { .profile-avatar img {
max-width: 100%; width: 100%;
max-height: 100%; height: 100%;
object-fit: cover;
} }
/*** User profile page ***/ /*** User profile page ***/
#user-ids {
padding-left: 1em;
}
#user-displayname { #user-displayname {
font-size: 24px; font-size: 24px;
} }

View File

@ -4,32 +4,22 @@
<div id="wrapper"> <div id="wrapper">
<h3>Me</h3> <h3>Me</h3>
<div> <div class="section">
<form> <form>
<table> <div class="profile-avatar">
<tr> <img ng-src="{{ (null !== profile.avatarUrl) ? profile.avatarUrl : 'img/default-profile.jpg' }}" m-file-input="profile.avatarFile"/>
<td> </div>
<div class="profile-avatar"> <div id="user-ids">
<img ng-src="{{ (null !== profile.avatarUrl) ? profile.avatarUrl : 'img/default-profile.jpg' }}" m-file-input="profile.avatarFile"/> <input size="40" ng-model="profile.displayName" placeholder="Your name"/>
</div> <button ng-disabled="(profile.displayName == profileOnServer.displayName) && (profile.avatarUrl == profileOnServer.avatarUrl)"
</td> ng-click="saveProfile()">Save</button>
<td> </div>
<div id="user-ids">
<input size="40" ng-model="profile.displayName" placeholder="Your name"/>
</div>
</td>
<td>
<button ng-disabled="(profile.displayName == profileOnServer.displayName) && (profile.avatarUrl == profileOnServer.avatarUrl)"
ng-click="saveProfile()">Save</button>
</td>
</tr>
</table>
</form> </form>
</div> </div>
<br/> <br/>
<h3>Linked emails</h3> <h3>Linked emails</h3>
<div> <div class="section">
<form> <form>
<input size="40" ng-model="linkedEmails.linkNewEmail" ng-enter="linkEmail(linkedEmails.linkNewEmail)" /> <input size="40" ng-model="linkedEmails.linkNewEmail" ng-enter="linkEmail(linkedEmails.linkNewEmail)" />
<button ng-disabled="!linkedEmails.linkNewEmail" ng-click="linkEmail(linkedEmails.linkNewEmail)"> <button ng-disabled="!linkedEmails.linkNewEmail" ng-click="linkEmail(linkedEmails.linkNewEmail)">
@ -54,7 +44,7 @@
<br/> <br/>
<h3>Desktop notifications</h3> <h3>Desktop notifications</h3>
<div ng-switch="settings.notifications"> <div class="section" ng-switch="settings.notifications">
<div ng-switch-when="granted"> <div ng-switch-when="granted">
Notifications are enabled. Notifications are enabled.
</div> </div>
@ -72,8 +62,9 @@
<br/> <br/>
<h3>Configuration</h3> <h3>Configuration</h3>
<div> <div class="section">
<div>Home server: {{ config.homeserver }} </div> <div>Home server: {{ config.homeserver }} </div>
<div>Identity server: {{ config.identityServer }} </div>
<div>User ID: {{ config.user_id }} </div> <div>User ID: {{ config.user_id }} </div>
<div>Access token: {{ config.access_token }} </div> <div>Access token: {{ config.access_token }} </div>
</div> </div>