From 357e71cb44651b364ef5a94e66bd8f7c3125b21a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 27 Jan 2013 17:05:32 -0800
Subject: simplify friendship approval - merge with connection editing

---
 view/theme/redbasic/css/style.css |  3 ++-
 view/tpl/abook_edit.tpl           | 12 ++++++++++++
 view/tpl/smarty3/abook_edit.tpl   | 12 ++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 91aa38618..5cf3dc06f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -315,7 +315,8 @@ nav #nav-link-wrapper .nav-link {
 }
 
 .tab.active {
-	font-weight: bold;	
+/*	font-weight: bold;	*/
+	color: #444444;
 }
 
 ul.tabs {
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>
-- 
cgit v1.2.3