aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-01-15 11:28:05 +0100
committerMario Vavti <mario@mariovavti.com>2016-01-15 11:28:05 +0100
commitf4e1b2123aed39e3f863ee327b27cb0e7f17520c (patch)
treef24802e587f07718fc9cf286ff09be6472eef79d /view/tpl
parent63ee0daac51b8c04123479f2ac91e1762492896f (diff)
downloadvolse-hubzilla-f4e1b2123aed39e3f863ee327b27cb0e7f17520c.tar.gz
volse-hubzilla-f4e1b2123aed39e3f863ee327b27cb0e7f17520c.tar.bz2
volse-hubzilla-f4e1b2123aed39e3f863ee327b27cb0e7f17520c.zip
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...
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/abook_edit.tpl19
-rwxr-xr-xview/tpl/connection_template.tpl9
2 files changed, 8 insertions, 20 deletions
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 }}
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index a0bdf33aa..2629e5cf4 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -1,8 +1,15 @@
<div id="contact-entry-wrapper-{{$contact.id}}">
<div class="section-subtitle-wrapper">
<div class="pull-right">
+ {{if $contact.approve}}
+ <form action="connedit/{{$contact.id}}" method="post" >
+ <button type="submit" class="btn btn-success btn-xs" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="icon-ok"></i> {{$contact.approve}}</button>
+ {{/if}}
<a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="icon-trash"></i> {{$contact.delete}}</a>
- <a href="{{$contact.link}}" class="btn btn-success btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i> {{$contact.edit}}</a>
+ <a href="{{$contact.link}}" class="btn btn-default btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i></a>
+ {{if $contact.approve}}
+ </form>
+ {{/if}}
</div>
<h3>{{if $contact.public_forum}}<i class="icon-comments-alt"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a></h3>
</div>