Updated copyrights.

Element menu didn't update.

diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index fd1aa9e35f9eb8e1a374745314b35aacd67a0bd8..8f575c6b81e5f72d0dc48437fd828272c58973ce 100644 (file)
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -2,8 +2,8 @@
 /**
  * ownCloud - Addressbook
  *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@jakobsack.de
+ * @author Thomas Tanghus
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE

diff --git a/apps/contacts/dynphoto.php b/apps/contacts/dynphoto.php
index 8025f559c3720dc011a3cb67d3d0835be0bd48b5..2beac15e1437db469517b6089e3b42acd5a28b77 100644 (file)
--- a/apps/contacts/dynphoto.php
+++ b/apps/contacts/dynphoto.php
@@ -3,7 +3,7 @@
  * ownCloud - Image generator for contacts.
  *
  * @author Thomas Tanghus
- * @copyright 2011 Thomas Tanghus <thomas@tanghus.net>
+ * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index c2130e08b5b90fa14011a2ef73dc22c4645cbe23..45130dd048fd07b7447f862d87896737cd8e0d23 100644 (file)
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -310,6 +310,8 @@ Contacts={
                                                                $('#contact_identity').find('#org_value').show();
                                                                break;
                                                }
+                                       } else {
+                                               $('#contacts_propertymenu a[data-type="'+props[prop]+'"]').parent().show();
                                        }
                                }
                        },

diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 0e3611b2e4ca0df362a34ac4b1276b477ddbf4a1..1c7b7b9067aec904559efa52a37f64a343ca0fe5 100644 (file)
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -21,18 +21,10 @@ $card['ADR'] = (array_key_exists('ADR',$_['details'])) ? $_['details']['ADR'] :
        <div id="actionbar">
        <a id="contacts_propertymenu_button"></a>
        <ul id="contacts_propertymenu">
-               <li <?php echo (!is_null($card['PHOTO'])?'style="display:none;"':''); ?>>
-                       <a data-type="PHOTO"><?php echo $l->t('Profile picture'); ?></a>
-               </li>
-               <li <?php echo (!is_null($card['ORG'])?'style="display:none;"':''); ?>>
-                       <a data-type="ORG"><?php echo $l->t('Organization'); ?></a>
-               </li>
-               <li <?php echo (!is_null($card['NICKNAME'])?'style="display:none;"':''); ?>>
-                       <a data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a>
-               </li>
-               <li <?php echo (!is_null($card['BDAY'])?'style="display:none;"':''); ?>>
-                       <a data-type="BDAY"><?php echo $l->t('Birthday'); ?></a>
-               </li>
+               <li><a data-type="PHOTO"><?php echo $l->t('Profile picture'); ?></a></li>
+               <li><a data-type="ORG"><?php echo $l->t('Organization'); ?></a></li>
+               <li><a data-type="NICKNAME"><?php echo $l->t('Nickname'); ?></a></li>
+               <li><a data-type="BDAY"><?php echo $l->t('Birthday'); ?></a></li>
                <li><a data-type="TEL"><?php echo $l->t('Phone'); ?></a></li>
                <li><a data-type="EMAIL"><?php echo $l->t('Email'); ?></a></li>
                <li><a data-type="ADR"><?php echo $l->t('Address'); ?></a></li>