X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fdiabook%2Ftheme.php;h=3ce0cc39d0b092e8a07c952d429a41f6bb3ec63e;hb=91d1ef36d8e2bd117160418cb82a39c7b2353c91;hp=6973951a0efa95e1ebce74b512a741453afa6367;hpb=05ad28fb9b75a2ad3925ed3d444e3577ee43c932;p=friendica.git diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 6973951a0e..3ce0cc39d0 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.020) * Author: */ +//print diabook-version for debugging +$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 @@ -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'; @@ -130,19 +136,14 @@ 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()) { $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 +168,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 +192,22 @@ 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 + + + //get_baseurl $url = $a->get_baseurl($ssl_state); $aside['$url'] = $url; @@ -236,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";} } } @@ -251,122 +267,146 @@ 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";} } } -//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('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-blue/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 != "7") { +$a->page['htmlhead'] .= ' +';} +$a->page['htmlhead'] .= ' +';} - - - - -EOT; + +$a->page['htmlhead'] .= ' + + '; \ No newline at end of file