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 5a447cc9bc49e3a44e5fad7e2c4a7a279613dc8d..cdac4019c8f4cfdc6cce823a5a60c044995e211a 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -147,6 +147,13 @@ function diabook_community_info(){
        $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
        $nv['invite'] = Array('invite', t('Invite Friends'), "", "");
        
+       $nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
+                                               <span class="sbox_l"></span>
+                                               <span class="sbox">
+                                               <input type="text" name="search" size="13" maxlength="50">
+                                               </span>
+                                               <span class="sbox_r" id="srch_clear"></span>';
+       
        $aside['$nv'] = $nv;
        };
    
@@ -154,7 +161,7 @@ function diabook_community_info(){
    if(local_user()) {
    $page = '<div id="page-sidebar-right_aside" class="widget">
                        <div class="title tool">
-                       <h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box"></a></h3></div>
+                       <h3>'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
                        <div id="sidebar-page-list"><ul>';
 
        $pagelist = array();
@@ -218,7 +225,7 @@ if ($a->argv[0] === "network" && local_user()){
                $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
                $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
                $ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
-               $ps['usermenu']['pgroups'] = Array('http://dir.friendica.com/directory/forum', t('Public Groups'), "", "");
+               $ps['usermenu']['pgroups'] = Array('http://dir.friendica.com/directory/forum', t('Community Pages'), "", "");
 
                $tpl = get_markup_template('profile_side.tpl');
 
@@ -243,17 +250,18 @@ if ($a->argv[0] === "network" && local_user()){
 
 
 //right_aside at profile pages
-if ($a->argv[0] === "profile"){
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
        if($ccCookie != "8") {
        // COMMUNITY
        diabook_community_info();
        
        // CUSTOM CSS
        $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";
+       
+       
        }
 }
 
-
 // custom css
 if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
 
@@ -358,8 +366,22 @@ function close_lastlikes(){
  $.cookie('close_lastlikes','1', { expires: 365, path: '/' });
  };
  
+ 
+
+function restore_boxes(){
+       $.cookie('close_pages','2', { expires: 365, path: '/' });
+       $.cookie('close_helpers','2', { expires: 365, path: '/' });
+       $.cookie('close_services','2', { expires: 365, path: '/' });
+       $.cookie('close_friends','2', { expires: 365, path: '/' });
+       $.cookie('close_postit','2', { expires: 365, path: '/' });
+       $.cookie('close_lastusers','2', { expires: 365, path: '/' });
+       $.cookie('close_lastphotos','2', { expires: 365, path: '/' });
+       $.cookie('close_lastlikes','2', { expires: 365, path: '/' });
+       alert('Right-hand column was restored. Please refresh your browser');
+  };
+
+ 
 </script>
  
  
 EOT;
-