abook_vcard cleanup

Zotlabs/Module/Connections.php

@@ -228,7 +228,7 @@ class Connections extends \Zotlabs\Web\Controller {
 	
 		$contacts = array();
 	
-		if(count($r)) {
+		if($r) {
 	
 			foreach($r as $rr) {
 				if($rr['xchan_url']) {

Zotlabs/Module/Connedit.php

@@ -37,7 +37,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 				intval(argv(1))
 			);
 			if($r) {
-				\App::$poi = $r[0];
+				\App::$poi = array_shift($r);
 			}
 		}
 	
@@ -373,7 +373,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 				intval(\App::$poi['abook_id'])
 			);
 			if($r) {
-				\App::$poi = $r[0];
+				\App::$poi = array_shift($r);
 			}
 	
 			$clone = \App::$poi;
@@ -665,13 +665,13 @@ class Connedit extends \Zotlabs\Web\Controller {
 	
 			if(feature_enabled(local_channel(),'affinity')) {
 	
-				$labels = array(
+				$labels = [
 					t('Me'),
 					t('Family'),
 					t('Friends'),
 					t('Acquaintances'),
 					t('All')
-				);
+				];
 				call_hooks('affinity_labels',$labels);
 				$label_str = '';
 	
@@ -789,8 +789,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 			else
 				$locstr = t('none');
 	
-			$o .= replace_macros($tpl,array(
+			$o .= replace_macros($tpl, [
-	
 				'$header'         => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])),
 				'$autoperms'      => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no),
 				'$addr'           => $contact['xchan_addr'],
@@ -867,15 +866,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 				'$region'         => t('Region'),
 				'$zip_code'       => t('ZIP Code'),
 				'$country'        => t('Country')
-
+			]);
-
-
-
-
-
-
-
-			));
 	
 			$arr = array('contact' => $contact,'output' => $o);
 	

view/css/mod_connedit.css

@@ -121,3 +121,8 @@ input.vcard-fn,
 #template-form-vcard-note {
 	display: none;
 }
+
+.connphone {
+	font-size: 150%;
+	color: green;
+}

view/tpl/abook_edit.tpl

@@ -88,15 +88,6 @@
 			</div>
 			{{/if}}
 			<div class="panel">
-				<div class="section-subtitle-wrapper" role="tab" id="vcard-tool">
-					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#vcard-tool-collapse" aria-expanded="true" aria-controls="vcard-tool-collapse">
-							{{$vcard_label}}
-						</a>
-					</h3>
-				</div>
-
-				<div id="vcard-tool-collapse" class="panel-collapse collapse{{if !$is_pending || $section == 'vcard'}} in{{/if}}" role="tabpanel" aria-labelledby="vcard-tool">
 
 
 <div id="template-form-vcard-org" class="form-group form-vcard-org">
@@ -194,10 +185,6 @@
 </div>
 
 
-
-
-
-
 		<div class="section-content-wrapper-np">
 			<div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
 			<div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field">
@@ -216,8 +203,8 @@
 			<div id="vcard-header-{{$vcard.id}}" class="vcard-header" data-id="{{$vcard.id}}" data-action="open">
 				<span id="vcard-preview-{{$vcard.id}}" class="vcard-preview">
 					{{if $vcard.fn}}<span class="vcard-fn-preview">{{$vcard.fn}}</span>{{/if}}
-					{{if $vcard.emails.0.address}}<span class="vcard-email-preview hidden-xs">{{$vcard.emails.0.address}}</span>{{/if}}
+					{{if $vcard.emails.0.address}}<span class="vcard-email-preview hidden-xs"><a href="mailto:{{$vcard.emails.0.address}}">{{$vcard.emails.0.address}}</a></span>{{/if}}
-					{{if $vcard.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$vcard.tels.0.nr}}</span>{{/if}}
+					{{if $vcard.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$vcard.tels.0.nr}} <a href="tel:{{$vcard.tels.0.nr}}"><i class="fa fa-phone connphone"></i></a></span>{{/if}}
 				</span>
 				<input id="vcard-fn-{{$vcard.id}}" class="vcard-fn" type="text" name="fn" value="{{$vcard.fn}}" size="{{$vcard.fn|count_characters:true}}" placeholder="{{$name_label}}">
 			</div>
@@ -378,31 +365,19 @@
 			</div>
 
 
-
-
-
-
-
-
-
-
-
-
-		</div>
-
-
-
 			<div class="settings-submit-wrapper" >
 				<button type="submit" name="done" value="{{$submit}}" class="btn btn-primary">{{$submit}}</button>
 			</div>
 
-
 		</div>
 
 
 
 
 
+
+
+
 			{{if $affinity }}
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="affinity-tool">