From: rabuzarus <>
Date: Tue, 23 Feb 2016 18:19:45 +0000 (+0100)
Subject: contactedit-actions-button: move repair back to tabbar
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0db83b958659582ef2a7a20226cc7eea06bd9397;p=friendica.git

contactedit-actions-button: move repair back to tabbar
---

0db83b958659582ef2a7a20226cc7eea06bd9397
diff --cc doc/Accesskeys.md
index 57de221c83,c49e79c0ab..4f16ba2536
--- a/doc/Accesskeys.md
+++ b/doc/Accesskeys.md
@@@ -37,6 -37,10 +37,7 @@@ Genera
  * o: Profile
  * t: Contacts
  * d: Common friends
 -* b: Toggle Blocked status
 -* i: Toggle Ignored status
 -* v: Toggle Archive status
 -* r: Repair
++* r: Advanced
  
  /message
  --------
diff --cc mod/contacts.php
index f9c5fd4f0e,7f758b43c5..991b59885c
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@@ -859,6 -839,35 +859,13 @@@ function contacts_tab($a, $contact_id, 
  				'id' => 'common-loc-tab',
  				'accesskey' => 'd');
  
 -	$tabs[] = array('label' => t('Repair'),
++	$tabs[] = array('label' => t('Advanced'),
+ 			'url'   => 'crepair/' . $contact_id,
+ 			'sel' => (($active_tab == 5)?'active':''),
+ 			'title' => t('Advanced Contact Settings'),
 -			'id'	=> 'repair-tab',
++			'id'	=> 'advanced-tab',
+ 			'accesskey' => 'r');
+ 
 -
 -	$tabs[] = array('label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
 -			'url'   => 'contacts/' . $contact_id . '/block',
 -			'sel'   => '',
 -			'title' => t('Toggle Blocked status'),
 -			'id'	=> 'toggle-block-tab',
 -			'accesskey' => 'b');
 -
 -	$tabs[] = array('label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
 -			'url'   => 'contacts/' . $contact_id . '/ignore',
 -			'sel'   => '',
 -			'title' => t('Toggle Ignored status'),
 -			'id'	=> 'toggle-ignore-tab',
 -			'accesskey' => 'i');
 -
 -	$tabs[] = array('label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ),
 -			'url'   => 'contacts/' . $contact_id . '/archive',
 -			'sel'   => '',
 -			'title' => t('Toggle Archive status'),
 -			'id'	=> 'toggle-archive-tab',
 -			'accesskey' => 'v');
 -
  	$tab_tpl = get_markup_template('common_tabs.tpl');
  	$tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
  
@@@ -945,80 -954,3 +952,72 @@@ function _contact_detail_for_template($
  	);
  
  }
 +
 +/**
 + * @brief Gives a array with actions which can performed to a given contact
 + * 
 + * This includes actions like e.g. 'block', 'hide', 'archive', 'delete' and others
 + * 
 + * @param array $contact Data about the Contact
 + * @return array with contact related actions
 + */
 +function contact_actions($contact) {
 +
 +	$poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2));
 +	$contact_action = array();
 +
 +	// Provide friend suggestion only for Friendica contacts
 +	if($contact['network'] === NETWORK_DFRN) {
 +		$contact_actions['suggest'] = array(
 +							'label' => t('Suggest friends'),
 +							'url'	=> app::get_baseurl(true) . '/fsuggest/' . $contact['id'],
 +							'title'	=> '',
 +							'sel'	=> '',
 +							'id'	=>  'suggest',
 +					);
 +	}
 +
 +	if($poll_enabled) {
 +		$contact_actions['update'] = array(
 +							'label'	=> t('Update now'),
 +							'url'	=> app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/update',
 +							'title'	=> '',
 +							'sel'	=> '',
 +							'id'	=> 'update',
 +					);
 +	}
 +
- 	$contact_actions['repair'] = array(
- 						'label'	=> t('Repair'),
- 						'url'	=> app::get_baseurl(true) . '/crepair/' . $contact['id'],
- 						'title' => t('Advanced Contact Settings'),
- 						'sel'	=> '',
- 						'id'	=> 'repair',
- 				);
- 
 +	$contact_actions['block'] = array(
 +						'label'	=> (intval($contact['blocked']) ? t('Unblock') : t('Block') ),
 +						'url'	=> app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/block',
 +						'title' => t('Toggle Blocked status'),
 +						'sel'	=> (intval($contact['blocked']) ? 'active' : ''),
 +						'id'	=> 'toggle-block',
 +				);
 +
 +	$contact_actions['ignore'] = array(
 +						'label'	=> (intval($contact['readonly']) ? t('Unignore') : t('Ignore') ),
 +						'url'	=> app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/ignore',
 +						'title' => t('Toggle Ignored status'),
 +						'sel'	=> (intval($contact['readonly']) ? 'active' : ''),
 +						'id'	=> 'toggle-ignore',
 +				);
 +
 +	$contact_actions['archive'] = array(
 +						'label'	=> (intval($contact['archive']) ? t('Unarchive') : t('Archive') ),
 +						'url'	=> app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/archive',
 +						'title' => t('Toggle Archive status'),
 +						'sel'	=> (intval($contact['archive']) ? 'active' : ''),
 +						'id'	=> 'toggle-archive',
 +				);
 +
 +	$contact_actions['delete'] = array(
 +						'label'	=> t('Delete'),
 +						'url'	=> app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/drop', 
 +						'title'	=> t('Delete contact'),
 +						'sel'	=> '',
 +						'id'	=> 'delete',
 +				);
 +
 +	return $contact_actions;
 +}
diff --cc view/templates/contact_edit.tpl
index 91ef451278,15863b6a27..93999a860c
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@@ -9,51 -7,53 +9,50 @@@
  
  	<div id="contact-edit-nav-wrapper" >
  		<div id="contact-edit-links">
 -			<ul>
 -				{{if $relation_text}}
 -					<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
 -				{{/if}}
 -				{{if $lost_contact}}
 -					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
 -				{{/if}}
 -				{{if $insecure}}
 -					<li><div id="insecure-message">{{$insecure}}</div></li>
 -				{{/if}}
 -				{{if $blocked}}
 -					<li><div id="block-message">{{$blocked}}</div></li>
 -				{{/if}}
 -				{{if $ignored}}
 -					<li><div id="ignore-message">{{$ignored}}</div></li>
 -				{{/if}}
 -				{{if $archived}}
 -					<li><div id="archive-message">{{$archived}}</div></li>
 -				{{/if}}
 -			</ul>
 -
 -			<ul>
 -
 -				{{if $common_text}}
 -					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
 -				{{/if}}
 -				{{if $all_friends}}
 -					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
 -				{{/if}}
 -
 -
 -				<!-- <li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
 -				{{if $lblsuggest}}
 -					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
 -				{{/if}}
 -				{{if $follow}}
 -					<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>
 -				{{/if}}
 -
 -			</ul>
 -
 +			<div id="contact-edit-status-wrapper">
 +				<span id="contact-edit-contact-status">{{$contact_status}}</span>
 +
 +				{{* 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>
 +
 +					<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}}
- 						<li role="menuitem"><a  href="#" title="{{$contact_actions.repair.title}}" onclick="window.location.href='{{$contact_actions.repair.url}}'; return false;">{{$contact_actions.repair.label}}</a></li>
 +						<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>
 +						<li role="menuitem"><a  href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li>
 +						<li role="menuitem"><a  href="#" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li>
 +					</ul>
 +				</div>
 +
 +				{{* Block with status information about the contact *}}
 +				<ul>
 +					{{if $relation_text}}<li><div id="contact-edit-rel">{{$relation_text}}</div></li>{{/if}}
 +
 +					{{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}}
 +						{{/if}}
 +						</li>
 +					{{/if}}
 +
 +					{{if $lost_contact}}<li><div id="lost-contact-message">{{$lost_contact}}</div></li>{{/if}}
 +					{{if $insecure}}<li><div id="insecure-message">{{$insecure}}</div></li>	{{/if}}
 +					{{if $blocked}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
 +					{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
 +					{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
 +				</ul>
 +
 +				<ul>
 +					<!-- <li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
 +					{{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
 +				</ul>
 +			</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>
  			{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
  			{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
diff --cc view/theme/frost-mobile/templates/contact_edit.tpl
index 48df4a0286,e6401de606..79dc7da408
--- a/view/theme/frost-mobile/templates/contact_edit.tpl
+++ b/view/theme/frost-mobile/templates/contact_edit.tpl
@@@ -14,50 -20,41 +14,49 @@@
  
  	<div id="contact-edit-nav-wrapper" >
  		<div id="contact-edit-links">
 -			<ul>
 -				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
 -				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
 -				{{if $lost_contact}}
 -					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
 -				{{/if}}
 -				{{if $insecure}}
 -					<li><div id="insecure-message">{{$insecure}}</div></li>
 -				{{/if}}
 -				{{if $blocked}}
 -					<li><div id="block-message">{{$blocked}}</div></li>
 -				{{/if}}
 -				{{if $ignored}}
 -					<li><div id="ignore-message">{{$ignored}}</div></li>
 -				{{/if}}
 -				{{if $archived}}
 -					<li><div id="archive-message">{{$archived}}</div></li>
 -				{{/if}}
 -
 -				<li>&nbsp;</li>
 -
 -				{{if $common_text}}
 -					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
 -				{{/if}}
 -				{{if $all_friends}}
 -					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
 -				{{/if}}
 -
 -
 -				<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
 -				{{if $lblsuggest}}
 -					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
 -				{{/if}}
 -
 -			</ul>
 +			<div id="contact-edit-status-wrapper">
 +				<span id="contact-edit-contact-status">{{$contact_status}}</span>
 +
 +				<div id="contact-edit-actions">
 +					<div class="btn" id="contact-edit-actions-button" onclick="openClose('contact-actions-menu')">{{$contact_action_button}}</div>
 +
 +					<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}}
- 						<li role="menuitem"><a  href="#" title="{{$contact_actions.repair.title}}" onclick="window.location.href='{{$contact_actions.repair.url}}'; return false;">{{$contact_actions.repair.label}}</a></li>
 +						<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>
 +						<li role="menuitem"><a  href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li>
 +						<li role="menuitem"><a  href="#" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li>
 +					</ul>
 +				</div>
 +
 +				<ul>
 +					<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
 +					<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
 +					{{if $poll_enabled}}
 +						<div id="contact-edit-poll-wrapper">
 +							<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
 +						</div>
 +					{{/if}}
 +					{{if $lost_contact}}
 +						<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
 +					{{/if}}
 +					{{if $insecure}}
 +						<li><div id="insecure-message">{{$insecure}}</div></li>
 +					{{/if}}
 +					{{if $blocked}}
 +						<li><div id="block-message">{{$blocked}}</div></li>
 +					{{/if}}
 +					{{if $ignored}}
 +						<li><div id="ignore-message">{{$ignored}}</div></li>
 +					{{/if}}
 +					{{if $archived}}
 +						<li><div id="archive-message">{{$archived}}</div></li>
 +					{{/if}}
 +
 +				</ul>
 +			</div>
  		</div>
  	</div>
  	<div id="contact-edit-nav-end"></div>
diff --cc view/theme/frost/templates/contact_edit.tpl
index 76cfd77924,731c5e0d4c..44e55b1cd8
--- a/view/theme/frost/templates/contact_edit.tpl
+++ b/view/theme/frost/templates/contact_edit.tpl
@@@ -6,52 -6,50 +6,51 @@@
  
  	{{$tab_str}}
  
 -	<div id="contact-edit-drop-link" >
 -		<a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}}></a>
 -	</div>
 -
 -	<div id="contact-edit-drop-link-end"></div>
 -
 -
  	<div id="contact-edit-nav-wrapper" >
  		<div id="contact-edit-links">
 -			<ul>
 -				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
 -				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
 -				{{if $lost_contact}}
 -					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
 -				{{/if}}
 -				{{if $insecure}}
 -					<li><div id="insecure-message">{{$insecure}}</div></li>
 -				{{/if}}
 -				{{if $blocked}}
 -					<li><div id="block-message">{{$blocked}}</div></li>
 -				{{/if}}
 -				{{if $ignored}}
 -					<li><div id="ignore-message">{{$ignored}}</div></li>
 -				{{/if}}
 -				{{if $archived}}
 -					<li><div id="archive-message">{{$archived}}</div></li>
 -				{{/if}}
 -
 -				<li>&nbsp;</li>
 -
 -				{{if $common_text}}
 -					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
 -				{{/if}}
 -				{{if $all_friends}}
 -					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
 -				{{/if}}
 -
 -
 -				<li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
 -				{{if $lblsuggest}}
 -					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
 -				{{/if}}
 -
 -			</ul>
 +			<div id="contact-edit-status-wrapper">
 +				<span id="contact-edit-contact-status">{{$contact_status}}</span>
 +
 +				<div id="contact-edit-actions">
 +					<a class="btn" rel="#contact-actions-menu" href="#" id="contact-edit-actions-button">{{$contact_action_button}}</a>
 +
 +					<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}}
- 						<li role="menuitem"><a  href="#" title="{{$contact_actions.repair.title}}" onclick="window.location.href='{{$contact_actions.repair.url}}'; return false;">{{$contact_actions.repair.label}}</a></li>
 +						<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>
 +						<li role="menuitem"><a  href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li>
 +						<li role="menuitem"><a  href="#" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li>
 +					</ul>
 +				</div>
 +
 +				<ul>
 +					<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
 +					<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
 +					{{if $poll_enabled}}
 +						<div id="contact-edit-poll-wrapper">
 +							<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
 +						</div>
 +					{{/if}}
 +					{{if $lost_contact}}
 +						<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
 +					{{/if}}
 +					{{if $insecure}}
 +						<li><div id="insecure-message">{{$insecure}}</div></li>
 +					{{/if}}
 +					{{if $blocked}}
 +						<li><div id="block-message">{{$blocked}}</div></li>
 +					{{/if}}
 +					{{if $ignored}}
 +						<li><div id="ignore-message">{{$ignored}}</div></li>
 +					{{/if}}
 +					{{if $archived}}
 +						<li><div id="archive-message">{{$archived}}</div></li>
 +					{{/if}}
 +
 +				</ul>
 +			</div>
  		</div>
  	</div>
  	<div id="contact-edit-nav-end"></div>
diff --cc view/theme/vier/templates/contact_edit.tpl
index df0053fb68,0000000000..ce3cfbf808
mode 100644,000000..100644
--- a/view/theme/vier/templates/contact_edit.tpl
+++ b/view/theme/vier/templates/contact_edit.tpl
@@@ -1,99 -1,0 +1,98 @@@
 +
 +{{if $header}}<h2>{{$header}}</h2>{{/if}}
 +
 +<div id="contact-edit-wrapper" >
 +
 +	{{* Insert Tab-Nav *}}
 +	{{$tab_str}}
 +
 +
 +	<div id="contact-edit-nav-wrapper" >
 +		<div id="contact-edit-links">
 +			<div id="contact-edit-status-wrapper">
 +				<span id="contact-edit-contact-status">{{$contact_status}}</span>
 +
 +				{{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}}
 +				<div id="contact-edit-actions">
 +					<a class="btn" id="contact-edit-actions-button">{{$contact_action_button}}</a>
 +
 +					<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}}
- 						<li role="menuitem"><a  href="#" title="{{$contact_actions.repair.title}}" onclick="window.location.href='{{$contact_actions.repair.url}}'; return false;">{{$contact_actions.repair.label}}</a></li>
 +						<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>
 +						<li role="menuitem"><a  href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li>
 +						<li role="menuitem"><a  href="#" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li>
 +					</ul>
 +				</div>
 +
 +				{{* Block with status information about the contact *}}
 +				<ul>
 +					{{if $relation_text}}<li><div id="contact-edit-rel">{{$relation_text}}</div></li>{{/if}}
 +
 +					{{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}}
 +						{{/if}}
 +						</li>
 +					{{/if}}
 +
 +					{{if $lost_contact}}<li><div id="lost-contact-message">{{$lost_contact}}</div></li>{{/if}}
 +					{{if $insecure}}<li><div id="insecure-message">{{$insecure}}</div></li>	{{/if}}
 +					{{if $blocked}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
 +					{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
 +					{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
 +				</ul>
 +
 +				<ul>
 +					<!-- <li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
 +					{{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
 +				</ul>
 +			</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>
 +			{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
 +			{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
 +			{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
 +		</div>{{* End of contact-edit-links *}}
 +
 +		<div id="contact-edit-links-end"></div>
 +
 +		<hr />
 +
 +		<h4 id="contact-edit-settings-label" class="fakelink" onclick="openClose('contact-edit-settings')">{{$contact_settings_label}}</h4>
 +		<div id="contact-edit-settings">
 +			<form action="contacts/{{$contact_id}}" method="post" >
 +			<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 }} {{include file="field_textarea.tpl" field=$ffi_keyword_blacklist}} {{/if}}
 +				{{/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>
 +				<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
 +			</div>
 +			<div id="contact-edit-info-end"></div>
 +
 +			{{if $profile_select}}
 +				<div id="contact-edit-profile-select-text">
 +				<h4>{{$lbl_vis1}}</h4>
 +				<p>{{$lbl_vis2}}</p> 
 +				</div>
 +				{{$profile_select}}
 +				<div id="contact-edit-profile-select-end"></div>
 +				<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
 +			{{/if}}
 +			</form>
 +		</div>
 +	</div>{{* End of contact-edit-nav-wrapper *}}
 +</div>