From b8f0e565f53109cd2d36c748d61fd8ab17d674bb Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 9 Jan 2017 12:03:32 +0100
Subject: implement a menu to select a section to be open by default

---
 Zotlabs/Module/Connedit.php | 26 ++++++++++++++++++++++++++
 view/tpl/abook_edit.tpl     | 20 +++++++++++---------
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index d60ffcd56..92f4fc345 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -645,6 +645,15 @@ class Connedit extends \Zotlabs\Web\Controller {
 				),
 	
 			);
+
+			$sections = [];
+
+			$sections['perms'] = [
+					'label' => t('Permissions'),
+					'url'   => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=&section=perms',
+					'sel'   => '',
+					'title' => t('Open Individual Permissions section by default'),
+			];
 	
 			$self = false;
 	
@@ -664,6 +673,13 @@ class Connedit extends \Zotlabs\Web\Controller {
 			$tpl = get_markup_template("abook_edit.tpl");
 	
 			if(feature_enabled(local_channel(),'affinity')) {
+
+				$sections['affinity'] = [
+					'label' => t('Affinity'),
+					'url'   => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=&section=affinity',
+					'sel'   => '',
+					'title' => t('Open Set Affinity section by default'),
+				];
 	
 				$labels = [
 					t('Me'),
@@ -693,6 +709,15 @@ class Connedit extends \Zotlabs\Web\Controller {
 					'$labels' => $label_str,
 				));
 			}
+
+			if(feature_enabled(local_channel(),'connfilter')) {
+				$sections['filter'] = [
+					'label' => t('Filter'),
+					'url'   => z_root() . '/connedit/' . $contact['abook_id'] . '/?f=&section=filter',
+					'sel'   => '',
+					'title' => t('Open Custom Filter section by default'),
+				];
+			}
 	
 			$rating_val = 0;
 			$rating_text = '';
@@ -794,6 +819,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 				'$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'],
 				'$section'        => $section,
+				'$sections'       => $sections,
 				'$vcard'          => $vcard,
 				'$addr_text'      => t('This connection\'s primary address is'),
 				'$loc_text'       => t('Available locations:'),
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 069c38b52..85a1cac57 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -20,12 +20,14 @@
 			</div>
 			{{if $abook_prev || $abook_next}}
 			<div class="btn-group">
-				{{if $abook_prev}}
-				<a href="connedit/{{$abook_prev}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-default btn-xs" ><i class="fa fa-backward"></i></a>
-				{{/if}}
-				{{if $abook_next}}
-				<a href="connedit/{{$abook_next}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-default btn-xs" ><i class="fa fa-forward"></i></a>
-				{{/if}}
+				<a href="connedit/{{$abook_prev}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-default btn-xs{{if ! $abook_prev}} disabled{{/if}}" ><i class="fa fa-backward"></i></a>
+				<button class="btn btn-default btn-xs" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button>
+				<a href="connedit/{{$abook_next}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-default btn-xs{{if ! $abook_next}} disabled{{/if}}" ><i class="fa fa-forward"></i></a>
+				<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
+					{{foreach $sections as $s}}
+					<li><a href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a></li>
+					{{/foreach}}
+				</ul>
 			</div>
 			{{/if}}
 		</div>
@@ -387,7 +389,7 @@
 						</a>
 					</h3>
 				</div>
-				<div id="affinity-tool-collapse" class="panel-collapse collapse{{if !$is_pending || $section == 'affinity'}} in{{/if}}" role="tabpanel" aria-labelledby="affinity-tool">
+				<div id="affinity-tool-collapse" class="panel-collapse collapse{{if $section == 'affinity'}} in{{/if}}" role="tabpanel" aria-labelledby="affinity-tool">
 					<div class="section-content-tools-wrapper">
 						{{if $slide}}
 						<div class="form-group"><strong>{{$lbl_slider}}</strong></div>
@@ -418,7 +420,7 @@
 						</a>
 					</h3>
 				</div>
-				<div id="fitert-tool-collapse" class="panel-collapse collapse{{if ( !$is_pending && !($slide || $multiprofs)) || $section == 'filter' }} in{{/if}}" role="tabpanel" aria-labelledby="fitert-tool">
+				<div id="fitert-tool-collapse" class="panel-collapse collapse{{if $section == 'filter' }} in{{/if}}" role="tabpanel" aria-labelledby="fitert-tool">
 					<div class="section-content-tools-wrapper">
 						{{include file="field_textarea.tpl" field=$incl}}
 						{{include file="field_textarea.tpl" field=$excl}}
@@ -442,7 +444,7 @@
 						</a>
 					</h3>
 				</div>
-				<div id="rating-tool-collapse" class="panel-collapse collapse{{if !$is_pending && !($slide || $multiprofs) && !$connfilter}} in{{/if}}" role="tabpanel" aria-labelledby="rating-tool">
+				<div id="rating-tool-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="rating-tool">
 					<div class="section-content-tools-wrapper">
 						<div class="section-content-warning-wrapper">
 							{{$rating_info}}
-- 
cgit v1.2.3