From: tommy tomson Date: Tue, 8 May 2012 01:29:25 +0000 (+0200) Subject: diabook-themes: state of the boxes at right_aside are now stored in db, instead of... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=88443ed3fb3c4d91f93d3520f260aa40eb6ec694;p=friendica.git diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie. --- diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index eb4385722c..60d4646cce 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -22,9 +22,6 @@ just contact me, if you are intesrested in joining

-
-zoom: -
{{inc field_input.tpl with $field=$ELZoom}}{{endinc}} {{inc field_input.tpl with $field=$ELPosX}}{{endinc}} {{inc field_input.tpl with $field=$ELPosY}}{{endinc}} @@ -34,6 +31,24 @@ zoom: + +
@@ -47,7 +62,7 @@ zoom:
{{ if $comunity_profiles_title }} -

$comunity_profiles_title

+

$comunity_profiles_title

{{ for $comunity_profiles_items as $i }} $i @@ -58,7 +73,7 @@ zoom:
{{ if $helpers }} -

$helpers.title.1

+

$helpers.title.1

How-To Guides
NewHere
Friendica Support
@@ -69,7 +84,7 @@ zoom:
{{ if $con_services }} -

$con_services.title.1

+

$con_services.title.1

Facebook StatusNet @@ -85,7 +100,7 @@ zoom:
{{ if $nv }} -

$nv.title.1

+

$nv.title.1

$nv.directory.1
$nv.global_directory.1
$nv.match.1
@@ -97,7 +112,7 @@ $nv.search
{{ if $lastusers_title }} -

$lastusers_title

+

$lastusers_title

{{ for $lastusers_items as $i }} $i @@ -117,7 +132,7 @@ $nv.search
{{ if $photos_title }} -

$photos_title

+

$photos_title

{{ for $photos_items as $i }} $i @@ -128,7 +143,7 @@ $nv.search
{{ if $like_title }} -

$like_title

+

$like_title

    {{ for $like_items as $i }}
  • $i
    • @@ -138,14 +153,14 @@ $nv.search
-

$twitter.title.1

+

$twitter.title.1

{{ if $mapquery }} -

$mapquery.title.1

+

$mapquery.title.1

Data CC-By-SA by OpenStreetMap
diff --git a/view/theme/diabook/config.php b/view/theme/diabook/config.php index 40a539079d..84dd648345 100644 --- a/view/theme/diabook/config.php +++ b/view/theme/diabook/config.php @@ -17,8 +17,19 @@ function theme_content(&$a){ $ELZoom = get_pconfig(local_user(), 'diabook', 'ELZoom' ); $ELPosX = get_pconfig(local_user(), 'diabook', 'ELPosX' ); $ELPosY = get_pconfig(local_user(), 'diabook', 'ELPosY' ); + $close_pages = get_pconfig(local_user(), 'diabook', 'close_pages' ); + $close_mapquery = get_pconfig(local_user(), 'diabook', 'close_mapquery' ); + $close_profiles = get_pconfig(local_user(), 'diabook', 'close_profiles' ); + $close_helpers = get_pconfig(local_user(), 'diabook', 'close_helpers' ); + $close_services = get_pconfig(local_user(), 'diabook', 'close_services' ); + $close_friends = get_pconfig(local_user(), 'diabook', 'close_friends' ); + $close_twitter = get_pconfig(local_user(), 'diabook', 'close_twitter' ); + $close_lastusers = get_pconfig(local_user(), 'diabook', 'close_lastusers' ); + $close_lastphotos = get_pconfig(local_user(), 'diabook', 'close_lastphotos' ); + $close_lastlikes = get_pconfig(local_user(), 'diabook', 'close_lastlikes' ); - return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY); + + return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY, $close_pages, $close_mapquery, $close_profiles, $close_helpers, $close_services, $close_friends, $close_twitter, $close_lastusers, $close_lastphotos, $close_lastlikes); } function theme_post(&$a){ @@ -34,6 +45,18 @@ function theme_post(&$a){ set_pconfig(local_user(), 'diabook', 'ELZoom', $_POST['diabook_ELZoom']); set_pconfig(local_user(), 'diabook', 'ELPosX', $_POST['diabook_ELPosX']); set_pconfig(local_user(), 'diabook', 'ELPosY', $_POST['diabook_ELPosY']); + set_pconfig(local_user(), 'diabook', 'ELPosY', $_POST['diabook_ELPosY']); + set_pconfig(local_user(), 'diabook', 'close_pages', $_POST['diabook_close_pages']); + set_pconfig(local_user(), 'diabook', 'close_mapquery', $_POST['diabook_close_mapquery']); + set_pconfig(local_user(), 'diabook', 'close_profiles', $_POST['diabook_close_profiles']); + set_pconfig(local_user(), 'diabook', 'close_helpers', $_POST['diabook_close_helpers']); + set_pconfig(local_user(), 'diabook', 'close_services', $_POST['diabook_close_services']); + set_pconfig(local_user(), 'diabook', 'close_friends', $_POST['diabook_close_friends']); + set_pconfig(local_user(), 'diabook', 'close_twitter', $_POST['diabook_close_twitter']); + set_pconfig(local_user(), 'diabook', 'close_lastusers', $_POST['diabook_close_lastusers']); + set_pconfig(local_user(), 'diabook', 'close_lastphotos', $_POST['diabook_close_lastphotos']); + set_pconfig(local_user(), 'diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']); + } } @@ -47,8 +70,18 @@ function theme_admin(&$a){ $ELZoom = get_config('diabook', 'ELZoom' ); $ELPosX = get_config('diabook', 'ELPosX' ); $ELPosY = get_config('diabook', 'ELPosY' ); + $close_pages = get_config('diabook', 'close_pages' ); + $close_mapquery = get_config('diabook', 'close_mapquery' ); + $close_profiles = get_config('diabook', 'close_profiles' ); + $close_helpers = get_config('diabook', 'close_helpers' ); + $close_services = get_config('diabook', 'close_services' ); + $close_friends = get_config('diabook', 'close_friends' ); + $close_twitter = get_config('diabook', 'close_twitter' ); + $close_lastusers = get_config('diabook', 'close_lastusers' ); + $close_lastphotos = get_config('diabook', 'close_lastphotos' ); + $close_lastlikes = get_config('diabook', 'close_lastlikes' ); - return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY); + return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY, $close_pages, $close_mapquery, $close_profiles, $close_helpers, $close_services, $close_friends, $close_twitter, $close_lastusers, $close_lastphotos, $close_lastlikes); } function theme_admin_post(&$a){ @@ -60,12 +93,22 @@ function theme_admin_post(&$a){ set_config('diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']); set_config('diabook', 'ELZoom', $_POST['diabook_ELZoom']); set_config('diabook', 'ELPosX', $_POST['diabook_ELPosX']); - set_config('diabook', 'ELPosY', $_POST['diabook_ELPosY']); + set_config('diabook', 'close_pages', $_POST['diabook_close_pages']); + set_config('diabook', 'close_mapquery', $_POST['diabook_close_mapquery']); + set_config('diabook', 'close_profiles', $_POST['diabook_close_profiles']); + set_config('diabook', 'close_helpers', $_POST['diabook_close_helpers']); + set_config('diabook', 'close_services', $_POST['diabook_close_services']); + set_config('diabook', 'close_friends', $_POST['diabook_close_friends']); + set_config('diabook', 'close_twitter', $_POST['diabook_close_twitter']); + set_config('diabook', 'close_lastusers', $_POST['diabook_close_lastusers']); + set_config('diabook', 'close_lastphotos', $_POST['diabook_close_lastphotos']); + set_config('diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']); + } } -function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY){ +function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY, $close_pages, $close_mapquery, $close_profiles, $close_helpers, $close_services, $close_friends, $close_twitter, $close_lastusers, $close_lastphotos, $close_lastlikes){ $line_heights = array( "1.3"=>"1.3", "---"=>"---", @@ -99,7 +142,47 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSear 'red'=>'red', 'dark'=>'dark', ); - + $close_pagesC = array( + '1'=>'hide', + '0'=>'show', + ); + $close_mapqueryC = array( + '1'=>'hide', + '0'=>'show', + ); + $close_profilesC = array( + '0'=>'show', + '1'=>'hide', + ); + $close_helpersC = array( + '0'=>'show', + '1'=>'hide', + ); + $close_servicesC = array( + '0'=>'show', + '1'=>'hide', + ); + $close_friendsC = array( + '0'=>'show', + '1'=>'hide', + ); + $close_twitterC = array( + '1'=>'hide', + '0'=>'show', + ); + $close_lastusersC = array( + '0'=>'show', + '1'=>'hide', + ); + $close_lastphotosC = array( + '0'=>'show', + '1'=>'hide', + ); + $close_lastlikesC = array( + '0'=>'show', + '1'=>'hide', + ); + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); @@ -115,6 +198,16 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSear '$ELZoom' => array('diabook_ELZoom', t('Set zoomfactor for Earth Layer'), $ELZoom, '', $ELZoom), '$ELPosX' => array('diabook_ELPosX', t('Set longitude (X) for Earth Layer'), $ELPosX, '', $ELPosX), '$ELPosY' => array('diabook_ELPosY', t('Set latitude (Y) for Earth Layer'), $ELPosY, '', $ELPosY), + '$close_pages' => array('diabook_close_pages', t('Show "Cummunity Pages" at right-hand coloumn?'), $close_pages, '', $close_pagesC), + '$close_mapquery' => array('diabook_close_mapquery', t('Show "Earth Layers" at right-hand coloumn?'), $close_mapquery, '', $close_mapqueryC), + '$close_profiles' => array('diabook_close_profiles', t('Show "Cummunity Profiles" at right-hand coloumn?'), $close_profiles, '', $close_profilesC), + '$close_helpers' => array('diabook_close_helpers', t('Show "Help or @NewHere" at right-hand coloumn?'), $close_helpers, '', $close_helpersC), + '$close_services' => array('diabook_close_services', t('Show "Connect Services" at right-hand coloumn?'), $close_services, '', $close_servicesC), + '$close_friends' => array('diabook_close_friends', t('Show "Find Friends" at right-hand coloumn?'), $close_friends, '', $close_friendsC), + '$close_twitter' => array('diabook_close_twitter', t('Show "Last Tweets" at right-hand coloumn?'), $close_twitter, '', $close_twitterC), + '$close_lastusers' => array('diabook_close_lastusers', t('Show "Last Users" at right-hand coloumn?'), $close_lastusers, '', $close_lastusersC), + '$close_lastphotos' => array('diabook_close_lastphotos', t('Show "Last Photos" at right-hand coloumn?'), $close_lastphotos, '', $close_lastphotosC), + '$close_lastlikes' => array('diabook_close_lastlikes', t('Show "Last Likes" at right-hand coloumn?'), $close_lastlikes, '', $close_lastlikesC), )); return $o; } diff --git a/view/theme/diabook/js/jquery.mapquery.mqMousePosition.js b/view/theme/diabook/js/jquery.mapquery.mqMousePosition.js index 54d0c53093..d4370bfe49 100644 --- a/view/theme/diabook/js/jquery.mapquery.mqMousePosition.js +++ b/view/theme/diabook/js/jquery.mapquery.mqMousePosition.js @@ -94,10 +94,10 @@ $.widget("mapQuery.mqMousePosition", { new OpenLayers.Projection(mapProjection), new OpenLayers.Projection(displayProjection)); } - $("#mq-mouseposition-x", element).html( - this.options.x+': '+pos.lon.toFixed(this.options.precision)); - $("#mq-mouseposition-y", element).html( - this.options.y+': '+pos.lat.toFixed(this.options.precision)); + $("#id_diabook_ELPosX", element).val( + this.options.x+pos.lon.toFixed(this.options.precision)); + $("#id_diabook_ELPosY", element).val( + this.options.y+pos.lat.toFixed(this.options.precision)); }, _onMouseMove: function(evt, data) { diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index a6b58e1037..607414f17a 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -19,6 +19,67 @@ $a->page['htmlhead'] .= sprintf('', $diabook_ve //change css on network and profilepages $cssFile = null; +$close_pages = false; +$site_close_pages = get_config("diabook", "close_pages" ); +if (local_user()) {$close_pages = get_pconfig(local_user(), "diabook", "close_pages");} +if ($close_pages===false) $close_pages=$site_close_pages; +if ($close_pages===false) $close_pages="1"; + +$close_profiles = false; +$site_close_profiles = get_config("diabook", "close_profiles" ); +if (local_user()) {$close_profiles = get_pconfig(local_user(), "diabook", "close_profiles");} +if ($close_profiles===false) $close_profiles=$site_close_profiles; +if ($close_profiles===false) $close_profiles="0"; + +$close_helpers = false; +$site_close_helpers = get_config("diabook", "close_helpers" ); +if (local_user()) {$close_helpers = get_pconfig(local_user(), "diabook", "close_helpers");} +if ($close_helpers===false) $close_helpers=$site_close_helpers; +if ($close_helpers===false) $close_helpers="0"; + +$close_services = false; +$site_close_services = get_config("diabook", "close_services" ); +if (local_user()) {$close_services = get_pconfig(local_user(), "diabook", "close_services");} +if ($close_services===false) $close_services=$site_close_services; +if ($close_services===false) $close_services="0"; + +$close_friends = false; +$site_close_friends = get_config("diabook", "close_friends" ); +if (local_user()) {$close_friends = get_pconfig(local_user(), "diabook", "close_friends");} +if ($close_friends===false) $close_friends=$site_close_friends; +if ($close_friends===false) $close_friends="0"; + +$close_lastusers = false; +$site_close_lastusers = get_config("diabook", "close_lastusers" ); +if (local_user()) {$close_lastusers = get_pconfig(local_user(), "diabook", "close_lastusers");} +if ($close_lastusers===false) $close_lastusers=$site_close_lastusers; +if ($close_lastusers===false) $close_lastusers="0"; + +$close_lastphotos = false; +$site_close_lastphotos = get_config("diabook", "close_lastphotos" ); +if (local_user()) {$close_lastphotos = get_pconfig(local_user(), "diabook", "close_lastphotos");} +if ($close_lastphotos===false) $close_lastphotos=$site_close_lastphotos; +if ($close_lastphotos===false) $close_lastphotos="0"; + +$close_lastlikes = false; +$site_close_lastlikes = get_config("diabook", "close_lastlikes" ); +if (local_user()) {$close_lastlikes = get_pconfig(local_user(), "diabook", "close_lastlikes");} +if ($close_lastlikes===false) $close_lastlikes=$site_close_lastlikes; +if ($close_lastlikes===false) $close_lastlikes="0"; + +$close_twitter = false; +$site_close_twitter = get_config("diabook", "close_twitter" ); +if (local_user()) {$close_twitter = get_pconfig(local_user(), "diabook", "close_twitter");} +if ($close_twitter===false) $close_twitter=$site_close_twitter; +if ($close_twitter===false) $close_twitter="1"; + +$close_mapquery = false; +$site_close_mapquery = get_config("diabook", "close_mapquery" ); +if (local_user()) {$close_mapquery = get_pconfig(local_user(), "diabook", "close_mapquery");} +if ($close_mapquery===false) $close_mapquery=$site_close_mapquery; +if ($close_mapquery===false) $close_mapquery="1"; + + $resolution=false; $resolution = get_pconfig(local_user(), "diabook", "resolution"); if ($resolution===false) $resolution="normal"; @@ -77,8 +138,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; } - $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_mapquery'] + $_COOKIE['close_profiles'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; - + $ccCookie = $close_pages + $close_mapquery + $close_profiles + $close_helpers + $close_services + $close_friends + $close_twitter + $close_lastusers + $close_lastphotos + $close_lastlikes; if($ccCookie != "10") { // COMMUNITY diabook_community_info(); @@ -120,14 +180,14 @@ if ($color=="dark") $color_path = "/diabook-dark/"; } //load jquery.twitter.search.js - if($_COOKIE['close_twitter'] != "1") { + if($close_twitter != "1") { $twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js"; $a->page['htmlhead'] .= sprintf('', $twitterJS); } //load jquery.mapquery.js - if($_COOKIE['close_mapquery'] != "1") { + if($close_mapquery != "1") { $mqtmplJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.tmpl.js"; $a->page['htmlhead'] .= sprintf('', $mqtmplJS); $mapqueryJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.core.js"; @@ -146,8 +206,9 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $(function() { $("a.lightbox").fancybox(); // Select all links with lightbox class - $("a.#twittersettings-link").fancybox({onClosed: function() { $("#twittersettings").attr("style","display: none;");}} ); - $("a.#mapcontrol-link").fancybox({onClosed: function() { $("#mapcontrol").attr("style","display: none;");}} ); + $("a#twittersettings-link").fancybox({onClosed: function() { $("#twittersettings").attr("style","display: none;");}} ); + $("a#mapcontrol-link").fancybox({onClosed: function() { $("#mapcontrol").attr("style","display: none;");}} ); + $("a#closeicon").fancybox({onClosed: function() { $("#boxsettings").attr("style","display: none;");}} ); }); $(window).load(function() { @@ -157,7 +218,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; '; //check if mapquerybox is active and print - if($_COOKIE['close_mapquery'] != "1") { + if($close_mapquery != "1") { $ELZoom=false; $ELPosX=false; $ELPosy=false; @@ -193,26 +254,24 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $("#mouseposition").mqMousePosition({ map: "#map2", - x:"lon", - y:"lat", - precision:2 + x:"", + y:"", + precision:4 }); map = $("#map2").mapQuery().data("mapQuery"); - textarea = document.getElementById("mapzoom"); - - + textarea = document.getElementById("id_diabook_ELZoom"); + $("#map2").bind("mousewheel", function(event, delta) { if (delta > 0 || delta < 0){ textarea.value = map.center().zoom; } }); - }; '; } //check if twitterbox is active and print - if($_COOKIE['close_twitter'] != "1") { + if($close_twitter != "1") { $TSearchTerm=false; $site_TSearchTerm = get_config("diabook", "TSearchTerm" ); $TSearchTerm = get_pconfig(local_user(), "diabook", "TSearchTerm"); @@ -261,25 +320,14 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $a->page['htmlhead'] .= ' ';} if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){ $a->page['htmlhead'] .= ' ';} } //end js scripts @@ -410,7 +414,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; function diabook_community_info() { $a = get_app(); // comunity_profiles - if($_COOKIE['close_profiles'] != "1") { + if($close_profiles != "1") { $aside['$comunity_profiles_title'] = t('Community Profiles'); $aside['$comunity_profiles_items'] = array(); $r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id @@ -431,7 +435,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; }} // last 12 users - if($_COOKIE['close_lastusers'] != "1") { + if($close_lastusers != "1") { $aside['$lastusers_title'] = t('Last users'); $aside['$lastusers_items'] = array(); $sql_extra = ""; @@ -460,7 +464,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; }} // last 10 liked items - if($_COOKIE['close_lastlikes'] != "1") { + if($close_lastlikes != "1") { $aside['$like_title'] = t('Last likes'); $aside['$like_items'] = array(); $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM @@ -505,7 +509,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; }} // last 12 photos - if($_COOKIE['close_photos'] != "1") { + if($close_photos != "1") { $aside['$photos_title'] = t('Last photos'); $aside['$photos_items'] = array(); $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM @@ -540,7 +544,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; }} //right_aside FIND FRIENDS - if($_COOKIE['close_friends'] != "1") { + if($close_friends != "1") { if(local_user()) { $nv = array(); $nv['title'] = Array("", t('Find Friends'), "", ""); @@ -561,10 +565,10 @@ if ($color=="dark") $color_path = "/diabook-dark/"; }} //Community_Pages at right_aside - if($_COOKIE['close_pages'] != "1") { + if($close_pages != "1") { if(local_user()) { $page = ' -

'.t("Community Pages").'

+

'.t("Community Pages").'

    '; $pagelist = array(); @@ -597,19 +601,16 @@ if ($color=="dark") $color_path = "/diabook-dark/"; //mapquery - if($_COOKIE['close_mapquery'] != "1") { + if($close_mapquery != "1") { $mapquery = array(); $mapquery['title'] = Array("", "".t('Earth Layers')."", "", ""); $aside['$mapquery'] = $mapquery; $ELZoom = get_pconfig(local_user(), 'diabook', 'ELZoom' ); $ELPosX = get_pconfig(local_user(), 'diabook', 'ELPosX' ); $ELPosY = get_pconfig(local_user(), 'diabook', 'ELPosY' ); - $aside['$sub'] = t('Submit'); $aside['$ELZoom'] = array('diabook_ELZoom', t('Set zoomfactor for Earth Layer'), $ELZoom, '', $ELZoom); $aside['$ELPosX'] = array('diabook_ELPosX', t('Set longitude (X) for Earth Layer'), $ELPosX, '', $ELPosX); $aside['$ELPosY'] = array('diabook_ELPosY', t('Set latitude (Y) for Earth Layer'), $ELPosY, '', $ELPosY); - $baseurl = $a->get_baseurl($ssl_state); - $aside['$baseurl'] = $baseurl; if (isset($_POST['diabook-settings-map-sub']) && $_POST['diabook-settings-map-sub']!=''){ set_pconfig(local_user(), 'diabook', 'ELZoom', $_POST['diabook_ELZoom']); set_pconfig(local_user(), 'diabook', 'ELPosX', $_POST['diabook_ELPosX']); @@ -618,28 +619,27 @@ if ($color=="dark") $color_path = "/diabook-dark/"; } } //end mapquery - + //helpers - if($_COOKIE['close_helpers'] != "1") { + if($close_helpers != "1") { $helpers = array(); $helpers['title'] = Array("", t('Help or @NewHere ?'), "", ""); $aside['$helpers'] = $helpers; } //end helpers //connectable services - if($_COOKIE['close_services'] != "1") { + if($close_services != "1") { $con_services = array(); $con_services['title'] = Array("", t('Connect Services'), "", ""); $aside['$con_services'] = $con_services; } //end connectable services //twitter - if($_COOKIE['close_twitter'] != "1") { + if($close_twitter != "1") { $twitter = array(); $twitter['title'] = Array("", "".t('Last Tweets')."", "", ""); $aside['$twitter'] = $twitter; $TSearchTerm = get_pconfig(local_user(), 'diabook', 'TSearchTerm' ); - $aside['$sub'] = t('Submit'); $aside['$TSearchTerm'] = array('diabook_TSearchTerm', t('Set twitter search term'), $TSearchTerm, '', $TSearchTerm); $baseurl = $a->get_baseurl($ssl_state); $aside['$baseurl'] = $baseurl; @@ -649,7 +649,55 @@ if ($color=="dark") $color_path = "/diabook-dark/"; } } //end twitter - $close = t('Close'); + if($ccCookie != "10") { + $close_pages = get_pconfig(local_user(), 'diabook', 'close_pages' ); + $close_mapquery = get_pconfig(local_user(), 'diabook', 'close_mapquery' ); + $close_profiles = get_pconfig(local_user(), 'diabook', 'close_profiles' ); + $close_helpers = get_pconfig(local_user(), 'diabook', 'close_helpers' ); + $close_services = get_pconfig(local_user(), 'diabook', 'close_services' ); + $close_friends = get_pconfig(local_user(), 'diabook', 'close_friends' ); + $close_twitter = get_pconfig(local_user(), 'diabook', 'close_twitter' ); + $close_lastusers = get_pconfig(local_user(), 'diabook', 'close_lastusers' ); + $close_lastphotos = get_pconfig(local_user(), 'diabook', 'close_lastphotos' ); + $close_lastlikes = get_pconfig(local_user(), 'diabook', 'close_lastlikes' ); + $close_pagesC = array('1'=>'hide', '0'=>'show',); + $close_mapqueryC = array('1'=>'hide', '0'=>'show',); + $close_profilesC = array('0'=>'show', '1'=>'hide',); + $close_helpersC = array('0'=>'show', '1'=>'hide',); + $close_servicesC = array('0'=>'show', '1'=>'hide',); + $close_friendsC = array('0'=>'show', '1'=>'hide',); + $close_twitterC = array('1'=>'hide', '0'=>'show',); + $close_lastusersC = array('0'=>'show', '1'=>'hide',); + $close_lastphotosC = array('0'=>'show','1'=>'hide',); + $close_lastlikesC = array('0'=>'show', '1'=>'hide',); + $aside['$close_pages'] = array('diabook_close_pages', t('Show "Cummunity Pages" at right-hand coloumn?'), $close_pages, '', $close_pagesC); + $aside['$close_mapquery'] = array('diabook_close_mapquery', t('Show "Earth Layers" at right-hand coloumn?'), $close_mapquery, '', $close_mapqueryC); + $aside['$close_profiles'] = array('diabook_close_profiles', t('Show "Cummunity Profiles" at right-hand coloumn?'), $close_profiles, '', $close_profilesC); + $aside['$close_helpers'] = array('diabook_close_helpers', t('Show "Help or @NewHere" at right-hand coloumn?'), $close_helpers, '', $close_helpersC); + $aside['$close_services'] = array('diabook_close_services', t('Show "Connect Services" at right-hand coloumn?'), $close_services, '', $close_servicesC); + $aside['$close_friends'] = array('diabook_close_friends', t('Show "Find Friends" at right-hand coloumn?'), $close_friends, '', $close_friendsC); + $aside['$close_twitter'] = array('diabook_close_twitter', t('Show "Last Tweets" at right-hand coloumn?'), $close_twitter, '', $close_twitterC); + $aside['$close_lastusers'] = array('diabook_close_lastusers', t('Show "Last Users" at right-hand coloumn?'), $close_lastusers, '', $close_lastusersC); + $aside['$close_lastphotos'] = array('diabook_close_lastphotos', t('Show "Last Photos" at right-hand coloumn?'), $close_lastphotos, '', $close_lastphotosC); + $aside['$close_lastlikes'] = array('diabook_close_lastlikes', t('Show "Last Likes" at right-hand coloumn?'), $close_lastlikes, '', $close_lastlikesC); + $aside['$sub'] = t('Submit'); + $baseurl = $a->get_baseurl($ssl_state); + $aside['$baseurl'] = $baseurl; + if (isset($_POST['diabook-settings-box-sub']) && $_POST['diabook-settings-box-sub']!=''){ + set_pconfig(local_user(), 'diabook', 'close_pages', $_POST['diabook_close_pages']); + set_pconfig(local_user(), 'diabook', 'close_mapquery', $_POST['diabook_close_mapquery']); + set_pconfig(local_user(), 'diabook', 'close_profiles', $_POST['diabook_close_profiles']); + set_pconfig(local_user(), 'diabook', 'close_helpers', $_POST['diabook_close_helpers']); + set_pconfig(local_user(), 'diabook', 'close_services', $_POST['diabook_close_services']); + set_pconfig(local_user(), 'diabook', 'close_friends', $_POST['diabook_close_friends']); + set_pconfig(local_user(), 'diabook', 'close_twitter', $_POST['diabook_close_twitter']); + set_pconfig(local_user(), 'diabook', 'close_lastusers', $_POST['diabook_close_lastusers']); + set_pconfig(local_user(), 'diabook', 'close_lastphotos', $_POST['diabook_close_lastphotos']); + set_pconfig(local_user(), 'diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']); + header("Location: network"); + } + } + $close = t('Settings'); $aside['$close'] = $close; //get_baseurl $url = $a->get_baseurl($ssl_state); diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl index 27122857c8..68b22a1685 100644 --- a/view/theme/diabook/theme_settings.tpl +++ b/view/theme/diabook/theme_settings.tpl @@ -14,11 +14,26 @@ {{inc field_input.tpl with $field=$ELZoom}}{{endinc}} -
    -Restore right-hand column +
    +
    +{{inc field_select.tpl with $field=$close_pages}}{{endinc}} +{{inc field_select.tpl with $field=$close_profiles}}{{endinc}} +{{inc field_select.tpl with $field=$close_helpers}}{{endinc}} +{{inc field_select.tpl with $field=$close_services}}{{endinc}} +{{inc field_select.tpl with $field=$close_friends}}{{endinc}} +{{inc field_select.tpl with $field=$close_lastusers}}{{endinc}} +{{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}} +{{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}} +{{inc field_select.tpl with $field=$close_twitter}}{{endinc}} +{{inc field_select.tpl with $field=$close_mapquery}}{{endinc}} +
    +
    +Restore order at right-hand column +
    +