Contacts: layout updates

diff --git a/apps/contacts/css/styles.css b/apps/contacts/css/styles.css
index e226c48ae549d4fe620be1d1a51de8919ea60e68..f351589fe12e6e32c790d634e77a8491ce829f74 100644 (file)
--- a/apps/contacts/css/styles.css
+++ b/apps/contacts/css/styles.css
@@ -3,9 +3,10 @@
 
 #contacts_deletecard {position:absolute;top:15px;right:0;}
 #contacts_details_list { list-style:none; }
+#contacts_details_list li { overflow:visible; }
 #contacts_details_list li p.contacts_property_name { width:25%; float:left;text-align:right;padding-right:0.3em;color:#666; }
 #contacts_details_list li p.contacts_property_data, #contacts_details_list li ul.contacts_property_data { width:72%;float:left; }
-#contacts_addproperty_button, #contacts_setproperty_button { margin-left:25%; }
+#contacts_setproperty_button { margin-left:25%; }
 
 .contacts_property_data ul, ol.contacts_property_data { list-style:none; }
 .contacts_property_data li { overflow: hidden; }

diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index 5e9a5c56741352429a4eba5835f3b1c83431185f..f6d69005a088b7eae6ff6c67ec88d152d7d2b871 100644 (file)
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -29,12 +29,12 @@
                                        <select name="name" size="1">
                                                <?php echo html_select_options($_['property_types'], 'EMAIL') ?>
                                        </select>
+                                       <br>
+                                       <input id="contacts_addproperty_button" type="submit" value="<?php echo $l->t('Add'); ?>">
                                </p>
                                <p class="contacts_property_data" id="contacts_generic">
                                        <input type="text" name="value" value="">
                                </p>
-                               <br>
-                               <input id="contacts_addproperty_button" type="submit" value="<?php echo $l->t('Add'); ?>">
                        </form>
                        <div id="contacts_addcontactsparts" style="display:none;">
                                <ul class="contacts_property_data" id="contacts_addresspart">

diff --git a/apps/contacts/templates/part.setpropertyform.php b/apps/contacts/templates/part.setpropertyform.php
index d31bde009a06a31e880911b167b945fbbd03ff7a..f216a55f5e97a9262338828f34e1927eba50d94e 100644 (file)
--- a/apps/contacts/templates/part.setpropertyform.php
+++ b/apps/contacts/templates/part.setpropertyform.php
@@ -42,8 +42,8 @@
                <?php elseif($_['property']['name']=='TEL'): ?>
                        <p class="contacts_property_name"><label for="tel"><?php echo $l->t('Phone'); ?></label></p>
                        <p class="contacts_property_data"><input id="tel" type="phone" name="value" value="<?php echo $_['property']['value'] ?>">
-                               <select id="tel_type<?php echo $_['property']['checksum'] ?>" name="parameters[TYPE][]" multiple="multiple">
-                                       <?php echo html_select_options($_['phone_types'], ($_['property']['parameters']['TYPE'])) ?>
+                               <select id="tel_type<?php echo $_['property']['checksum'] ?>" name="parameters[TYPE][]" multiple="multiple" data-placeholder="<?php echo $l->t('Type') ?>">
+                                       <?php echo html_select_options($_['phone_types'], isset($_['property']['parameters']['TYPE'])?$_['property']['parameters']['TYPE']:'') ?>
                                </select></p>
                <?php elseif($_['property']['name']=='EMAIL'): ?>
                        <p class="contacts_property_name"><label for="email"><?php echo $l->t('Email'); ?></label></p>