From c5cace552b55ff7f7fefca0b2bc1f49f80e65647 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 3 Dec 2012 19:17:02 -0800
Subject: most of the basic "make friends" stuff except for email
 notifications, drop community tab

---
 view/tpl/intros.tpl        | 16 +++-------------
 view/tpl/intros_header.tpl |  1 +
 view/tpl/nav.tpl           | 13 +++++++------
 3 files changed, 11 insertions(+), 19 deletions(-)
 create mode 100644 view/tpl/intros_header.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/intros.tpl b/view/tpl/intros.tpl
index e7fd53ca4..6d1f1baa0 100644
--- a/view/tpl/intros.tpl
+++ b/view/tpl/intros.tpl
@@ -1,27 +1,17 @@
 
 <div class="intro-wrapper" id="intro-$contact_id" >
 
-<p class="intro-desc">$str_notifytype $notify_type</p>
 <div class="intro-fullname" id="intro-fullname-$contact_id" >$fullname</div>
 <a class="intro-url-link" id="intro-url-link-$contact_id" href="$url" ><img id="photo-$contact_id" class="intro-photo" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
-<div class="intro-knowyou">$knowyou</div>
-<div class="intro-note" id="intro-note-$contact_id">$note</div>
 <div class="intro-wrapper-end" id="intro-wrapper-end-$contact_id"></div>
-<form class="intro-form" action="notifications/$intro_id" method="post">
+<form class="intro-form" action="intro" method="post">
 <input class="intro-submit-ignore" type="submit" name="submit" value="$ignore" />
+<input class="intro-submit-block" type="submit" name="submit" value="$block" />
 <input class="intro-submit-discard" type="submit" name="submit" value="$discard" />
-</form>
-<div class="intro-form-end"></div>
-
-<form class="intro-approve-form" action="dfrn_confirm" method="post">
 {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$activity }}{{endinc}}
-<input type="hidden" name="dfrn_id" value="$dfrn_id" >
-<input type="hidden" name="intro_id" value="$intro_id" >
+{# {{ inc field_checkbox.tpl with $field=$activity }}{{endinc}} #}
 <input type="hidden" name="contact_id" value="$contact_id" >
 
-$dfrn_text
-
 <input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
 </form>
 </div>
diff --git a/view/tpl/intros_header.tpl b/view/tpl/intros_header.tpl
new file mode 100644
index 000000000..17afd0cbd
--- /dev/null
+++ b/view/tpl/intros_header.tpl
@@ -0,0 +1 @@
+<h3>$title</h3>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index d2e525756..5e909e172 100644
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -26,12 +26,6 @@
 			</li>
 		{{ endif }}
 		
-		{{ if $nav.community }}
-			<li id="nav-community-link" class="nav-menu $sel.community">
-				<a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-			</li>
-		{{ endif }}
-		
 		{{ if $nav.network }}
 			<li id="nav-network-link" class="nav-menu $sel.network">
 				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
@@ -45,6 +39,13 @@
 			</li>
 		{{ endif }}
 		
+		{{ if $nav.intros }}
+			<li id="nav-intros-link" class="nav-menu $sel.intros">
+				<a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" >$nav.intros.1</a>
+				<span id="intro-update" class="nav-notify"></span>
+			</li>
+		{{ endif }}
+		
 
 	{{ if $nav.notifications }}
 
-- 
cgit v1.2.3