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

Minor layout change.

This commit is contained in:
Thomas Tanghus 2012-08-21 06:02:20 +02:00
parent e6d87b2c4b
commit 5c1dd82998
2 changed files with 46 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/contacts/js/contacts.js
View File

@ -803,7 +803,7 @@ OC.Contacts={
OC.Contacts.Card.addPhone(); OC.Contacts.Card.addPhone();
break; break;
case 'ADR': case 'ADR':
if($('#addressdisplay>dl').length == 1) { if($('addresses>dl').length == 1) {
$('#addresses').show(); $('#addresses').show();
} }
OC.Contacts.Card.editAddress('new', true); OC.Contacts.Card.editAddress('new', true);
@ -949,10 +949,10 @@ OC.Contacts={
}, },
loadAddresses:function() { loadAddresses:function() {
$('#addresses').hide(); $('#addresses').hide();
$('#addressdisplay dl.propertycontainer').remove(); $('#addresses dl.propertycontainer').remove();
var addresscontainer = $('#addressdisplay'); var addresscontainer = $('#addresses');
for(var adr in this.data.ADR) { for(var adr in this.data.ADR) {
addresscontainer.find('dl').first().clone().insertAfter($('#addressdisplay dl').last()).show(); addresscontainer.find('dl').first().clone().insertAfter($('#addresses dl').last()).show();
addresscontainer.find('dl').last().removeClass('template').addClass('propertycontainer'); addresscontainer.find('dl').last().removeClass('template').addClass('propertycontainer');
addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']); addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']);
var adrarray = this.data.ADR[adr]['value']; var adrarray = this.data.ADR[adr]['value'];
@ -991,7 +991,6 @@ OC.Contacts={
} }
if(addresscontainer.find('dl').length > 1) { if(addresscontainer.find('dl').length > 1) {
$('#addresses').show(); $('#addresses').show();
$('#contact_communication').show();
} }
return false; return false;
}, },
@ -1000,8 +999,8 @@ OC.Contacts={
var params = {id: this.id}; var params = {id: this.id};
if(obj === 'new') { if(obj === 'new') {
isnew = true; isnew = true;
$('#addressdisplay dl').first().clone(true).insertAfter($('#addressdisplay dl').last()).show(); $('#addresses dl').first().clone(true).insertAfter($('#addresses dl').last()).show();
container = $('#addressdisplay dl').last(); container = $('#addresses dl').last();
container.removeClass('template').addClass('propertycontainer'); container.removeClass('template').addClass('propertycontainer');
} else { } else {
params['checksum'] = OC.Contacts.checksumFor(obj); params['checksum'] = OC.Contacts.checksumFor(obj);
@ -1018,7 +1017,7 @@ OC.Contacts={
buttons: { buttons: {
'Ok':function() { 'Ok':function() {
if(isnew) { if(isnew) {
OC.Contacts.Card.saveAddress(this, $('#addressdisplay dl:last-child').find('input').first(), isnew); OC.Contacts.Card.saveAddress(this, $('#addresses dl:last-child').find('input').first(), isnew);
} else { } else {
OC.Contacts.Card.saveAddress(this, obj, isnew); OC.Contacts.Card.saveAddress(this, obj, isnew);
} }
@ -1122,7 +1121,7 @@ OC.Contacts={
}, },
saveAddress:function(dlg, obj, isnew){ saveAddress:function(dlg, obj, isnew){
if(isnew) { if(isnew) {
container = $('#addressdisplay dl').last(); container = $('#addresses dl').last();
obj = container.find('input').first(); obj = container.find('input').first();
} else { } else {
checksum = OC.Contacts.checksumFor(obj); checksum = OC.Contacts.checksumFor(obj);
@ -1341,7 +1340,6 @@ OC.Contacts={
} }
if($('#emaillist li').length > 1) { if($('#emaillist li').length > 1) {
$('#emails').show(); $('#emails').show();
$('#contact_communication').show();
} }
$('#emaillist li:last-child').find('input[type="text"]').focus(); $('#emaillist li:last-child').find('input[type="text"]').focus();
return false; return false;
@ -1404,7 +1402,6 @@ OC.Contacts={
} }
if(phonelist.find('li').length > 1) { if(phonelist.find('li').length > 1) {
$('#phones').show(); $('#phones').show();
$('#contact_communication').show();
} }
return false; return false;
}, },

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

@ -24,8 +24,9 @@ $id = isset($_['id']) ? $_['id'] : '';
</div> </div>
</div> <!-- contact_photo --> </div> <!-- contact_photo -->
<div id="contact_identity">
<form method="post"> <form method="post">
<div id="contact_identity">
<input type="hidden" name="id" value="<?php echo $_['id'] ?>"> <input type="hidden" name="id" value="<?php echo $_['id'] ?>">
<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>"> <input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>">
<fieldset id="ident" class="contactpart"> <fieldset id="ident" class="contactpart">
@ -49,61 +50,52 @@ $id = isset($_['id']) ? $_['id'] : '';
<a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a><a role="button" class="action edit" title="<?php echo $l->t('Edit groups'); ?>"></a></dd> <a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a><a role="button" class="action edit" title="<?php echo $l->t('Edit groups'); ?>"></a></dd>
</dl> </dl>
</fieldset> </fieldset>
</form>
</div> <!-- contact_identity --> </div> <!-- contact_identity -->
<!-- div class="delimiter"></div --> <!-- email addresses -->
<div id="contact_communication" class="contactsection"> <div id="emails" class="hidden contactsection">
<form method="post"> <ul id="emaillist" class="propertylist">
<!-- email addresses --> <li class="template hidden" data-element="EMAIL">
<div id="emails"> <input type="checkbox" class="contacts_property tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
<ul id="emaillist" class="propertylist"> <input type="email" required="required" class="nonempty contacts_property" name="value" value="" x-moz-errormessage="<?php echo $l->t('Please specify a valid email address.'); ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" />
<li class="template hidden" data-element="EMAIL"> <select multiple="multiple" name="parameters[TYPE][]">
<input type="checkbox" class="contacts_property tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" /> <?php echo OCP\html_select_options($_['email_types'], array()) ?>
<input type="email" required="required" class="nonempty contacts_property" name="value" value="" x-moz-errormessage="<?php echo $l->t('Please specify a valid email address.'); ?>" placeholder="<?php echo $l->t('Enter email address'); ?>" /> </select>
<select multiple="multiple" name="parameters[TYPE][]"> <span class="listactions"><a class="action mail" title="<?php echo $l->t('Mail to address'); ?>"></a>
<?php echo OCP\html_select_options($_['email_types'], array()) ?> <a role="button" class="action delete" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
</select> </ul>
<span class="listactions"><a class="action mail" title="<?php echo $l->t('Mail to address'); ?>"></a> </div> <!-- email addresses-->
<a role="button" class="action delete" title="<?php echo $l->t('Delete email address'); ?>"></a></span></li>
</ul>
</div> <!-- email addresses-->
<!-- Phone numbers --> <!-- Phone numbers -->
<div id="phones"> <div id="phones" class="hidden contactsection">
<ul id="phonelist" class="propertylist"> <ul id="phonelist" class="propertylist">
<li class="template hidden" data-element="TEL"> <li class="template hidden" data-element="TEL">
<input type="checkbox" class="contacts_property tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" /> <input type="checkbox" class="contacts_property tip" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
<input type="text" required="required" class="nonempty contacts_property" name="value" value="" placeholder="<?php echo $l->t('Enter phone number'); ?>" /> <input type="text" required="required" class="nonempty contacts_property" name="value" value="" placeholder="<?php echo $l->t('Enter phone number'); ?>" />
<select multiple="multiple" name="parameters[TYPE][]"> <select multiple="multiple" name="parameters[TYPE][]">
<?php echo OCP\html_select_options($_['phone_types'], array()) ?> <?php echo OCP\html_select_options($_['phone_types'], array()) ?>
</select> </select>
<a role="button" class="action delete" title="<?php echo $l->t('Delete phone number'); ?>"></a></li> <a role="button" class="action delete" title="<?php echo $l->t('Delete phone number'); ?>"></a></li>
</ul> </ul>
</div> <!-- Phone numbers --> </div> <!-- Phone numbers -->
<!-- Addresses --> <!-- Addresses -->
<div id="addresses" class="hidden"> <div id="addresses" class="hidden contactsection">
<div id="addressdisplay"> <dl class="addresscard template hidden" data-element="ADR"><dt>
<dl class="addresscard template hidden" data-element="ADR"><dt> <input class="adr contacts_property" name="value" type="hidden" value="" />
<input class="adr contacts_property" name="value" type="hidden" value="" /> <input type="hidden" class="adr_type contacts_property" name="parameters[TYPE][]" value="" />
<input type="hidden" class="adr_type contacts_property" name="parameters[TYPE][]" value="" /> <span class="adr_type_label"></span><a class="action globe" title="<?php echo $l->t('View on map'); ?>"></a><a class="action edit" title="<?php echo $l->t('Edit address details'); ?>"></a><a role="button" class="action delete" title="Delete address"></a>
<span class="adr_type_label"></span><a class="action globe" title="<?php echo $l->t('View on map'); ?>"></a><a class="action edit" title="<?php echo $l->t('Edit address details'); ?>"></a><a role="button" class="action delete" title="Delete address"></a> </dt><dd><ul class="addresslist"></ul></dd></dl>
</dt><dd><ul class="addresslist"></ul></dd></dl> </div> <!-- Addresses -->
</div> <!-- addressdisplay --> <div id="contact_note" class="hidden contactsection">
</div> <!-- Addresses -->
</form>
</div> <!-- contact_communication -->
<div id="contact_note" class="contactsection">
<form class="float" method="post">
<div id="note" class="propertycontainer" data-element="NOTE"> <div id="note" class="propertycontainer" data-element="NOTE">
<textarea class="contacts_property" name="value" required="required" placeholder="<?php echo $l->t('Add notes here.'); ?>" cols="60" wrap="hard"></textarea> <textarea class="contacts_property" name="value" required="required" placeholder="<?php echo $l->t('Add notes here.'); ?>" cols="60" wrap="hard"></textarea>
</div> </div>
</form>
</div> <!-- contact_note --> </div> <!-- contact_note -->
</form>
<div id="actionbar"> <div id="actionbar">
<div id="contacts_propertymenu"> <div id="contacts_propertymenu">
<button class="button" id="contacts_propertymenu_button"><?php echo $l->t('Add field'); ?></button> <button class="button" id="contacts_propertymenu_button"><?php echo $l->t('Add field'); ?></button>