]> git.mxchange.org Git - friendica.git/blobdiff - view/theme/diabook-aerith/theme.php
Merge remote-tracking branch 'CatoTH/master' into req245
[friendica.git] / view / theme / diabook-aerith / theme.php
old mode 100755 (executable)
new mode 100644 (file)
index c0537b0..1518d7e
@@ -3,26 +3,27 @@
 /*
  * 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.016)
+ * Version: (Version: 1.020)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.016)";
+$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
  */
 function diabook_aerith_community_info(){
        $a = get_app();
-       //right_aside at networkpages
 
        // last 12 users
        $aside['$lastusers_title'] = t('Last users');
@@ -37,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) {
@@ -116,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';
@@ -132,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()) {
@@ -207,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);   
@@ -256,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";}
        }
 }
 
@@ -271,64 +260,16 @@ 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";}
        }
 }
 
-//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-aerith/style-settings.css";
-       
-}
 
 
 // custom css
@@ -342,6 +283,10 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
 $imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js";
 $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
 
+//load jquery.autogrow-textarea.js
+$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
+
 //js scripts
 //comment-edit-wrapper on photo_view
 if ($a->argv[0].$a->argv[2] === "photos"."image"){
@@ -365,6 +310,15 @@ $a->page['htmlhead'] .= '
  });
   
  </script>';
+$a->page['htmlhead'] .= '
+
+<script type="text/javascript">
+
+function tautogrow(id){
+               $("textarea#comment-edit-text-" +id).autogrow();        
+       };
+ </script>';
 
 $a->page['htmlhead'] .= '
  <script>
@@ -406,7 +360,7 @@ $a->page['htmlhead'] .= '
 </script>';
 
 
-       if($ccCookie != "8") {
+       if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@@ -431,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") 
                {
@@ -473,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";
@@ -501,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: "/" });
@@ -512,10 +457,10 @@ function restore_boxes(){
 $a->page['htmlhead'] .= ' 
 
 <script type="text/javascript">
-function insertFormatting(BBcode,id) {
+function insertFormatting(comment,BBcode,id) {
        
                var tmpStr = $("#comment-edit-text-" + id).val();
-               if(tmpStr == "Kommentar") {
+               if(tmpStr == comment) {
                        tmpStr = "";
                        $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                        $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");