From 614dcb8bce1de38b4ec0abf3299c975f244728f5 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 14 Jan 2016 23:38:00 +0100
Subject: since the perms will be reset on approval better do not provide the
 perms tool before we approved a connection

---
 view/tpl/abook_edit.tpl | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'view/tpl/abook_edit.tpl')

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 1ed3baafa..255ed9cfa 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -177,6 +177,7 @@
 
 			{{/if}}
 
+			{{if ! $is_pending}}
 			<div class="panel">
 				{{if $notself}}
 				<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
@@ -222,6 +223,7 @@
 					</div>
 				</div>
 			</div>
+			{{/if}}
 		</div>
 		</form>
 	</div>
-- 
cgit v1.2.3


From f4e1b2123aed39e3f863ee327b27cb0e7f17520c Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 15 Jan 2016 11:28:05 +0100
Subject: add an approve button to /connections and get rid of the modal popup
 in /connedit. for quick approval (default collection and perms etc.) we now
 can use the approve button in /connections else click the edit button and
 make changes and approval from /connedit. hope thats any better...

---
 view/tpl/abook_edit.tpl | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'view/tpl/abook_edit.tpl')

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 255ed9cfa..4fa810cb4 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -73,25 +73,6 @@
 					</div>
 				</div>
 			</div>
-			<div class="modal" id="abook-pending-modal" tabindex="-1" role="dialog">
-				<div class="modal-dialog" role="document">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-							<h4 class="modal-title" id="myModalLabel">{{$pending_modal_title}}</h4>
-						</div>
-						<div class="modal-body">
-							<strong>{{$name}}</strong> {{$pending_modal_body}}
-						</div>
-						<div class="modal-footer">
-							<button class="btn btn-sm btn-danger pull-left" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</button>
-							<button type="button" class="btn btn-default" data-dismiss="modal">{{$pending_modal_dismiss}}</button>
-							<button type="submit" class="btn btn-primary" name="pending" value="1">{{$pending_modal_approve}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			<script>$('#abook-pending-modal').modal('show');</script>
 			{{/if}}
 
 			{{if $affinity }}
-- 
cgit v1.2.3