From e7bc3f2bd0f578d04c271029d869e1fbc36cbec4 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Tue, 27 Mar 2012 08:28:47 +0200
Subject: add "find friends" to right_aside to diabook, fixes in css in diabook

---
 view/theme/diabook-blue/communityhome.tpl |   2 +-
 view/theme/diabook-blue/style-network.css |  18 +++++-------------
 view/theme/diabook-blue/theme.php         |   4 ++--
 view/theme/diabook/communityhome.tpl      |   8 ++++++++
 view/theme/diabook/icons/pscontacts.png   | Bin 0 -> 710 bytes
 view/theme/diabook/icons/pubgroups.png    | Bin 710 -> 781 bytes
 view/theme/diabook/profile_side.tpl       |   1 +
 view/theme/diabook/style-network.css      |   3 +++
 view/theme/diabook/theme.php              |  12 ++++++++++++
 9 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 view/theme/diabook/icons/pscontacts.png

diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
index 854684a5f..748e6d077 100755
--- a/view/theme/diabook-blue/communityhome.tpl
+++ b/view/theme/diabook-blue/communityhome.tpl
@@ -24,7 +24,7 @@
 </div>
 {{ endif }}
 
-{{ if $lastusers_title }}
+{{ if $nv }}
 <h3>Find Friends</h3>
 <a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
 <a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index c35320fcf..d0bcd3209 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -387,7 +387,7 @@
   margin-bottom: 1px;
   width: 484px;
   border-bottom: 1px solid #BDCDD4;
-  background-color: #E4EEF7;
+  background-color: #fff;
   padding: 8px;
 }
 
@@ -1324,12 +1324,11 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
   float: right;
 }
 .wall-item-container.comment {
-  margin-top: 0px;
-  margin-bottom: 0px;
+  margin-top: 5px;
+  margin-bottom: 5px;
   margin-left: 80px;
   width: 500px;
   border-bottom: 1px solid hsl(198, 21%, 79%);
-  background-color: #E4EEF7;
 }
 .wall-item-container.comment .contact-photo {
   width: 32px;
@@ -1345,17 +1344,10 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 .wall-item-container.comment .wall-item-links {
   padding-left: 12px;
 }
-.wall-item-like {
-	background-color: #E4EEF7;
-	
-	}
-.wall-item-dislike{
-	background-color: #E4EEF7;
-   border-bottom: 1px solid #BECED5;
-	}
+
 .wall-item-comment-wrapper {
   margin: 1px 0px 0px 80px;
-  background-color: #E4EEF7;
+  background-color: #fff;
   width: 500px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index bbda4f103..e12d940aa 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -137,7 +137,7 @@ function diabook_blue_community_info(){
    $aside['$fostitJS'] = $fostitJS;
    
    //nav FIND FRIENDS
-	
+	if(local_user()) {
 	$nv = array();
 	$nv['directory'] = Array('directory', t('Directory'), "", "");
 	$nv['match'] = Array('match', t('Similar Interests'), "", "");
@@ -145,7 +145,7 @@ function diabook_blue_community_info(){
 	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
 	
 	$aside['$nv'] = $nv;
-	
+	};
 	//Community Page
    $page = '<div id="page-sidebar-right_aside" class="widget">
 			<div class="title tool">
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index aa150b9d0..7e50423ce 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -24,6 +24,14 @@
 </div>
 {{ endif }}
 
+{{ if $nv }}
+<h3>Find Friends</h3>
+<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
+<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a>
+<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nav.invite.3" >$nv.invite.1</a>			
+{{ endif }}
+
 {{ if $lastusers_title }}
 <h3>PostIt to Friendica</h3>
 <div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div>
diff --git a/view/theme/diabook/icons/pscontacts.png b/view/theme/diabook/icons/pscontacts.png
new file mode 100644
index 000000000..acf857f32
Binary files /dev/null and b/view/theme/diabook/icons/pscontacts.png differ
diff --git a/view/theme/diabook/icons/pubgroups.png b/view/theme/diabook/icons/pubgroups.png
index acf857f32..6d9539610 100644
Binary files a/view/theme/diabook/icons/pubgroups.png and b/view/theme/diabook/icons/pubgroups.png differ
diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl
index 0fa8a27fd..fc949639e 100644
--- a/view/theme/diabook/profile_side.tpl
+++ b/view/theme/diabook/profile_side.tpl
@@ -9,6 +9,7 @@
 <ul id="profile-side-menu" class="menu-profile-side">
 	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
 	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
+		<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>		
 	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
 	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
 	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 3854adc34..20c273ec3 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -926,6 +926,9 @@ ul.menu-popup .empty {
 .menu-profile-list.com_side{
 	background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
 	}
+.menu-profile-list.pscontacts{
+	background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
+	}
 
 /* aside */
 aside {
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 798eef422..6eb623d95 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -139,6 +139,17 @@ function diabook_community_info(){
   
    $aside['$fostitJS'] = $fostitJS;
    
+   //right_aside FIND FRIENDS
+	if(local_user()) {
+	$nv = array();
+	$nv['directory'] = Array('directory', t('Directory'), "", "");
+	$nv['match'] = Array('match', t('Similar Interests'), "", "");
+	$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
+	$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
+	
+	$aside['$nv'] = $nv;
+	};
+   
    //Community Page
    $page = '<div id="page-sidebar-right_aside" class="widget">
 			<div class="title tool">
@@ -200,6 +211,7 @@ if ($a->argv[0] === "network" && local_user()){
 		$ps = array('usermenu'=>array());
 		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
 		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
+		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));				
 		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
 		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
 		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-- 
cgit v1.2.3