Merge https://github.com/friendica/friendica into pull

1 files changed, 306 insertions, 385 deletions

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 07fef7d7c..758fb5d91 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +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: 1.024)
+ * Version: (Version: 1.025)
  * Author: 
  */
 
+$a = get_app();
+$a->theme_info = array(
+    'family' => 'diabook',
+	'version' => '1.025'
+);
 
+function diabook_init(&$a) {
+	
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.024)";
+$diabook_version = "Diabook (Version: 1.025)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -19,6 +26,14 @@ $resolution=false;
 $resolution = get_pconfig(local_user(), "diabook", "resolution");
 if ($resolution===false) $resolution="normal";
 
+//Add META viewport tag respecting the resolution to header for tablets
+if ($resolution=="wide") {
+  $a->page['htmlhead'] .= '<meta name="viewport" content="width=1200" />';
+} else {
+  $a->page['htmlhead'] .= '<meta name="viewport" content="width=980" />';
+}
+
+
 $color = false;
 $site_color = get_config("diabook", "color" );
 if (local_user()) {$color = get_pconfig(local_user(), "diabook", "color");}
@@ -34,17 +49,272 @@ if ($color=="green") $color_path = "/diabook-green/";
 if ($color=="dark") $color_path = "/diabook-dark/";
 
 
-/**
- * prints last community activity
- */
+	//profile_side at networkpages
+	if ($a->argv[0] === "network" && local_user()){
+
+	// USER MENU
+	if(local_user()) {
+		
+		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
+				
+		$userinfo = array(
+					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
+					'name' => $a->user['username'],
+				);	
+		$ps = array('usermenu'=>array());
+		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
+		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
+		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));				
+		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
+		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
+		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
+		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
+		$ps['usermenu']['pgroups'] = Array('http://dir.friendica.com/directory/forum', t('Community Pages'), "", "");
+
+		$tpl = get_markup_template('profile_side.tpl');
+
+		$a->page['aside'] = replace_macros($tpl, array(
+				'$userinfo' => $userinfo,
+				'$ps' => $ps,
+			)).$a->page['aside'];
+
+	}
+	
+	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_profiles'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+	
+	if($ccCookie != "9") {
+	// COMMUNITY
+	diabook_community_info();
+
+	// CUSTOM 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";}
+	}
+	}
+
+
+
+	//right_aside at profile pages
+	if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
+	if($ccCookie != "9") {
+	// COMMUNITY
+	diabook_community_info();
+	
+	// CUSTOM 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";}
+	
+	}
+	}
+	
+	//js scripts
+	//load jquery.cookie.js
+	$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
+	$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script>', $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('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
+	
+	//load jquery.twitter.search.js
+	if($_COOKIE['close_twitter'] != "1") {
+	$twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js";
+	$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $twitterJS);
+	}
+	
+	$a->page['htmlhead'] .= '
+	<script>
+	
+	 $(function() {
+		$("a.lightbox").fancybox(); // Select all links with lightbox class
+	 	});
+	   
+	 $(window).load(function() {
+		var footer_top = $(document).height() - 30;
+		$("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;");
+	 });
+	</script>';
+	
+	//check if twitterbox is active and print
+	if($_COOKIE['close_twitter'] != "1") {
+		$a->page['htmlhead'] .= '
+		<script>
+		$(function() {
+		$("#twitter").twitterSearch({    	    
+		term: "friendica",
+		animInSpeed: 250,
+		bird:    false, 
+		avatar:  false, 
+		colorExterior: "#fff",
+		title: "Last Tweets",
+		timeout: 10000    	});
+		});
+		</script>';}
+			
+	//check if community_home-plugin is activated and change css
+	$nametocheck = "communityhome";
+	$r = q("select id from addon where name = '%s' and installed = 1", dbesc($nametocheck));
+	if(count($r) == "1") {
+	
+	$a->page['htmlhead'] .= '
+	<script>
+	$(document).ready(function() {
+	$("div#login-submit-wrapper").attr("style","padding-top: 120px;");
+	});
+	</script>';	
+	}
+	//comment-edit-wrapper on photo_view
+	if ($a->argv[0].$a->argv[2] === "photos"."image"){
+	$a->page['htmlhead'] .= '
+	<script>
+		$(function(){
+		$(".comment-edit-form").css("display","table");
+			});
+    </script>';
+	}
+	//restore right hand col at settingspage
+	if($a->argv[0] === "settings" && local_user()) {
+	$a->page['htmlhead'] .= ' 
+	<script>
+	function restore_boxes(){
+	$.cookie("close_pages","2", { expires: 365, path: "/" });
+	$.cookie("close_helpers","2", { expires: 365, path: "/" });
+	$.cookie("close_profiles","2", { expires: 365, path: "/" });
+	$.cookie("close_services","2", { expires: 365, path: "/" });
+	$.cookie("close_friends","2", { expires: 365, path: "/" });
+	$.cookie("close_twitter","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");
+   }
+	</script>';}
+	
+	if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
+	$a->page['htmlhead'] .= '
+	<script>
+
+ 	$(function() {
+	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
+  	});
+	</script>';
+	
+	if($ccCookie != "9") {
+	$a->page['htmlhead'] .= '
+	<script>
+	$("right_aside").ready(function(){
+	
+	if($.cookie("close_pages") == "1") 
+		{
+		document.getElementById( "close_pages" ).style.display = "none";
+			};
+			
+	if($.cookie("close_profiles") == "1") 
+		{
+		document.getElementById( "close_profiles" ).style.display = "none";
+			};
+	
+	if($.cookie("close_helpers") == "1") 
+		{
+		document.getElementById( "close_helpers" ).style.display = "none";
+			};
+			
+	if($.cookie("close_services") == "1") 
+		{
+		document.getElementById( "close_services" ).style.display = "none";
+			};
+			
+	if($.cookie("close_friends") == "1") 
+		{
+		document.getElementById( "close_friends" ).style.display = "none";
+			};
+	
+	if($.cookie("close_twitter") == "1") 
+		{
+		document.getElementById( "twitter" ).style.display = "none";
+			};	
+			
+	if($.cookie("close_lastusers") == "1") 
+		{
+		document.getElementById( "close_lastusers" ).style.display = "none";
+			};
+			
+	if($.cookie("close_lastphotos") == "1") 
+		{
+		document.getElementById( "close_lastphotos" ).style.display = "none";
+			};
+			
+	if($.cookie("close_lastlikes") == "1") 
+		{
+		document.getElementById( "close_lastlikes" ).style.display = "none";
+			};}
 
+	);
 
+	function close_pages(){
+	 document.getElementById( "close_pages" ).style.display = "none";
+ 	$.cookie("close_pages","1", { expires: 365, path: "/" });
+ 	};
  
-function diabook_community_info(){
-	$a = get_app();
+	function close_profiles(){
+ 	document.getElementById( "close_profiles" ).style.display = "none";
+ 	$.cookie("close_profiles","1", { expires: 365, path: "/" });
+ 	};
+ 
+	function close_helpers(){
+ 	document.getElementById( "close_helpers" ).style.display = "none";
+  	$.cookie("close_helpers","1", { expires: 365, path: "/" });
+ 	};
+
+	function close_services(){
+ 	document.getElementById( "close_services" ).style.display = "none";
+ 	$.cookie("close_services","1", { expires: 365, path: "/" });
+ 	};
+ 
+	function close_friends(){
+	 document.getElementById( "close_friends" ).style.display = "none";
+	 $.cookie("close_friends","1", { expires: 365, path: "/" });
+	 };
+ 
+	function close_twitter(){
+ 	document.getElementById( "twitter" ).style.display = "none";
+	 $.cookie("close_twitter","1", { expires: 365, path: "/" });
+ 	};
+ 
+	function close_lastusers(){
+	 document.getElementById( "close_lastusers" ).style.display = "none";
+ 	$.cookie("close_lastusers","1", { expires: 365, path: "/" });
+	 };
+
+	function close_lastphotos(){
+ 	document.getElementById( "close_lastphotos" ).style.display = "none";
+	 $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
+	 };
+ 
+	function close_lastlikes(){
+	 document.getElementById( "close_lastlikes" ).style.display = "none";
+	 $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
+	 };
+	</script>';}
+	}
+	//end js scripts
+
+	// custom css
+	if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
+
+	//footer
+	$tpl = get_markup_template('footer.tpl');
+	$a->page['footer'] .= replace_macros($tpl, array());
+	
+	//
+	js_in_foot();
+}
 
 
+ function diabook_community_info() {
+	$a = get_app();
 	// comunity_profiles
+	if($_COOKIE['close_profiles'] != "1") {
 	$aside['$comunity_profilest_title'] = t('Community Profiles');
 	$aside['$comunity_profiles_items'] = array();
 	$r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id 
@@ -62,9 +332,10 @@ function diabook_community_info(){
 			));
 			$aside['$comunity_profiles_items'][] = $entry;
 		}
-	}
-
+	}}
+	
 	// last 12 users
+	if($_COOKIE['close_lastusers'] != "1") {
 	$aside['$lastusers_title'] = t('Last users');
 	$aside['$lastusers_items'] = array();
 	$sql_extra = "";
@@ -90,10 +361,10 @@ function diabook_community_info(){
 			));
 			$aside['$lastusers_items'][] = $entry;
 		}
-	}
-	
+	}}
 	
 	// last 10 liked items
+	if($_COOKIE['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 
@@ -135,10 +406,10 @@ function diabook_community_info(){
 
 		$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
 		
-	}
-	
+	}}
 	
 	// last 12 photos
+	if($_COOKIE['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 
@@ -170,10 +441,10 @@ function diabook_community_info(){
 
 			$aside['$photos_items'][] = $entry;
 		}
-	}
+	}}
 	
-   
    //right_aside FIND FRIENDS
+   if($_COOKIE['close_friends'] != "1") {
 	if(local_user()) {
 	$nv = array();
 	$nv['title'] = Array("", t('Find Friends'), "", "");
@@ -191,9 +462,10 @@ function diabook_community_info(){
 						<span class="sbox_r" id="srch_clear"></span>';
 	
 	$aside['$nv'] = $nv;
-	};
+	}}
    
-   //Community Page
+   //Community_Pages at right_aside
+   if($_COOKIE['close_pages'] != "1") {
    if(local_user()) {
    $page = '<div id="" >
 			<h3 style="margin-top:0px;">'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
@@ -223,402 +495,51 @@ function diabook_community_info(){
 	}
 	$page .= '</ul></div></div>';
 	//if (sizeof($contacts) > 0)
-		
 		$aside['$page'] = $page;	
-	}
+	}}
   //END Community Page	
+  
   //helpers
+  if($_COOKIE['close_helpers'] != "1") {
    $helpers = array();
 	$helpers['title'] = Array("", t('Help or @NewHere ?'), "", "");
-	
 	$aside['$helpers'] = $helpers;
+	}
    //end helpers
    //connectable services
+   if($_COOKIE['close_services'] != "1") {
    $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;
-
+	//print right_aside
 	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
 	$a->page['right_aside'] = replace_macros($tpl, $aside);
 	
-	
-	
-	
-}
+ }
 
+ function js_in_foot() {
+	/** @purpose insert stuff in bottom of page
+	 */
+	$a = get_app();
+	$baseurl = $a->get_baseurl($ssl_state);
+	$bottom['$baseurl'] = $baseurl;
+	$tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
+	$a->page['footer'] = $a->page['footer'].replace_macros($tpl, $bottom);
+ }
 
-//profile_side at networkpages
-if ($a->argv[0] === "network" && local_user()){
-
-	// USER MENU
-	if(local_user()) {
-		
-		$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
-				
-		$userinfo = array(
-					'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"),
-					'name' => $a->user['username'],
-				);	
-		$ps = array('usermenu'=>array());
-		$ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
-		$ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page'));
-		$ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts'));				
-		$ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
-		$ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events'));
-		$ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-		$ps['usermenu']['community'] = Array('community/', t('Community'), "", "");
-		$ps['usermenu']['pgroups'] = Array('http://dir.friendica.com/directory/forum', t('Community Pages'), "", "");
-
-		$tpl = get_markup_template('profile_side.tpl');
-
-		$a->page['aside'] .= replace_macros($tpl, array(
-				'$userinfo' => $userinfo,
-				'$ps' => $ps,
-			));
-
-	}
-	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_profiles'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_twitter'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
-	
-	if($ccCookie != "9") {
-	// COMMUNITY
-	diabook_community_info();
-
-	// CUSTOM 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";}
-	}
-}
-
-
-
-//right_aside at profile pages
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "9") {
-	// COMMUNITY
-	diabook_community_info();
-	
-	// CUSTOM 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";}
-	
-	}
-}
-
-// custom css
-if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
-
-//footer
-$tpl = get_markup_template('footer.tpl');
-$a->page['footer'] .= replace_macros($tpl, array());
-
-//load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script>', $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('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
-
-//load jquery.autogrow-textarea.js
-$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.autogrow.textarea.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
 
-//load jquery.twitter.search.js
-$twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $twitterJS);
 
-//js scripts
 
-//check if community_home-plugin is activated and change css
-$nametocheck = "communityhome";
-$r = q("select id from addon where name = '%s' and installed = 1", dbesc($nametocheck));
-if(count($r) == "1") {
-	
-$a->page['htmlhead'] .= '
-<script>
-$(document).ready(function() {
-	$("div#login-submit-wrapper").attr("style","padding-top: 120px;");
-	});
-</script>';	
-}
 
-//comment-edit-wrapper on photo_view
-if ($a->argv[0].$a->argv[2] === "photos"."image"){
 
-$a->page['htmlhead'] .= '
-<script>
-	$(function(){
-	
-		$(".comment-edit-form").css("display","table");
-			
-			});
-    </script>';
-}
 
-$a->page['htmlhead'] .= '
-
-<script>
-
- $(function() {
-	$("a.lightbox").fancybox(); // Select all links with lightbox class
-	$("#twitter").twitterSearch({    	    
-	term: "friendica",
-	animInSpeed: 250,
-	bird:    false, 
-	avatar:  false, 
-	colorExterior: "#fff",
-	title: "Last Tweets",
-	timeout: 10000    	});
- });
-   
-$(window).load(function() {
-	var footer_top = $(document).height() - 30;
-	$("div#footerbox").attr("style", "border-top: 1px solid #D2D2D2; width: 70%;right: 15%;position: absolute;top:"+footer_top+"px;");
- });
- </script>';
  
  
-$a->page['htmlhead'] .= '
 
-<script type="text/javascript">
-
-function tautogrow(id){
-		$("textarea#comment-edit-text-" +id).autogrow(); 	
- 	};
- </script>';
- 
  
-$a->page['htmlhead'] .= '
- <script>
  
-$(document).ready(function() {
-    $("iframe").each(function(){
-        var ifr_source = $(this).attr("src");
-        var wmode = "wmode=transparent";
-        if(ifr_source.indexOf("?") != -1) {
-            var getQString = ifr_source.split("?");
-            var oldString = getQString[1];
-            var newString = getQString[0];
-            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
-        }
-        else $(this).attr("src",ifr_source+"?"+wmode);
-       
-    });
-      
-});
-
-function yt_iframe() {
-
-	$("iframe").load(function() { 
-	var ifr_src = $(this).contents().find("body iframe").attr("src");
-	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
-    });
-
-	};
-
-function scrolldown(){
-			$("html, body").animate({scrollTop:$(document).height()}, "slow");
-			return false;
-		};
-		
-function scrolltop(){
-			$("html, body").animate({scrollTop:0}, "slow");
-			return false;
-		};
-	 	
-$(window).scroll(function () { 
-		
-				
-		var scrollInfo = $(window).scrollTop();      
-		
-		if (scrollInfo <= "900"){
-      $("a#top").attr("id","down");
-      $("a#down").attr("onclick","scrolldown()");
-	 	$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png");
-	 	} 
-	 	    
-      if (scrollInfo > "900"){
-      $("a#down").attr("id","top");
-      $("a#top").attr("onclick","scrolltop()");
-	 	$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png");
-	 	}
-		
-    });
-  
- </script>';
- 
-if($a->argv[0] === "settings" && local_user()) {
-$a->page['htmlhead'] .= ' 
-<script>
-function restore_boxes(){
-	$.cookie("close_pages","2", { expires: 365, path: "/" });
-	$.cookie("close_helpers","2", { expires: 365, path: "/" });
-	$.cookie("close_profiles","2", { expires: 365, path: "/" });
-	$.cookie("close_services","2", { expires: 365, path: "/" });
-	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_twitter","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");
-  }
-</script>';}
-
-
-
-if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
-$a->page['htmlhead'] .= '
-<script>
-
- $(function() {
-	$(".oembed.photo img").aeImageResize({height: 400, width: 400});
-  });
-</script>';
-
-
-	if($ccCookie != "9") {
-$a->page['htmlhead'] .= '
-<script>
-$("right_aside").ready(function(){
-	
-	if($.cookie("close_pages") == "1") 
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-			
-	if($.cookie("close_profiles") == "1") 
-		{
-		document.getElementById( "close_profiles" ).style.display = "none";
-			};
-	
-	if($.cookie("close_helpers") == "1") 
-		{
-		document.getElementById( "close_helpers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_services") == "1") 
-		{
-		document.getElementById( "close_services" ).style.display = "none";
-			};
-			
-	if($.cookie("close_friends") == "1") 
-		{
-		document.getElementById( "close_friends" ).style.display = "none";
-			};
-	
-	if($.cookie("close_twitter") == "1") 
-		{
-		document.getElementById( "twitter" ).style.display = "none";
-			};	
-			
-	if($.cookie("close_lastusers") == "1") 
-		{
-		document.getElementById( "close_lastusers" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastphotos") == "1") 
-		{
-		document.getElementById( "close_lastphotos" ).style.display = "none";
-			};
-			
-	if($.cookie("close_lastlikes") == "1") 
-		{
-		document.getElementById( "close_lastlikes" ).style.display = "none";
-			};}
-
-);
-
-function close_pages(){
- document.getElementById( "close_pages" ).style.display = "none";
- $.cookie("close_pages","1", { expires: 365, path: "/" });
- };
- 
-function close_profiles(){
- document.getElementById( "close_profiles" ).style.display = "none";
- $.cookie("close_profiles","1", { expires: 365, path: "/" });
- };
- 
-function close_helpers(){
- document.getElementById( "close_helpers" ).style.display = "none";
-  $.cookie("close_helpers","1", { expires: 365, path: "/" });
- };
-
-function close_services(){
- document.getElementById( "close_services" ).style.display = "none";
- $.cookie("close_services","1", { expires: 365, path: "/" });
- };
- 
-function close_friends(){
- document.getElementById( "close_friends" ).style.display = "none";
- $.cookie("close_friends","1", { expires: 365, path: "/" });
- };
- 
-function close_twitter(){
- document.getElementById( "twitter" ).style.display = "none";
- $.cookie("close_twitter","1", { expires: 365, path: "/" });
- };
- 
-function close_lastusers(){
- document.getElementById( "close_lastusers" ).style.display = "none";
- $.cookie("close_lastusers","1", { expires: 365, path: "/" });
- };
-
-function close_lastphotos(){
- document.getElementById( "close_lastphotos" ).style.display = "none";
- $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
- };
- 
-function close_lastlikes(){
- document.getElementById( "close_lastlikes" ).style.display = "none";
- $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
- };
-</script>';}}
-
-$a->page['htmlhead'] .= ' 
-
-<script>
-function insertFormatting(comment,BBcode,id) {
-	
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == comment) {
-			tmpStr = "";
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-								}
-
-	textarea = document.getElementById("comment-edit-text-" +id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url"){
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-			} else			
-		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url"){
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-			} else
-		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-	}
-	return true;
-}
-
-function cmtBbOpen(id) {
-	$(".comment-edit-bb-" + id).show();
-}
-function cmtBbClose(id) {
-	$(".comment-edit-bb-" + id).hide();
-}
-
-</script> ';
\ No newline at end of file