Merge pull request #2688 from rabuzarus/2607-drop

frio: provide confirm modal

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,

view/templates/contact_drop_confirm.tpl

@@ -1,4 +1,4 @@
-<h1>{{"Drop contact"|t}}</h1>
+<h1>{{$header}}</h1>
 
 {{include file="contact_template.tpl" no_contacts_checkbox=True}}
 

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 {

view/theme/frio/templates/confirm.tpl

@@ -0,0 +1,14 @@
+
+<form action="{{$confirm_url}}" id="confirm-form" method="{{$method}}">
+
+	<div id="confirm-message">{{$message}}</div>
+	{{foreach $extra_inputs as $input}}
+	<input type="hidden" name="{{$input.name}}" value="{{$input.value|escape:'html'}}" />
+	{{/foreach}}
+
+	<div class="form-group pull-right settings-submit-wrapper" >
+		<button type="submit" name="{{$confirm_name}}" id="confirm-submit-button" class="btn btn-primary confirm-button" value="{{$confirm|escape:'html'}}">{{$confirm|escape:'html'}}</button>
+		<button type="submit" name="canceled" id="confirm-cancel-button" class="btn confirm-button" data-dismiss="modal">{{$cancel|escape:'html'}}</button>
+	</div>
+
+</form>

view/theme/frio/templates/contact_drop_confirm.tpl

@@ -0,0 +1,9 @@
+<div id="contact-drop-confirm">
+	<h2 class="heading">{{$header}}</h2>
+
+	{{include file="contact_template.tpl" no_contacts_checkbox=True}}
+
+	{{include file="confirm.tpl"}}
+
+	<div class="clear"></div>
+</div>

view/theme/frio/templates/contact_template.tpl

@@ -52,7 +52,7 @@
 				{{if $contact.photo_menu.poke}}<a class="contact-action-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{{/if}}
 				{{if $contact.photo_menu.network}}<a class="contact-action-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
 				{{if $contact.photo_menu.edit}}<a class="contact-action-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
-				{{if $contact.photo_menu.drop}}<a class="contact-action-link" href="{{$contact.photo_menu.drop.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{{/if}}
+				{{if $contact.photo_menu.drop}}<a class="contact-action-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></a>{{/if}}
 				{{if $contact.photo_menu.follow}}<a class="contact-action-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
 				{{if $contact.photo_menu.hide}}<a class="contact-action-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}"><i class="fa fa-times" aria-hidden="true"></i></a>{{/if}}
 			</div>