X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fdiabook-aerith%2Ftheme.php;h=1518d7e8e2795335a84b93743bffac36c23b2788;hb=3bb785fdad0b1636ac5094a051e291b0f33e0f45;hp=1894c07db3030874da027debb8d1ab3005e97024;hpb=893ece90664588e61584b479ca7af0021ca1df83;p=friendica.git
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
old mode 100755
new mode 100644
index 1894c07db3..1518d7e8e2
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,21 +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: (Version: 1.020)
* Author:
*/
+//print diabook-version for debugging
+$diabook_version = "Diabook-aerith (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-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');
@@ -32,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) {
@@ -111,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';
@@ -127,19 +133,14 @@ 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()) {
$nv = array();
- $nv['directory'] = Array('directory', t('Directory'), "", "");
+ $nv['title'] = Array("", t('Find Friends'), "", "");
+ $nv['directory'] = Array('directory', t('Local Directory'), "", "");
+ $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", "");
$nv['match'] = Array('match', t('Similar Interests'), "", "");
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
@@ -163,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'])
);
@@ -186,10 +188,22 @@ function diabook_aerith_community_info(){
$aside['$page'] = $page;
}
- //END Community Page
-
-
+ //END Community Page
+ //helpers
+ $helpers = array();
+ $helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
+
+ $aside['$helpers'] = $helpers;
+ //end helpers
+ //connectable services
+ $con_services = array();
+ $con_services['title'] = Array("", t('Connect Services'), "", "");
+
+ $aside['$con_services'] = $con_services;
+ //end connectable services
+
+ //get_baseurl
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;
@@ -230,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";}
}
}
@@ -245,76 +260,143 @@ 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";}
}
}
+
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile);
//load jquery.cookie.js
$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('', $cookieJS);
+$a->page['htmlhead'] .= sprintf('', $cookieJS);
+//load jquery.ae.image.resize.js
+$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/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-aerith/js/jquery.autogrow.textarea.js";
+$a->page['htmlhead'] .= sprintf('', $autogrowJS);
//js scripts
+//comment-edit-wrapper on photo_view
+if ($a->argv[0].$a->argv[2] === "photos"."image"){
+
+$a->page['htmlhead'] .= '
+';
+
+}
-$a->page['htmlhead'] .= <<< EOT
+$a->page['htmlhead'] .= '
';
+
+$a->page['htmlhead'] .= '
-
+';
+
+$a->page['htmlhead'] .= '
+ ';
+
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+$a->page['htmlhead'] .= '
';
+
+
+ if($ccCookie != "7") {
+$a->page['htmlhead'] .= '
+';}
+$a->page['htmlhead'] .= '
+
-
-EOT;
-
+ $.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_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");
+ }
+';}
+
+$a->page['htmlhead'] .= '
+
+ ';
\ No newline at end of file