Merge remote-tracking branch 'CatoTH/master' into req245

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

diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index df93cbed846d41b41366828ee680c31d4bf0d46c..1518d7e8e2795335a84b93743bffac36c23b2788 100644 (file)
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,19 +3,21 @@
 /*
  * 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: 1.019)
+ * Version: (Version: 1.020)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.019)";
+$diabook_version = "Diabook-aerith (Version: 1.020)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 
 //change css on network and profilepages
 $cssFile = null;
-
+$resolution=false;
+$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution");
+if ($resolution===false) $resolution="normal";
 
 /**
  * prints last community activity
@@ -36,7 +38,7 @@ function diabook_aerith_community_info(){
                0,
                9
        );
-       $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+       $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
        if(count($r)) {
                $photo = 'thumb';
                foreach($r as $rr) {
@@ -115,7 +117,7 @@ function diabook_aerith_community_info(){
                                dbesc(t('Profile Photos'))
                                );
                if(count($r)) {
-               $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+               $tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
                foreach($r as $rr) {
                        $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
                        $photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
@@ -131,14 +133,7 @@ function diabook_aerith_community_info(){
                }
        }
        
-       $fostitJS = "javascript: (function() {
-                                       the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-                                               a_funct = function() {
-                                                       if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-                                                       if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-                                                       else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
+       
    
    //nav FIND FRIENDS
        if(local_user()) {
@@ -206,13 +201,7 @@ function diabook_aerith_community_info(){
        
        $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);   
@@ -255,14 +244,15 @@ if ($a->argv[0] === "network" && local_user()){
 
        }
        
-       $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+       $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
        
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
        // COMMUNITY
        diabook_aerith_community_info();
        
        // CUSTOM CSS
-       $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";
+       if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";}
+       if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network-wide.css";}
        }
 }
 
@@ -270,12 +260,13 @@ if ($a->argv[0] === "network" && local_user()){
 
 //right_aside at profile pages
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
        // COMMUNITY
        diabook_aerith_community_info();
        
        // CUSTOM CSS
-       $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";
+       if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";}
+       if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile-wide.css";}
        }
 }
 
@@ -369,7 +360,7 @@ $a->page['htmlhead'] .= '
 </script>';
 
 
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@@ -394,10 +385,6 @@ $("right_aside").ready(function(){
                document.getElementById( "close_friends" ).style.display = "none";
                        };
        
-       if($.cookie("close_postit") == "1") 
-               {
-               document.getElementById( "close_postit" ).style.display = "none";
-                       };
                        
        if($.cookie("close_lastusers") == "1") 
                {
@@ -436,10 +423,6 @@ function close_friends(){
  $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
 
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie("close_postit","1", { expires: 365, path: "/" });
- };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
@@ -464,7 +447,6 @@ function restore_boxes(){
        $.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: "/" });