diabook-themes: fixes in js

diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index 4900107507f2da487cec3d34eccd13dd2052a9fc..f9be1b232726a072777a9f9acf3a90c5a95a2678 100755 (executable)
--- 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: 0.010)
  * Author: 
  */
 
@@ -164,7 +164,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'])
        );
 
@@ -316,56 +317,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 +377,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

diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 891c13cbf39fd64e94d38480a2fc8c3c82ba2c76..3a1312fefad8cd4ba651b5c446f41c14de2a110e 100755 (executable)
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook-blue
  * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: 
+ * Version: (Version: 0.010)
  * Author: 
  */
 
@@ -164,7 +164,8 @@ function diabook_blue_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'])
        );
 
@@ -316,56 +317,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 +377,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>';}

diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index 44a76a5e459cd73fab55887902997f6feee6219b..79045c979d3f8013835cdd686ce51055d3b55769 100755 (executable)
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook-red
  * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: 
+ * Version: (Version: 0.010)
  * Author: 
  */
 
@@ -164,7 +164,8 @@ function diabook_red_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'])
        );
 
@@ -317,56 +318,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";
                        };}
@@ -375,57 +378,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>';}

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 34e5535ded124f9a1979411c0a40f4bdd1bf36b4..d8f96e9f78c8ad28b2a4dd13960395b52d10ecb7 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: 
+ * Version: (Version: 0.010)
  * Author: 
  */