diff --git a/mod/contacts.php b/mod/contacts.php index 81bf4c03b8..f9e9f6b735 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -434,7 +434,8 @@ function contacts_content(&$a) { $a->page['aside'] = ''; return replace_macros(get_markup_template('contact_drop_confirm.tpl'), array( - '$contact' => _contact_detail_for_template($orig_record[0]), + '$header' => t('Drop contact'), + '$contact' => _contact_detail_for_template($orig_record[0]), '$method' => 'get', '$message' => t('Do you really want to delete this contact?'), '$extra_inputs' => $inputs, diff --git a/view/templates/contact_drop_confirm.tpl b/view/templates/contact_drop_confirm.tpl index 9b9a359714..48b61832d4 100644 --- a/view/templates/contact_drop_confirm.tpl +++ b/view/templates/contact_drop_confirm.tpl @@ -1,4 +1,4 @@ -

{{"Drop contact"|t}}

+

{{$header}}

{{include file="contact_template.tpl" no_contacts_checkbox=True}} diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index ed264ac2d5..99f32a5881 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1908,6 +1908,14 @@ ul li:hover .contact-wrapper a.contact-action-link:hover { #directory-search-wrapper{ padding: 10px 0; } +#contact-drop-confirm .contact-actions, +#contact-drop-confirm .contact-photo-overlay, +#contact-drop-confirm .contact-photo-menu { + display: none; +} +#contact-drop-confirm #confirm-form { + margin-top: 20px; +} /* contact-edit */ #contact-edit-actions { diff --git a/view/theme/frio/templates/confirm.tpl b/view/theme/frio/templates/confirm.tpl new file mode 100644 index 0000000000..d0de608319 --- /dev/null +++ b/view/theme/frio/templates/confirm.tpl @@ -0,0 +1,14 @@ + +
+ +
{{$message}}
+ {{foreach $extra_inputs as $input}} + + {{/foreach}} + +
+ + +
+ +
diff --git a/view/theme/frio/templates/contact_drop_confirm.tpl b/view/theme/frio/templates/contact_drop_confirm.tpl new file mode 100644 index 0000000000..d665fefed0 --- /dev/null +++ b/view/theme/frio/templates/contact_drop_confirm.tpl @@ -0,0 +1,9 @@ +
+

{{$header}}

+ + {{include file="contact_template.tpl" no_contacts_checkbox=True}} + + {{include file="confirm.tpl"}} + +
+
diff --git a/view/theme/frio/templates/contact_template.tpl b/view/theme/frio/templates/contact_template.tpl index 37217c62ff..264e5a4c61 100644 --- a/view/theme/frio/templates/contact_template.tpl +++ b/view/theme/frio/templates/contact_template.tpl @@ -52,7 +52,7 @@ {{if $contact.photo_menu.poke}}{{/if}} {{if $contact.photo_menu.network}}{{/if}} {{if $contact.photo_menu.edit}}{{/if}} - {{if $contact.photo_menu.drop}}{{/if}} + {{if $contact.photo_menu.drop}}{{/if}} {{if $contact.photo_menu.follow}}{{/if}} {{if $contact.photo_menu.hide}}{{/if}}