Merge branch 'master' of https://github.com/friendica/friendica

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

diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
old mode 100755 (executable)
new mode 100644 (file)
index 4900107..e56f0ab
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook-aerith
  * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: 
+ * Version: (Version: 1.012)
  * Author: 
  */
 
@@ -139,7 +139,8 @@ function diabook_aerith_community_info(){
    //nav FIND FRIENDS
        if(local_user()) {
        $nv = array();
-       $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", "");
+   $nv['title'] = Array("", t('Find Friends'), "", "");
+       $nv['directory'] = Array('directory', t('Local Directory'), "", "");
        $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
        $nv['match'] = Array('match', t('Similar Interests'), "", "");
        $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
@@ -164,7 +165,8 @@ function diabook_aerith_community_info(){
        $pagelist = array();
 
        $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-                       WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
+                       WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+                       ORDER BY `name` ASC",
                        intval($a->user['uid'])
        );
 
@@ -187,10 +189,28 @@ function diabook_aerith_community_info(){
                
                $aside['$page'] = $page;
        }               
-  //END Community Page            
-   
-   
-   
+  //END Community Page 
+  //helpers
+   $helpers = array();
+       $helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
+       
+       $aside['$helpers'] = $helpers;
+   //end helpers
+   //connectable services
+   $con_services = array();
+       $con_services['title'] = Array("", t('Connect Services'), "", "");
+       
+       $aside['$con_services'] = $con_services;
+   //end connectable services
+   //postit
+   $postit = array();
+       $postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
+       $postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
+       
+       $aside['$postit'] = $postit;
+   //end postit
+  
+   //get_baseurl             
    $url = $a->get_baseurl($ssl_state);   
    $aside['$url'] = $url;
 
@@ -316,56 +336,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
 
 //js scripts
 
-$a->page['htmlhead'] .= <<< EOT
+$a->page['htmlhead'] .= '
 
 <script>
  $(function() {
-       $('a.lightbox').fancybox(); // Select all links with lightbox class
-       
+       $("a.lightbox").fancybox(); // Select all links with lightbox class
  });
+  
+ </script>';
 
-</script>
 
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
 <script>
 
 $("right_aside").ready(function(){
        
-       if($.cookie('close_pages') == '1') 
+       if($.cookie("close_pages") == "1") 
                {
                document.getElementById( "close_pages" ).style.display = "none";
                        };
        
-       if($.cookie('close_helpers') == '1') 
+       if($.cookie("close_helpers") == "1") 
                {
                document.getElementById( "close_helpers" ).style.display = "none";
                        };
                        
-       if($.cookie('close_services') == '1') 
+       if($.cookie("close_services") == "1") 
                {
                document.getElementById( "close_services" ).style.display = "none";
                        };
                        
-       if($.cookie('close_friends') == '1') 
+       if($.cookie("close_friends") == "1") 
                {
                document.getElementById( "close_friends" ).style.display = "none";
                        };
        
-       if($.cookie('close_postit') == '1') 
+       if($.cookie("close_postit") == "1") 
                {
                document.getElementById( "close_postit" ).style.display = "none";
                        };
                        
-       if($.cookie('close_lastusers') == '1') 
+       if($.cookie("close_lastusers") == "1") 
                {
                document.getElementById( "close_lastusers" ).style.display = "none";
                        };
                        
-       if($.cookie('close_lastphotos') == '1') 
+       if($.cookie("close_lastphotos") == "1") 
                {
                document.getElementById( "close_lastphotos" ).style.display = "none";
                        };
                        
-       if($.cookie('close_lastlikes') == '1') 
+       if($.cookie("close_lastlikes") == "1") 
                {
                document.getElementById( "close_lastlikes" ).style.display = "none";
                        };}
@@ -374,57 +396,55 @@ $("right_aside").ready(function(){
 
 function close_pages(){
  document.getElementById( "close_pages" ).style.display = "none";
- $.cookie('close_pages','1', { expires: 365, path: '/' });
+ $.cookie("close_pages","1", { expires: 365, path: "/" });
  };
  
 function close_helpers(){
  document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie('close_helpers','1', { expires: 365, path: '/' });
+  $.cookie("close_helpers","1", { expires: 365, path: "/" });
  };
 
 function close_services(){
  document.getElementById( "close_services" ).style.display = "none";
- $.cookie('close_services','1', { expires: 365, path: '/' });
+ $.cookie("close_services","1", { expires: 365, path: "/" });
  };
  
 function close_friends(){
  document.getElementById( "close_friends" ).style.display = "none";
- $.cookie('close_friends','1', { expires: 365, path: '/' });
+ $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
 
 function close_postit(){
  document.getElementById( "close_postit" ).style.display = "none";
- $.cookie('close_postit','1', { expires: 365, path: '/' });
+ $.cookie("close_postit","1", { expires: 365, path: "/" });
  };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie('close_lastusers','1', { expires: 365, path: '/' });
+ $.cookie("close_lastusers","1", { expires: 365, path: "/" });
  };
 
 function close_lastphotos(){
  document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie('close_lastphotos','1', { expires: 365, path: '/' });
+ $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
  };
  
 function close_lastlikes(){
  document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie('close_lastlikes','1', { expires: 365, path: '/' });
+ $.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;
+ 
 
+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>';}
\ No newline at end of file