Merge commit 'upstream/master'

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

diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 3e35144de617bce51c993bf7ef83ff25ee03f28a..fb6b44a16b587af947a62d5017585d99dd63f601 100755 (executable)
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -144,13 +144,20 @@ function diabook_blue_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;
        };
        //Community Page
        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();
@@ -212,7 +219,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.friendika.com/directory/forum', t('Public Groups'), "", "");
+               $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
 
                $tpl = get_markup_template('profile_side.tpl');
 
@@ -237,7 +244,7 @@ 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_blue_community_info();
@@ -247,6 +254,56 @@ if ($a->argv[0] === "profile"){
        }
 }
 
+//tabs at right_aside on settings page
+if ($a->argv[0] === "settings"){
+       
+       $tabs = array(
+               array(
+                       'label' => t('Account settings'),
+                       'url'   => $a->get_baseurl(true).'/settings',
+                       'sel'   => (($a->argc == 1)?'active':''),
+               ),      
+               array(
+                       'label' => t('Display settings'),
+                       'url'   => $a->get_baseurl(true).'/settings/display',
+                       'sel'   => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
+               ),      
+               array(
+                       'label' => t('Edit/Manage Profiles'),
+                       'url'   => $a->get_baseurl(true).'/profiles',
+               ),      
+               array(
+                       'label' => t('Connector settings'),
+                       'url'   => $a->get_baseurl(true).'/settings/connectors',
+                       'sel'   => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
+               ),
+               array(
+                       'label' => t('Plugin settings'),
+                       'url'   => $a->get_baseurl(true).'/settings/addon',
+                       'sel'   => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
+               ),
+               array(
+                       'label' => t('Connections'),
+                       'url' => $a->get_baseurl(true) . '/settings/oauth',
+                       'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
+               ),
+               array(
+                       'label' => t('Export personal data'),
+                       'url' => $a->get_baseurl(true) . '/uexport',
+                       'sel' => ''
+               )
+       );
+       $tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
+       $a->page['aside'] = replace_macros($tabtpl, array(
+               '$tabs' => $tabs,
+       ));
+       
+       
+       // CUSTOM CSS
+       $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-settings.css";
+       
+}
+
 
 // custom css
 if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
@@ -353,6 +410,18 @@ function close_lastlikes(){
  document.getElementById( "close_lastlikes" ).style.display = "none";
  $.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>