Merge remote branch 'upstream/master'

[friendica.git] / view / theme / diabook / theme.php

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 29cc64c18747bab7fdff7d8d339c8fd4e7052c6d..6eb623d9536cabe87723ba7c3dcb5b72886f34f5 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -7,9 +7,6 @@
  * Author: 
  */
 
-$a->theme_info = array(
-  'extends' => 'diabook',
-);
 
 //change css on network and profilepages
 $cssFile = null;
@@ -36,7 +33,7 @@ function diabook_community_info(){
                        FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` 
                        WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
                0,
-               12
+               9
        );
        $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
        if(count($r)) {
@@ -64,7 +61,7 @@ function diabook_community_info(){
                        WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
                        GROUP BY `uri`
                        ORDER BY `T1`.`created` DESC
-                       LIMIT 0,10",
+                       LIMIT 0,5",
                        $a->get_baseurl(),$a->get_baseurl()
                        );
 
@@ -112,7 +109,7 @@ function diabook_community_info(){
                                AND `user`.`blockwall`=0
                                AND `user`.`hidewall`=0
                                ORDER BY `photo`.`edited` DESC
-                               LIMIT 0, 12",
+                               LIMIT 0, 9",
                                dbesc(t('Contact Photos')),
                                dbesc(t('Profile Photos'))
                                );
@@ -142,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">
@@ -189,7 +197,7 @@ function diabook_community_info(){
 
 
 //profile_side at networkpages
-if ($a->argv[0] === "network"){
+if ($a->argv[0] === "network" && local_user()){
 
        // USER MENU
        if(local_user()) {
@@ -203,6 +211,7 @@ if ($a->argv[0] === "network"){
                $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'));
@@ -251,6 +260,7 @@ $a->page['htmlhead'] .= <<< EOT
  $(function() {
        $('a.lightbox').fancybox(); // Select all links with lightbox class
  });
+  
  </script>
 EOT;