aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-01-27 17:05:32 -0800
committerfriendica <info@friendica.com>2013-01-27 17:05:32 -0800
commit357e71cb44651b364ef5a94e66bd8f7c3125b21a (patch)
tree192aaa0f5725a10ddf2a3d262f659f35562ae9c2 /view/tpl
parentbec484237a626c8c0ae930277b17cc1341380a47 (diff)
downloadvolse-hubzilla-357e71cb44651b364ef5a94e66bd8f7c3125b21a.tar.gz
volse-hubzilla-357e71cb44651b364ef5a94e66bd8f7c3125b21a.tar.bz2
volse-hubzilla-357e71cb44651b364ef5a94e66bd8f7c3125b21a.zip
simplify friendship approval - merge with connection editing
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/abook_edit.tpl12
-rw-r--r--view/tpl/smarty3/abook_edit.tpl12
2 files changed, 24 insertions, 0 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 4deb84823..e77458478 100644
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -13,6 +13,7 @@ $tabs
<div id="autoperm-desc" class="descriptive-paragraph">$autolbl</div>
{{ endif }}
+
<div id="contact-edit-wrapper">
{{ if $notself }}
@@ -24,12 +25,23 @@ $slide
{{ endif }}
{{ endif }}
+
+
<h3>$permlbl</h3>
<form action="connections/$contact_id" method="post" >
<input type="hidden" name="contact_id" value="$contact_id">
<input id="contact-closeness-mirror" type="hidden" name="closeness" value="$close" />
+{{ if $noperms }}
+<div id="noperm-desc" class="descriptive-paragraph">$noperms</div>
+{{ endif }}
+
+
+{{ if $is_pending }}
+{{inc field_checkbox.tpl with $field=$unapproved }}{{endinc}}
+{{ endif }}
+
<br />
<b>$quick</b>
<ul>
diff --git a/view/tpl/smarty3/abook_edit.tpl b/view/tpl/smarty3/abook_edit.tpl
index b540ba531..6331aa46c 100644
--- a/view/tpl/smarty3/abook_edit.tpl
+++ b/view/tpl/smarty3/abook_edit.tpl
@@ -18,6 +18,7 @@
<div id="autoperm-desc" class="descriptive-paragraph">{{$autolbl}}</div>
{{/if}}
+
<div id="contact-edit-wrapper">
{{if $notself}}
@@ -29,12 +30,23 @@
{{/if}}
{{/if}}
+
+
<h3>{{$permlbl}}</h3>
<form action="connections/{{$contact_id}}" method="post" >
<input type="hidden" name="contact_id" value="{{$contact_id}}">
<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
+{{if $noperms}}
+<div id="noperm-desc" class="descriptive-paragraph">{{$noperms}}</div>
+{{/if}}
+
+
+{{if $is_pending}}
+{{include file="field_checkbox.tpl" field=$unapproved}}
+{{/if}}
+
<br />
<b>{{$quick}}</b>
<ul>