From 1e4444f25bf6afff103ee9ff7b1df6b147861d94 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 6 Feb 2012 08:04:06 +0100
Subject: [PATCH] Updated copyrights. Element menu didn't update.
---
apps/contacts/ajax/saveproperty.php | 4 ++--
apps/contacts/dynphoto.php | 2 +-
apps/contacts/js/contacts.js | 2 ++
apps/contacts/templates/part.contact.php | 16 ++++------------
4 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index fd1aa9e35f..8f575c6b81 100644
--- 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 8025f559c3..2beac15e14 100644
--- 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 c2130e08b5..45130dd048 100644
--- 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 0e3611b2e4..1c7b7b9067 100644
--- 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>
--
GitLab