X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftemplates%2Fcontact_edit.tpl;h=a9105d696c8e0e0bcc4bb22c66701d59c18dd978;hb=7f4d399fc8ca0abd4ab99f1ee9dfecd5fa175fde;hp=f59787782645479b0e682a460d0df4afc371071c;hpb=e6c054c27602a3acadac3c423273bdf748fcee27;p=friendica.git

diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index f597877826..a9105d696c 100644
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -1,3 +1,4 @@
+
 <div id="contact-edit-wrapper">
 
 	{{* Insert Tab-Nav *}}
@@ -12,16 +13,18 @@
 
 					{{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}}
 					<div id="contact-edit-actions">
-						<a class="btn" rel="#contact-actions-menu" href="#" id="contact-edit-actions-button">{{$contact_action_button}}</a>
+						<button class="btn" id="contact-edit-actions-button">{{$contact_action_button}}</button>
 
 						<ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup">
-							{{if $lblsuggest}}<li role="menuitem"><a  href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}}
-							{{if $poll_enabled}}<li role="menuitem"><a  href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}}
+							{{if $contact_actions.follow}}<li role="menuitem"><a href="{{$contact_actions.follow.url}}" title="{{$contact_actions.follow.title}}">{{$contact_actions.follow.label}}</a></li>{{/if}}
+							{{if $contact_actions.unfollow}}<li role="menuitem"><a href="{{$contact_actions.unfollow.url}}" title="{{$contact_actions.unfollow.title}}">{{$contact_actions.unfollow.label}}</a></li>{{/if}}
+							{{if $lblsuggest}}<li role="menuitem"><a href="{{$contact_actions.suggest.url}}" title="{{$contact_actions.suggest.title}}">{{$contact_actions.suggest.label}}</a></li>{{/if}}
+							{{if $poll_enabled}}<li role="menuitem"><a href="{{$contact_actions.update.url}}" title="{{$contact_actions.update.title}}">{{$contact_actions.update.label}}</a></li>{{/if}}
 							{{if $contact_actions.updateprofile}}<li role="menuitem"><a href="{{$contact_actions.updateprofile.url}}" title="{{$contact_actions.updateprofile.title}}">{{$contact_actions.updateprofile.label}}</a></li>{{/if}}
 							<li class="divider"></li>
-							<li role="menuitem"><a  href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li>
-							<li role="menuitem"><a  href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li>
-							{{if $contact_actions.delete.url}}<li role="menuitem"><a  href="{{$contact_actions.delete.url}}" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li> {{/if}}
+							<li role="menuitem"><a href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li>
+							<li role="menuitem"><a href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li>
+							{{if $contact_actions.revoke_follow.url}}<li role="menuitem"><a href="{{$contact_actions.revoke_follow.url}}" title="{{$contact_actions.revoke_follow.title}}">{{$contact_actions.revoke_follow.label}}</a></li>{{/if}}
 						</ul>
 					</div>
 
@@ -31,9 +34,9 @@
 
 						{{if $poll_enabled}}
 							<li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
-							{{if $poll_interval}}
-								<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
-							{{/if}}
+								{{if $poll_interval}}
+									<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
+								{{/if}}
 							</li>
 						{{/if}}
 
@@ -47,7 +50,7 @@
 				</div> {{* End of contact-edit-status-wrapper *}}
 
 				{{* Some information about the contact from the profile *}}
-				<dl><dt>{{$profileurllabel}}</dt><dd><a target="blank" href="{{$url}}">{{$profileurl}}</a></dd></dl>
+				<dl><dt>{{$profileurllabel}}</dt><dd><a target="blank" href="{{$profileurl}}">{{$profileurl}}</a></dd></dl>
 				{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location nofilter}}</dd></dl>{{/if}}
 				{{if $xmpp}}<dl><dt>{{$xmpp_label}}</dt><dd>{{$xmpp}}</dd></dl>{{/if}}
 				{{if $matrix}}<dl><dt>{{$matrix_label}}</dt><dd>{{$matrix}}</dd></dl>{{/if}}
@@ -59,40 +62,39 @@
 
 			<hr />
 
-			{{if $contact_settings_label}}
+		{{if $contact_settings_label}}
 			<h4 id="contact-edit-settings-label" class="fakelink" onclick="openClose('contact-edit-settings')">{{$contact_settings_label}}</h4>
 			<div id="contact-edit-settings">
 				<input type="hidden" name="contact_id" value="{{$contact_id}}">
 
-					<div id="contact-edit-end"></div>
-					{{include file="field_checkbox.tpl" field=$notify}}
-					{{if $fetch_further_information}}
-						{{include file="field_select.tpl" field=$fetch_further_information}}
-						{{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_denylist}} {{/if}}
-					{{/if}}
-					{{if $allow_remote_self}}
-						{{include file="field_select.tpl" field=$remote_self}}
-					{{/if}}
-
-					{{include file="field_checkbox.tpl" field=$hidden}}
-
-				<div id="contact-edit-info-wrapper">
-					<h4>{{$lbl_info1}}</h4>
-					<textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea>
-				</div>
-				<div id="contact-edit-info-end"></div>
+				<div id="contact-edit-end"></div>
+
+				{{include file="field_checkbox.tpl" field=$notify_new_posts}}
+
+			{{if $fetch_further_information}}
+				{{include file="field_select.tpl" field=$fetch_further_information}}
+				{{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_denylist}} {{/if}}
+			{{/if}}
+
+			{{if $allow_remote_self}}
+				{{include file="field_select.tpl" field=$remote_self}}
+			{{/if}}
 
-				{{if $reason}}
+				{{include file="field_checkbox.tpl" field=$hidden}}
+
+				{{include file="field_textarea.tpl" field=$cinfo}}
+
+			{{if $reason}}
 				<div id="contact-info-wrapper">
 					<h4>{{$lbl_info2}}</h4>
 					<p>{{$reason}}</p>
 				</div>
 				<div id="contact-info-end"></div>
-				{{/if}}
+			{{/if}}
 			</div>
-
 			<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
-			{{/if}}
+		{{/if}}
+
 			<div class="contact-edit-submit-end clearfix"></div>
 
 		</form>{{* End of the form *}}