Browse Source

Move sync down to footer. Add buddyPicture to edit screen.

pull/111/head
Evan Theurer 11 years ago
parent
commit
ce090eeeba
  1. 16
      src/styles/components/_contactsmanager.scss
  2. 2
      static/css/main.min.css
  3. 2
      static/js/controllers/contactsmanagercontroller.js
  4. 21
      static/partials/contactsmanageredit.html

16
src/styles/components/_contactsmanager.scss

@ -46,11 +46,6 @@ @@ -46,11 +46,6 @@
max-height: 250px;
overflow-y: auto;
}
.table {
margin-bottom: 0px;
tr:first-child td {
border-top: none;
}
.picture {
border-bottom: 0;
cursor: auto;
@ -59,6 +54,11 @@ @@ -59,6 +54,11 @@
margin: 0 0 0 10px;
}
}
.table {
margin-bottom: 0px;
tr:first-child td {
border-top: none;
}
.name {
width: 70%;
text-align: left;
@ -72,6 +72,12 @@ @@ -72,6 +72,12 @@
}
}
.contactsmanageredit {
.buddy .buddyPicture {
margin: 0;
}
}
.search {
&:before {
position: absolute;

2
static/css/main.min.css vendored

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
/*!
/*!
* Spreed WebRTC.
* Copyright (C) 2013-2014 struktur AG
*

2
static/js/controllers/contactsmanagercontroller.js

@ -32,7 +32,7 @@ define([], function() { @@ -32,7 +32,7 @@ define([], function() {
header: translation._("Edit Contact"),
contact: contact,
}, {
wc: "contactsmanager"
wc: "contactsmanager contactsmanageredit"
}
);
};

21
static/partials/contactsmanageredit.html

@ -4,32 +4,31 @@ @@ -4,32 +4,31 @@
<h3 class="modal-title" ng-bind-html="header"></h3>
</div>
<div class="modal-body">
<div class="row form-horizontal">
<div class="form-horizontal">
<div class="form-group">
<label for="contact-name" class="col-xs-4 control-label">{{_('Name')}}</label>
<label for="contact-name" class="col-xs-4 control-label">{{_('Picture')}}</label>
<div class="col-xs-6">
<input id="contact-name" class="form-control" type="text" ng-model="contact.Status.displayName">
<div class="picture buddy">
<div class="buddyPicture"><i class="fa fa-user"/><img ng-show="contact.Status.buddyPicture" alt ng-src="{{contact.Status.buddyPicture}}"/></div>
</div>
</div>
<div class="form-group" ng-if="buddySyncable">
<label for="contact-sync" class="col-xs-4 control-label">{{_('Sync')}}</label>
</div>
<div class="form-group">
<label for="contact-name" class="col-xs-4 control-label">{{_('Name')}}</label>
<div class="col-xs-6">
<button id="contact-sync" class="btn btn-warning" ng-click="syncContactInfo()"><span class="fa fa-rotate-right"></span> {{_('Sync contact info')}}</button>
<input id="contact-name" class="form-control" type="text" ng-model="contact.Status.displayName">
</div>
</div>
</div>
</div>
<div class="modal-footer">
<div class="row">
<div class="col-xs-2">
<div class="pull-left">
<button class="btn btn-danger" ng-click="removeContact()">{{_('Remove')}}</button>
<button id="contact-sync" class="btn btn-success" ng-if="buddySyncable" ng-click="syncContactInfo()"><span class="fa fa-rotate-right"></span> {{_('Refresh')}}</button>
</div>
<div class="col-xs-offset-4 col-xs-6">
<div class="pull-right">
<button class="btn btn-default" ng-click="cancel()">{{_('Cancel')}}</button>
<button class="btn btn-primary" ng-click="save()">{{_('Save')}}</button>
</div>
</div>
</div>
</div>
</div>

Loading…
Cancel
Save