X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=view%2Ftheme%2Fdiabook%2Ftheme.php;h=3ce0cc39d0b092e8a07c952d429a41f6bb3ec63e;hb=91d1ef36d8e2bd117160418cb82a39c7b2353c91;hp=b039e1b826769b95cbdc5605bb96dd7c0c5878a5;hpb=2c843466a93a5083a8f27dee308d5b8514c756de;p=friendica.git
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index b039e1b826..3ce0cc39d0 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,18 +3,20 @@
/*
* Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.018)
+ * Version: (Version: 1.020)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.018)";
+$diabook_version = "Diabook (Version: 1.020)";
$a->page['htmlhead'] .= sprintf('', $diabook_version);
//change css on network and profilepages
$cssFile = null;
-
+$resolution=false;
+$resolution = get_pconfig(local_user(), "diabook", "resolution");
+if ($resolution===false) $resolution="normal";
/**
* prints last community activity
@@ -39,7 +41,7 @@ function diabook_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) {
@@ -118,7 +120,7 @@ function diabook_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';
@@ -134,14 +136,7 @@ function diabook_community_info(){
}
}
- $fostitJS = "javascript: (function() {
- the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook/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;
+
//right_aside FIND FRIENDS
if(local_user()) {
@@ -210,13 +205,7 @@ function diabook_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);
@@ -262,14 +251,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_community_info();
-
+
// CUSTOM CSS
- $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network.css";
+ if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network.css";}
+ if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-network-wide.css";}
}
}
@@ -277,13 +267,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_community_info();
// CUSTOM CSS
- $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";
-
+ if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";}
+ if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile-wide.css";}
}
}
@@ -291,6 +281,8 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile);
+
+
//load jquery.cookie.js
$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
$a->page['htmlhead'] .= sprintf('', $cookieJS);
@@ -299,6 +291,9 @@ $a->page['htmlhead'] .= sprintf('get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.js";
$a->page['htmlhead'] .= sprintf('', $imageresizeJS);
+//load jquery.autogrow-textarea.js
+$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.autogrow.textarea.js";
+$a->page['htmlhead'] .= sprintf('', $autogrowJS);
//js scripts
//comment-edit-wrapper on photo_view
@@ -324,6 +319,15 @@ $a->page['htmlhead'] .= '
';
+$a->page['htmlhead'] .= '
+
+';
+
$a->page['htmlhead'] .= '
';
- if($ccCookie != "8") {
+ if($ccCookie != "7") {
$a->page['htmlhead'] .= '