diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-09 11:38:22 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-09 11:38:22 -0400 |
| commit | 78cd1153f012f871935130325167759898f030ab (patch) | |
| tree | 685a5fe56663e6b6087aa4f28c8f09daf1e80546 /apps/contacts/templates/settings.php | |
| parent | b830b3e24b281204344e9162352c7034f0a67187 (diff) | |
| parent | f9cec1426fe639a5683e36b5fbdeb9149feacb19 (diff) | |
| download | nextcloud-server-78cd1153f012f871935130325167759898f030ab.tar.gz nextcloud-server-78cd1153f012f871935130325167759898f030ab.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
Diffstat (limited to 'apps/contacts/templates/settings.php')
| -rw-r--r-- | apps/contacts/templates/settings.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/contacts/templates/settings.php b/apps/contacts/templates/settings.php index c9713451c8a..e3536c7b461 100644 --- a/apps/contacts/templates/settings.php +++ b/apps/contacts/templates/settings.php @@ -27,8 +27,7 @@ </td> <td class="action"> <a class="svg action download" title="<?php echo $l->t('Download'); ?>" - href="<?php echo OCP\Util::linkToRemote('carddav').'addressbooks/'.OCP\USER::getUser().'/' - .rawurlencode($addressbook['uri']) ?>?export"></a> + href="<?php echo OCP\Util::linkToAbsolute('contacts', 'export.php'); ?>?bookid=<?php echo $addressbook['id'] ?>"></a> </td> <td class="action"> <a class="svg action edit" title="<?php echo $l->t("Edit"); ?>"></a> @@ -44,7 +43,6 @@ <button class="new"><?php echo $l->t('New Address Book') ?></button> <input class="name hidden" type="text" autofocus="autofocus" placeholder="<?php echo $l->t('Name'); ?>" /> <input class="description hidden" type="text" placeholder="<?php echo $l->t('Description'); ?>" /> - <input class="link hidden" style="width: 80%" type="text" autofocus="autofocus" /> <button class="save hidden"><?php echo $l->t('Save') ?></button> <button class="cancel hidden"><?php echo $l->t('Cancel') ?></button> </div> |