aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/abook_edit.tpl
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-16 13:44:23 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-16 13:44:23 +0100
commit983e170f20cfafadab7fb74bf5ca5b56e54205db (patch)
tree25b39449dcbf0636b5519c3beac2ec70b04510c1 /view/tpl/abook_edit.tpl
parent72353bf0446901f1711cba7a2e50dbce9bd06227 (diff)
parentf66c6bfebfd48274c9b29cd62b1fac933c6530e4 (diff)
downloadvolse-hubzilla-983e170f20cfafadab7fb74bf5ca5b56e54205db.tar.gz
volse-hubzilla-983e170f20cfafadab7fb74bf5ca5b56e54205db.tar.bz2
volse-hubzilla-983e170f20cfafadab7fb74bf5ca5b56e54205db.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl/abook_edit.tpl')
-rwxr-xr-xview/tpl/abook_edit.tpl21
1 files changed, 2 insertions, 19 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 1ed3baafa..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 }}
@@ -177,6 +158,7 @@
{{/if}}
+ {{if ! $is_pending}}
<div class="panel">
{{if $notself}}
<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
@@ -222,6 +204,7 @@
</div>
</div>
</div>
+ {{/if}}
</div>
</form>
</div>