mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try to align and float contact parts better.

This commit is contained in:
Thomas Tanghus 2012-08-20 22:48:48 +02:00
parent ef3eebfd3e
commit 719ae155db
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/contacts/css/contacts.css
View File

@ -26,7 +26,7 @@
#contacts_propertymenu li a { padding: 3px; display: block } #contacts_propertymenu li a { padding: 3px; display: block }
#contacts_propertymenu li:hover { background-color: #1d2d44; } #contacts_propertymenu li:hover { background-color: #1d2d44; }
#contacts_propertymenu li a:hover { color: #fff } #contacts_propertymenu li a:hover { color: #fff }
#card { width: auto;/*max-width: 70em; border: thin solid lightgray; display: block;*/ } #card { width: auto; font-size: 10px; /*max-width: 70em; border: thin solid lightgray; display: block;*/ }
#firstrun { width: 100%; position: absolute; top: 5em; left: 0; text-align: center; font-weight:bold; font-size:1.5em; color:#777; } #firstrun { width: 100%; position: absolute; top: 5em; left: 0; text-align: center; font-weight:bold; font-size:1.5em; color:#777; }
#firstrun #selections { font-size:0.8em; margin: 2em auto auto auto; clear: both; } #firstrun #selections { font-size:0.8em; margin: 2em auto auto auto; clear: both; }
@ -71,9 +71,9 @@ label:hover, dt:hover { color: #333; }
#fn { float: left !important; width: 18em !important; } #fn { float: left !important; width: 18em !important; }
#name { /*position: absolute; top: 0px; left: 0px;*/ min-width: 25em; height: 2em; clear: right; display: block; } #name { /*position: absolute; top: 0px; left: 0px;*/ min-width: 25em; height: 2em; clear: right; display: block; }
#identityprops { /*position: absolute; top: 2.5em; left: 0px;*/ } #identityprops { /*position: absolute; top: 2.5em; left: 0px;*/ }
/*#contact_photo { max-width: 250px; }*/ #contact_photo { float: left; margin: 1em; }
#contact_identity { min-width: 30em; } #contact_identity { min-width: 30em; }
.contactsection { position: relative; float: left; padding: 0.5em; height: auto; } .contactsection { position: relative; float: left; width: 35em; padding: 0.5em; height: auto; }
#cropbox { margin: auto; } #cropbox { margin: auto; }
#contacts_details_photo_wrapper { width: 200px; } #contacts_details_photo_wrapper { width: 200px; }

6
apps/contacts/js/contacts.js
View File

@ -545,13 +545,13 @@ OC.Contacts={
textarea.css('min-height', nheight+'em'); textarea.css('min-height', nheight+'em');
textarea.attr('rows', nheight); textarea.attr('rows', nheight);
textarea.val(txt); textarea.val(txt);
note.show(); $('#contact_note').show();
textarea.expandingTextarea(); textarea.expandingTextarea();
$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().hide(); $('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().hide();
} else { } else {
note.removeData('checksum'); note.removeData('checksum');
note.find('textarea').val(''); note.find('textarea').val('');
note.hide(); $('#contact_note').hide();
$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().show(); $('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().show();
} }
}, },
@ -788,6 +788,7 @@ OC.Contacts={
case 'NOTE': case 'NOTE':
$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide(); $('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
$('#note').find('textarea').expandingTextarea().show().focus(); $('#note').find('textarea').expandingTextarea().show().focus();
$('#contact_note').show();
break; break;
case 'EMAIL': case 'EMAIL':
if($('#emaillist>li').length == 1) { if($('#emaillist>li').length == 1) {
@ -838,6 +839,7 @@ OC.Contacts={
OC.Contacts.Card.loadPhoto(); OC.Contacts.Card.loadPhoto();
} else if(proptype == 'NOTE') { } else if(proptype == 'NOTE') {
$('#note').find('textarea').val(''); $('#note').find('textarea').val('');
$('#contact_note').hide();
OC.Contacts.propertyContainerFor(obj).hide(); OC.Contacts.propertyContainerFor(obj).hide();
} }
} else { } else {

2
apps/contacts/templates/part.contact.php
View File

@ -11,7 +11,7 @@ $id = isset($_['id']) ? $_['id'] : '';
<input id="file_upload_start" type="file" accept="image/*" name="imagefile" /> <input id="file_upload_start" type="file" accept="image/*" name="imagefile" />
</form> </form>
<div id="contact_photo" class="contactsection"> <div id="contact_photo">
<iframe name="file_upload_target" id='file_upload_target' src=""></iframe> <iframe name="file_upload_target" id='file_upload_target' src=""></iframe>
<div class="tip propertycontainer" id="contacts_details_photo_wrapper" title="<?php echo $l->t('Drop photo to upload'); ?> (max <?php echo $_['uploadMaxHumanFilesize']; ?>)" data-element="PHOTO"> <div class="tip propertycontainer" id="contacts_details_photo_wrapper" title="<?php echo $l->t('Drop photo to upload'); ?> (max <?php echo $_['uploadMaxHumanFilesize']; ?>)" data-element="PHOTO">