rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-30 19:52:17 +01:00
Code Issues Releases Activity

Contacts: Add thumbnails to merge list and move list item to template.

Browse Source
This commit is contained in:
Thomas Tanghus 2013-04-05 22:21:08 +02:00
parent 32ba67735e
commit ee8cded40e
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
css/contacts.css
View File

@ -475,6 +475,19 @@ input[type="checkbox"].propertytype { width: 10px; }
#dialog-merge-contacts .mergelist {
margin: 10px;
}
#dialog-merge-contacts .mergelist > li {
text-indent: 30px;
height: 30px;
-webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms;
position:relative;
background-position: 0 .2em !important; background-repeat:no-repeat !important;
}
#dialog-merge-contacts .mergelist > li > input:radio {
/*margin-left: 25px;*/
}
#dialog-merge-contacts .mergelist > li > label {
font-weight: normal;
}
.no-svg .favorite { display: inline-block; float: left; height: 20px; width: 20px; background-image:url('%appswebroot%/contacts/img/inactive_star.png'); }
.no-svg .favorite.active, .favorite:hover { background-image:url('%appswebroot%/contacts/img/active_star.png'); }
.no-svg .favorite.inactive { background-image:url('%appswebroot%/contacts/img/inactive_star.png'); }

18
js/app.js
View File

@ -1387,12 +1387,20 @@ OC.Contacts = OC.Contacts || {
this.$mergeContactsTmpl = $('#mergeContactsTemplate');
}
var $dlg = this.$mergeContactsTmpl.octemplate();
var $contactList = $dlg.find('.mergelist');
var $liTmpl = $dlg.find('li').detach();
var $mergeList = $dlg.find('.mergelist');
$.each(contacts, function(idx, contact) {
var checked = idx === 0 ? 'checked ' : '';
var $li = $('<li><input type="radio" {checked} name="contact" value="{id}">{displayname}</li>')
.octemplate({checked: checked, id: contact.getId(), displayname: contact.getDisplayName()});
$contactList.append($li);
var $li = $liTmpl
.octemplate({idx: idx, id: contact.getId(), displayname: contact.getDisplayName()});
if(!contact.data.thumbnail) {
$li.addClass('thumbnail');
} else {
$li.css('background-image', 'url(data:image/png;base64,' + contact.data.thumbnail + ')');
}
if(idx === 0) {
$li.find('input:radio').prop('checked', true);
}
$mergeList.append($li);
});
this.$contactList.addClass('dim');
$('#merge_contacts_dialog').html($dlg).ocdialog({

4
templates/contacts.php
View File

@ -146,7 +146,9 @@
<div id="dialog-merge-contacts" title="<?php p($l->t('Merge contacts')); ?>">
<p><?php p($l->t('Which contact should the data be merged into?')); ?></p>
<fieldset>
<ul class="mergelist"></ul>
<ul class="mergelist">
<li><input id="mergee_{idx}" type="radio" name="contact" value="{id}"><label for="mergee_{idx}" >{displayname}</label></li>
</ul>
</fieldset>
<p>
<input type="checkbox" id="delete_other" name="delete_other" />