X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fdiabook%2Ftheme.php;h=a74e8c02695e683d9f2043999cb14e3687e87812;hb=7bae290aebcd7ecb5b7a21b64781bd50ccc76b41;hp=fbe42a304ac75431df3d47aba0a6d51d07a33ab8;hpb=cee36087470acbc4aeff121ab91cd337737dcc67;p=friendica.git
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index fbe42a304a..a74e8c0269 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,17 +3,30 @@
/*
* 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.014)
+ * Version: (Version: 1.021)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.014)";
+$diabook_version = "Diabook (Version: 1.021)";
$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";
+$color = false;
+$color = get_pconfig(local_user(), "diabook", "color");
+if ($color===false) $color="diabook";
+if ($color=="diabook") $color_path = "/";
+if ($color=="aerith") $color_path = "/diabook-aerith/";
+if ($color=="blue") $color_path = "/diabook-blue/";
+if ($color=="red") $color_path = "/diabook-red/";
+if ($color=="pink") $color_path = "/diabook-pink/";
+if ($color=="green") $color_path = "/diabook-green/";
+if ($color=="dark") $color_path = "/diabook-dark/";
/**
@@ -24,7 +37,7 @@ $cssFile = null;
function diabook_community_info(){
$a = get_app();
- //right_aside at networkpages
+
// last 12 users
$aside['$lastusers_title'] = t('Last users');
@@ -39,7 +52,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 +131,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 +147,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 +216,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 +262,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".$color_path."style-network.css";}
+ if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-network-wide.css";}
}
}
@@ -277,72 +278,22 @@ 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".$color_path."style-profile.css";}
+ if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook".$color_path."style-profile-wide.css";}
}
}
-
-
-//tabs at 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/style-settings.css";
-
-}
-
// 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);
@@ -351,6 +302,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
@@ -376,11 +330,21 @@ $a->page['htmlhead'] .= '
';
+$a->page['htmlhead'] .= '
+
+';
+
+
$a->page['htmlhead'] .= '
';
+if($a->argv[0] === "settings" && local_user()) {
+$a->page['htmlhead'] .= '
+';}
+
+
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
@@ -403,7 +394,12 @@ $a->page['htmlhead'] .= '
$(function() {
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
});
+';
+
+ if($ccCookie != "7") {
+$a->page['htmlhead'] .= '
+';}}
-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");
- };
-';}
\ No newline at end of file
+$a->page['htmlhead'] .= '
+
+ ';
\ No newline at end of file