summaryrefslogtreecommitdiffstats
path: root/apps/contacts/templates
diff options
context:
space:
mode:
Diffstat (limited to 'apps/contacts/templates')
-rw-r--r--[-rwxr-xr-x]apps/contacts/templates/index.php0
-rw-r--r--[-rwxr-xr-x]apps/contacts/templates/part.chooseaddressbook.php0
-rw-r--r--[-rwxr-xr-x]apps/contacts/templates/part.chooseaddressbook.rowfields.php0
-rw-r--r--[-rwxr-xr-x]apps/contacts/templates/part.contact.php0
-rw-r--r--[-rwxr-xr-x]apps/contacts/templates/part.contactphoto.php0
-rw-r--r--apps/contacts/templates/part.contacts.php2
-rw-r--r--[-rwxr-xr-x]apps/contacts/templates/part.cropphoto.php0
-rw-r--r--[-rwxr-xr-x]apps/contacts/templates/part.edit_address_dialog.php0
-rw-r--r--[-rwxr-xr-x]apps/contacts/templates/part.edit_name_dialog.php0
-rw-r--r--[-rwxr-xr-x]apps/contacts/templates/part.import.php48
-rw-r--r--[-rwxr-xr-x]apps/contacts/templates/part.importaddressbook.php32
-rw-r--r--[-rwxr-xr-x]apps/contacts/templates/settings.php0
12 files changed, 44 insertions, 38 deletions
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index 7d212e71ba8..7d212e71ba8 100755..100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
diff --git a/apps/contacts/templates/part.chooseaddressbook.php b/apps/contacts/templates/part.chooseaddressbook.php
index a0ec053ab91..a0ec053ab91 100755..100644
--- a/apps/contacts/templates/part.chooseaddressbook.php
+++ b/apps/contacts/templates/part.chooseaddressbook.php
diff --git a/apps/contacts/templates/part.chooseaddressbook.rowfields.php b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
index 780920ea3c2..780920ea3c2 100755..100644
--- a/apps/contacts/templates/part.chooseaddressbook.rowfields.php
+++ b/apps/contacts/templates/part.chooseaddressbook.rowfields.php
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 74522be37c4..74522be37c4 100755..100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
diff --git a/apps/contacts/templates/part.contactphoto.php b/apps/contacts/templates/part.contactphoto.php
index bddf4cc8a81..bddf4cc8a81 100755..100644
--- a/apps/contacts/templates/part.contactphoto.php
+++ b/apps/contacts/templates/part.contactphoto.php
diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php
index 225a1ef0cf3..00a61f72fdd 100644
--- a/apps/contacts/templates/part.contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -8,5 +8,5 @@
}
}
?>
- <li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><?php echo $display; ?></li>
+ <li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $display; ?></a></li>
<?php endforeach; ?>
diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
index 599951d9a97..599951d9a97 100755..100644
--- a/apps/contacts/templates/part.cropphoto.php
+++ b/apps/contacts/templates/part.cropphoto.php
diff --git a/apps/contacts/templates/part.edit_address_dialog.php b/apps/contacts/templates/part.edit_address_dialog.php
index 8b3425033cc..8b3425033cc 100755..100644
--- a/apps/contacts/templates/part.edit_address_dialog.php
+++ b/apps/contacts/templates/part.edit_address_dialog.php
diff --git a/apps/contacts/templates/part.edit_name_dialog.php b/apps/contacts/templates/part.edit_name_dialog.php
index be45f9a5b06..be45f9a5b06 100755..100644
--- a/apps/contacts/templates/part.edit_name_dialog.php
+++ b/apps/contacts/templates/part.edit_name_dialog.php
diff --git a/apps/contacts/templates/part.import.php b/apps/contacts/templates/part.import.php
index 2dac7dd0ca1..b8793042997 100755..100644
--- a/apps/contacts/templates/part.import.php
+++ b/apps/contacts/templates/part.import.php
@@ -1,27 +1,27 @@
<div id="contacts_import_dialog" title="<?php echo $l->t("Import a contacts file"); ?>">
-<div id="form_container">
-<input type="hidden" id="filename" value="<?php echo $_['filename'];?>">
-<input type="hidden" id="path" value="<?php echo $_['path'];?>">
-<input type="hidden" id="progressfile" value="<?php echo md5(session_id()) . '.txt';?>">
-<p style="text-align:center;"><b><?php echo $l->t('Please choose the addressbook'); ?></b>
-<select style="width:100%;" id="contacts" name="contacts">
-<?php
-$contacts_options = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-$contacts_options[] = array('id'=>'newaddressbook', 'displayname'=>$l->t('create a new addressbook'));
-echo OCP\html_select_options($contacts_options, $contacts_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
-?>
-</select>
-<div id="newaddressbookform" style="display: none;">
- <input type="text" style="width: 97%;" placeholder="<?php echo $l->t('Name of new addressbook'); ?>" id="newaddressbook" name="newaddressbook">
-</div>
-<input type="button" value="<?php echo $l->t("Import");?>!" id="startimport">
-</div>
+ <div id="form_container">
+ <input type="hidden" id="filename" value="<?php echo $_['filename'];?>">
+ <input type="hidden" id="path" value="<?php echo $_['path'];?>">
+ <input type="hidden" id="progressfile" value="<?php echo md5(session_id()) . '.txt';?>">
+ <p class="bold" style="text-align:center;"><?php echo $l->t('Please choose the addressbook'); ?></p>
+ <select style="width:100%;" id="contacts" name="contacts">
+ <?php
+ $contacts_options = OC_Contacts_Addressbook::all(OCP\USER::getUser());
+ $contacts_options[] = array('id'=>'newaddressbook', 'displayname'=>$l->t('create a new addressbook'));
+ echo OCP\html_select_options($contacts_options, $contacts_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
+ ?>
+ </select>
+ <div id="newaddressbookform" style="display: none;">
+ <input type="text" style="width: 97%;" placeholder="<?php echo $l->t('Name of new addressbook'); ?>" id="newaddressbook" name="newaddressbook">
+ </div>
+ <input type="button" value="<?php echo $l->t("Import");?>!" id="startimport">
+ </div>
<div id="progressbar_container" style="display: none">
-<p style="text-align:center;"><b><?php echo $l->t('Importing contacts'); ?></b>
-<div id="progressbar"></div>
-<div id="import_done" style="display: none;">
-<p style="text-align:center;"><b><?php echo $l->t('Contacts imported successfully'); ?></b></p>
-<input type="button" value="<?php echo $l->t('Close Dialog'); ?>" id="import_done_button">
-</div>
-</div>
+ <p style="text-align:center;"><?php echo $l->t('Importing contacts'); ?></p>
+ <div id="progressbar"></div>
+ <div id="import_done" style="display: none;">
+ <p style="text-align:center;"></p>
+ <input type="button" value="<?php echo $l->t('Close'); ?>" id="import_done_button">
+ </div>
+ </div>
</div> \ No newline at end of file
diff --git a/apps/contacts/templates/part.importaddressbook.php b/apps/contacts/templates/part.importaddressbook.php
index a055dd60356..6702262f231 100755..100644
--- a/apps/contacts/templates/part.importaddressbook.php
+++ b/apps/contacts/templates/part.importaddressbook.php
@@ -6,28 +6,34 @@
* See the COPYING-README file.
*/
?>
-<td id="importaddressbook_dialog" title="<?php echo $l->t("Import Addressbook"); ?>" colspan="6">
+<td id="importaddressbook_dialog" colspan="6">
+<?php
+if(OCP\App::isEnabled('files_encryption')) {
+ echo '<strong>'.$l->t('Currently this import function doesn\'t work while encryption is enabled.<br />Please upload your VCF file with the file manager and click on it to import.').'</strong>';
+} else { ?>
<table>
<tr>
<th><?php echo $l->t('Select address book to import to:') ?></th>
<td>
- <select id="book" name="book" class="float">
- <?php
- $contacts_options = OC_Contacts_Addressbook::all(OCP\USER::getUser());
- echo OCP\html_select_options($contacts_options, $contacts_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
- ?>
- </select>
- <span id="import_drop_target" class="droptarget float"><?php echo $l->t("Drop a VCF file to import contacts."); ?> (Max. <?php echo $_['uploadMaxHumanFilesize']; ?>)</span>
- <a class="svg upload float" title="<?php echo $l->t('Select from HD'); ?>"></a>
+ <form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
+ <select id="book" name="book" class="float">
+ <?php
+ $contacts_options = OC_Contacts_Addressbook::all(OCP\USER::getUser());
+ echo OCP\html_select_options($contacts_options, $contacts_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
+ ?>
+ </select>
+ <span id="import_drop_target" class="droptarget float"><?php echo $l->t("Drop a VCF file to import contacts."); ?> (Max. <?php echo $_['uploadMaxHumanFilesize']; ?>)</span>
+ <a class="svg upload float" title="<?php echo $l->t('Select from HD'); ?>">
+ <input class="float" id="import_upload_start" type="file" accept="text/*" name="importfile" /></a>
+ <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
+ </form>
</td>
</tr>
</table>
-<form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
-<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
-<input id="import_upload_start" type="file" accept="text/*" name="importfile" />
+
<input id="close_button" style="float: left;" type="button" onclick="Contacts.UI.Addressbooks.cancel(this);" value="<?php echo $l->t("Cancel"); ?>">
<iframe name="import_upload_target" id='import_upload_target' src=""></iframe>
-</form>
+<?php } ?>
</td>
<script type="text/javascript">
Contacts.UI.Addressbooks.loadImportHandlers();
diff --git a/apps/contacts/templates/settings.php b/apps/contacts/templates/settings.php
index 216003b6c69..216003b6c69 100755..100644
--- a/apps/contacts/templates/settings.php
+++ b/apps/contacts/templates/settings.php