X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fdiabook%2Ftheme.php;h=0fdcbf701eee91ad735e95ab6bb71be3e0314814;hb=621bf6bab4680da3f92da56ecb12c16e194ebbbb;hp=cdac4019c8f4cfdc6cce823a5a60c044995e211a;hpb=2212e6931096d188be2dea27bcb4877f16c5c2f8;p=friendica.git
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index cdac4019c8..0fdcbf701e 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,14 +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: (Version: 1.019)
* Author:
*/
+//print diabook-version for debugging
+$diabook_version = "Diabook (Version: 1.019)";
+$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
@@ -20,7 +26,7 @@ $cssFile = null;
function diabook_community_info(){
$a = get_app();
- //right_aside at networkpages
+
// last 12 users
$aside['$lastusers_title'] = t('Last users');
@@ -35,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) {
@@ -114,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';
@@ -142,7 +148,9 @@ function diabook_community_info(){
//right_aside 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'), "", "");
@@ -167,7 +175,8 @@ function diabook_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'])
);
@@ -190,9 +199,28 @@ function diabook_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
+ //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);
$aside['$url'] = $url;
@@ -241,9 +269,10 @@ if ($a->argv[0] === "network" && local_user()){
if($ccCookie != "8") {
// 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";}
}
}
@@ -256,8 +285,8 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
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";}
}
}
@@ -265,61 +294,136 @@ 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-blue/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('', $cookieJS);
+$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
+$a->page['htmlhead'] .= sprintf('', $cookieJS);
+
+//load jquery.ae.image.resize.js
+$imageresizeJS = $a->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
+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 != "8") {
+$a->page['htmlhead'] .= '
+';}
+$a->page['htmlhead'] .= '
+';}
-
-
-
-
-EOT;
+
+$a->page['htmlhead'] .= '
+
+ ';
\ No newline at end of file