All line endings are now Unix-style.

git-svn-id: https://code.elgg.org/elgg/trunk@3451 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 445 insertions, 445 deletions

diff --git a/views/default/js/friendsPickerv1.php b/views/default/js/friendsPickerv1.php
index d399b35da..32b495938 100644
--- a/views/default/js/friendsPickerv1.php
+++ b/views/default/js/friendsPickerv1.php
@@ -1,93 +1,93 @@
-/*

-	elgg friendsPicker plugin

-	adapted from Niall Doherty's excellent Coda-Slider - http://www.ndoherty.com/coda-slider

-*/

-

-

-jQuery.fn.friendsPicker = function(iterator) {

-

-	var settings; 

-	settings = $.extend({ easeFunc: "easeOutExpo", easeTime: 1000, toolTip: false }, settings);

-	

-	return this.each(function() {

-	

-		var container = $(this);

-		container.addClass("friendsPicker");

-		// set panelwidth manually as it's hidden initially - adjust this value for different themes/pagewidths 

-		var panelWidth = 678;

-

-		// count the panels in the container

-		var panelCount = container.find("div.panel").size();

-		// calculate the width of all the panels lined up end-to-end

-		var friendsPicker_containerWidth = panelWidth*panelCount;

-		// specify width for the friendsPicker_container

-		container.find("div.friendsPicker_container").css("width" , friendsPicker_containerWidth);

-		

-		// global variables for container.each function below

-		var friendsPickerNavigationWidth = 0;

-		var currentPanel = 1;

-		

-		// generate appropriate nav for each container

-		container.each(function(i) {

-			// generate Left and Right arrows

-			$(this).before("<div class='friendsPickerNavigationL' id='friendsPickerNavigationL" + iterator + "'><a href='#'>Left</a><\/div>");

-			$(this).after("<div class='friendsPickerNavigationR' id='friendsPickerNavigationR" + iterator + "'><a href='#'>Right</a><\/div>");

-			

-			// generate a-z tabs

-			$(this).before("<div class='friendsPickerNavigation' id='friendsPickerNavigation" + iterator + "'><ul><\/ul><\/div>");

-			$(this).find("div.panel").each(function(individualTabItemNumber) {

-				$("div#friendsPickerNavigation" + iterator + " ul").append("<li class='tab" + (individualTabItemNumber+1) + "'><a href='#" + (individualTabItemNumber+1) + "'>" + $(this).attr("title") + "<\/a><\/li>");		

-			});

-			

-			// tabs navigation

-			$("div#friendsPickerNavigation" + iterator + " a").each(function(individualTabItemNumber) {

-				// calc friendsPickerNavigationWidth by summing width of each li

-				friendsPickerNavigationWidth += $(this).parent().width();

-				// set-up individual tab clicks

-				$(this).bind("click", function() {

-					$(this).addClass("current").parent().parent().find("a").not($(this)).removeClass("current"); 

-					var distanceToMoveFriendsPicker_container = - (panelWidth*individualTabItemNumber);

-					currentPanel = individualTabItemNumber + 1;

-					$(this).parent().parent().parent().next().find("div.friendsPicker_container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);

-				});

-			});

-			

-			// Right arow click function

-			$("div#friendsPickerNavigationR" + iterator + " a").click(function() {

-				if (currentPanel == panelCount) {

-					var distanceToMoveFriendsPicker_container = 0;

-					currentPanel = 1; 

-					$(this).parent().parent().find("div.friendsPickerNavigation a.current").removeClass("current").parent().parent().find("a:eq(0)").addClass("current");

-				} else {

-					var distanceToMoveFriendsPicker_container = - (panelWidth*currentPanel);

-					currentPanel += 1;

-					$(this).parent().parent().find("div.friendsPickerNavigation a.current").removeClass("current").parent().next().find("a").addClass("current");

-				};

-				$(this).parent().parent().find("div.friendsPicker_container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);

-				return false;

-			});

-			

-			// Left arrow click function

-			$("div#friendsPickerNavigationL" + iterator + " a").click(function() {

-				if (currentPanel == 1) {

-					var distanceToMoveFriendsPicker_container = - (panelWidth*(panelCount - 1));

-					currentPanel = panelCount;

-					$(this).parent().parent().find("div.friendsPickerNavigation a.current").removeClass("current").parent().parent().find("li:last a").addClass("current");

-				} else {

-					currentPanel -= 1;

-					var distanceToMoveFriendsPicker_container = - (panelWidth*(currentPanel - 1));

-					$(this).parent().parent().find("div.friendsPickerNavigation a.current").removeClass("current").parent().prev().find("a").addClass("current");

-				};

-				$(this).parent().parent().find("div.friendsPicker_container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);

-				return false;

-			});

-						

-				// apply 'current' class to currently selected tab link

-				$("div#friendsPickerNavigation" + iterator + " a:eq(0)").addClass("current");

-		});

-

-		$("div#friendsPickerNavigation" + iterator).append("<br />");		

-  });

-};

-

-

+/*
+	elgg friendsPicker plugin
+	adapted from Niall Doherty's excellent Coda-Slider - http://www.ndoherty.com/coda-slider
+*/
+
+
+jQuery.fn.friendsPicker = function(iterator) {
+
+	var settings; 
+	settings = $.extend({ easeFunc: "easeOutExpo", easeTime: 1000, toolTip: false }, settings);
+	
+	return this.each(function() {
+	
+		var container = $(this);
+		container.addClass("friendsPicker");
+		// set panelwidth manually as it's hidden initially - adjust this value for different themes/pagewidths 
+		var panelWidth = 678;
+
+		// count the panels in the container
+		var panelCount = container.find("div.panel").size();
+		// calculate the width of all the panels lined up end-to-end
+		var friendsPicker_containerWidth = panelWidth*panelCount;
+		// specify width for the friendsPicker_container
+		container.find("div.friendsPicker_container").css("width" , friendsPicker_containerWidth);
+		
+		// global variables for container.each function below
+		var friendsPickerNavigationWidth = 0;
+		var currentPanel = 1;
+		
+		// generate appropriate nav for each container
+		container.each(function(i) {
+			// generate Left and Right arrows
+			$(this).before("<div class='friendsPickerNavigationL' id='friendsPickerNavigationL" + iterator + "'><a href='#'>Left</a><\/div>");
+			$(this).after("<div class='friendsPickerNavigationR' id='friendsPickerNavigationR" + iterator + "'><a href='#'>Right</a><\/div>");
+			
+			// generate a-z tabs
+			$(this).before("<div class='friendsPickerNavigation' id='friendsPickerNavigation" + iterator + "'><ul><\/ul><\/div>");
+			$(this).find("div.panel").each(function(individualTabItemNumber) {
+				$("div#friendsPickerNavigation" + iterator + " ul").append("<li class='tab" + (individualTabItemNumber+1) + "'><a href='#" + (individualTabItemNumber+1) + "'>" + $(this).attr("title") + "<\/a><\/li>");		
+			});
+			
+			// tabs navigation
+			$("div#friendsPickerNavigation" + iterator + " a").each(function(individualTabItemNumber) {
+				// calc friendsPickerNavigationWidth by summing width of each li
+				friendsPickerNavigationWidth += $(this).parent().width();
+				// set-up individual tab clicks
+				$(this).bind("click", function() {
+					$(this).addClass("current").parent().parent().find("a").not($(this)).removeClass("current"); 
+					var distanceToMoveFriendsPicker_container = - (panelWidth*individualTabItemNumber);
+					currentPanel = individualTabItemNumber + 1;
+					$(this).parent().parent().parent().next().find("div.friendsPicker_container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
+				});
+			});
+			
+			// Right arow click function
+			$("div#friendsPickerNavigationR" + iterator + " a").click(function() {
+				if (currentPanel == panelCount) {
+					var distanceToMoveFriendsPicker_container = 0;
+					currentPanel = 1; 
+					$(this).parent().parent().find("div.friendsPickerNavigation a.current").removeClass("current").parent().parent().find("a:eq(0)").addClass("current");
+				} else {
+					var distanceToMoveFriendsPicker_container = - (panelWidth*currentPanel);
+					currentPanel += 1;
+					$(this).parent().parent().find("div.friendsPickerNavigation a.current").removeClass("current").parent().next().find("a").addClass("current");
+				};
+				$(this).parent().parent().find("div.friendsPicker_container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
+				return false;
+			});
+			
+			// Left arrow click function
+			$("div#friendsPickerNavigationL" + iterator + " a").click(function() {
+				if (currentPanel == 1) {
+					var distanceToMoveFriendsPicker_container = - (panelWidth*(panelCount - 1));
+					currentPanel = panelCount;
+					$(this).parent().parent().find("div.friendsPickerNavigation a.current").removeClass("current").parent().parent().find("li:last a").addClass("current");
+				} else {
+					currentPanel -= 1;
+					var distanceToMoveFriendsPicker_container = - (panelWidth*(currentPanel - 1));
+					$(this).parent().parent().find("div.friendsPickerNavigation a.current").removeClass("current").parent().prev().find("a").addClass("current");
+				};
+				$(this).parent().parent().find("div.friendsPicker_container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
+				return false;
+			});
+						
+				// apply 'current' class to currently selected tab link
+				$("div#friendsPickerNavigation" + iterator + " a:eq(0)").addClass("current");
+		});
+
+		$("div#friendsPickerNavigation" + iterator).append("<br />");		
+  });
+};
+
+
diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
index cf6389aba..e63cd70ef 100644
--- a/views/default/js/initialise_elgg.php
+++ b/views/default/js/initialise_elgg.php
@@ -1,296 +1,296 @@
-$(document).ready(function () {

-

-	// COLLAPSABLE WIDGETS (on Dashboard & Profile pages)

-	// toggle widget box contents

-	$('a.toggle_box_contents').bind('click', toggleContent);

-	

-	// toggle widget box edit panel

-	$('a.toggle_box_edit_panel').click(function () {

-		$(this.parentNode.parentNode).children(".collapsable_box_editpanel").slideToggle("fast");

-		return false;

-	});

-	

-	// toggle customise edit panel

-	$('a.toggle_customise_edit_panel').click(function () {

-		$('div#customise_editpanel').slideToggle("fast");

-		return false;

-	}); 

-	

-	// toggle plugin's settings nad more info on admin tools admin

-	$('a.pluginsettings_link').click(function () {

-		$(this.parentNode.parentNode).children(".pluginsettings").slideToggle("fast");

-		return false;

-	});

-	$('a.manifest_details').click(function () {

-		$(this.parentNode.parentNode).children(".manifest_file").slideToggle("fast");

-		return false;

-	});

-	// reusable generic hidden panel

-	$('a.collapsibleboxlink').click(function () {

-		$(this.parentNode.parentNode).children(".collapsible_box").slideToggle("fast");

-		return false;

-	});

-	

-	// WIDGET GALLERY EDIT PANEL

-	// Sortable widgets

-	var els = ['#leftcolumn_widgets', '#middlecolumn_widgets', '#rightcolumn_widgets', '#widget_picker_gallery' ];

-	var $els = $(els.toString());

-	

-	$els.sortable({

-		items: '.draggable_widget',

-		handle: '.drag_handle',

-		forcePlaceholderSize: true,

-		placeholder: 'ui-state-highlight',

-		cursor: 'move',

-		revert: true,

-		opacity: 0.9,

-		appendTo: 'body',

-		connectWith: els,

-		start:function(e,ui) {

-	

-		},

-		stop: function(e,ui) {	

-			// refresh list before updating hidden fields with new widget order		

-			$(this).sortable( "refresh" );

-			

-			var widgetNamesLeft = outputWidgetList('#leftcolumn_widgets');

-			var widgetNamesMiddle = outputWidgetList('#middlecolumn_widgets');

-			var widgetNamesRight = outputWidgetList('#rightcolumn_widgets');

-			

-			document.getElementById('debugField1').value = widgetNamesLeft;

-			document.getElementById('debugField2').value = widgetNamesMiddle;

-			document.getElementById('debugField3').value = widgetNamesRight;

-		}

-	});

-	

-	// bind more info buttons - called when new widgets are created

-	widget_moreinfo();

-	

-	// set-up hover class for dragged widgets

-	$("#rightcolumn_widgets").droppable({

-		accept: ".draggable_widget",

-		hoverClass: 'droppable-hover'

-	});

-	$("#middlecolumn_widgets").droppable({

-		accept: ".draggable_widget",

-		hoverClass: 'droppable-hover'

-	});

-	$("#leftcolumn_widgets").droppable({

-		accept: ".draggable_widget",

-		hoverClass: 'droppable-hover'

-	});

-

-}); /* end document ready function */

-

-

-// List active widgets for each page column

-function outputWidgetList(forElement) {

-	return( $("input[name='handler'], input[name='guid']", forElement ).makeDelimitedList("value") );	

-}

-

-// Make delimited list

-jQuery.fn.makeDelimitedList = function(elementAttribute) {

-

-	var delimitedListArray = new Array();

-	var listDelimiter = "::";

-	

-	// Loop over each element in the stack and add the elementAttribute to the array

-	this.each(function(e) {

-			var listElement = $(this);

-			// Add the attribute value to our values array

-			delimitedListArray[delimitedListArray.length] = listElement.attr(elementAttribute);

-		}

-	);

-	

-	// Return value list by joining the array

-	return(delimitedListArray.join(listDelimiter));

-}

-

-

-// Read each widgets collapsed/expanded state from cookie and apply

-function widget_state(forWidget) {

-

-	var thisWidgetState = $.cookie(forWidget);

-

-	if (thisWidgetState == 'collapsed') {

-		forWidget = "#" + forWidget;

-		$(forWidget).find("div.collapsable_box_content").hide();

-		$(forWidget).find("a.toggle_box_contents").html('+');

-		$(forWidget).find("a.toggle_box_edit_panel").fadeOut('medium');

-	};	

-}

-

-

-// Toggle widgets contents and save to a cookie

-var toggleContent = function(e) {

-var targetContent = $('div.collapsable_box_content', this.parentNode.parentNode);

-	if (targetContent.css('display') == 'none') {

-		targetContent.slideDown(400);

-		$(this).html('-');

-		$(this.parentNode).children(".toggle_box_edit_panel").fadeIn('medium');

-		

-		// set cookie for widget panel open-state

-		var thisWidgetName = $(this.parentNode.parentNode.parentNode).attr('id');

-		$.cookie(thisWidgetName, 'expanded', { expires: 365 });

-		

-	} else {

-		targetContent.slideUp(400);

-		$(this).html('+');

-		$(this.parentNode).children(".toggle_box_edit_panel").fadeOut('medium');

-		// make sure edit pane is closed

-		$(this.parentNode.parentNode).children(".collapsable_box_editpanel").hide();

-		

-		// set cookie for widget panel closed-state

-		var thisWidgetName = $(this.parentNode.parentNode.parentNode).attr('id');

-		$.cookie(thisWidgetName, 'collapsed', { expires: 365 });			

-	}

-	return false;

-};

-

-// More info tooltip in widget gallery edit panel

-function widget_moreinfo() {

-

-	$("img.more_info").hover(function(e) {										  

-	var widgetdescription = $("input[name='description']", this.parentNode.parentNode.parentNode ).attr('value');

-	$("body").append("<p id='widget_moreinfo'><b>"+ widgetdescription +" </b></p>");

-	

-		if (e.pageX < 900) {

-			$("#widget_moreinfo")

-				.css("top",(e.pageY + 10) + "px")

-				.css("left",(e.pageX + 10) + "px")

-				.fadeIn("medium");	

-		}	

-		else {

-			$("#widget_moreinfo")

-				.css("top",(e.pageY + 10) + "px")

-				.css("left",(e.pageX - 210) + "px")

-				.fadeIn("medium");		

-		}			

-	},

-	function() {

-		$("#widget_moreinfo").remove();

-	});	

-	

-	$("img.more_info").mousemove(function(e) {

-		// action on mousemove

-	});	

-};

-

-// COOKIES

-jQuery.cookie = function(name, value, options) {

-	if (typeof value != 'undefined') { // name and value given, set cookie

-    options = options || {};

-	    if (value === null) {

-	        value = '';

-	        options.expires = -1;

-	    }

-    var expires = '';

-    if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {

-        var date;

-        if (typeof options.expires == 'number') {

-            date = new Date();

-            date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));

-        } else {

-            date = options.expires;

-        }

-        expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE

-    }

-    // CAUTION: Needed to parenthesize options.path and options.domain

-    // in the following expressions, otherwise they evaluate to undefined

-    // in the packed version for some reason.

-    var path = options.path ? '; path=' + (options.path) : '';

-    var domain = options.domain ? '; domain=' + (options.domain) : '';

-    var secure = options.secure ? '; secure' : '';

-    document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');

-    

-	} else { // only name given, get cookie

-	    var cookieValue = null;

-	    if (document.cookie && document.cookie != '') {

-	        var cookies = document.cookie.split(';');

-	        for (var i = 0; i < cookies.length; i++) {

-	            var cookie = jQuery.trim(cookies[i]);

-	            // Does this cookie string begin with the name we want?

-	            if (cookie.substring(0, name.length + 1) == (name + '=')) {

-	                cookieValue = decodeURIComponent(cookie.substring(name.length + 1));

-	                break;

-	            }

-	        }

-	    }

-	    return cookieValue;

-	}

-};

-

-// ELGG TOOLBAR MENU

-$.fn.elgg_topbardropdownmenu = function(options) {

-    

-  options = $.extend({speed: 350}, options || {});

-  

-  this.each(function() {

-    

-    var root = this, zIndex = 5000;

-    

-    function getSubnav(ele) {

-      if (ele.nodeName.toLowerCase() == 'li') {

-        var subnav = $('> ul', ele);

-        return subnav.length ? subnav[0] : null;

-      } else {

-	      

-        return ele;

-      }

-    }

-    

-    function getActuator(ele) {

-      if (ele.nodeName.toLowerCase() == 'ul') {

-        return $(ele).parents('li')[0];

-      } else {

-        return ele;

-      }

-    }

-    

-    function hide() {

-      var subnav = getSubnav(this);

-      if (!subnav) return;

-      $.data(subnav, 'cancelHide', false);

-      setTimeout(function() {

-        if (!$.data(subnav, 'cancelHide')) {

-          $(subnav).slideUp(100);

-        }

-      }, 250);

-    }

-  

-    function show() {

-      var subnav = getSubnav(this);

-      if (!subnav) return;

-      $.data(subnav, 'cancelHide', true);

-      $(subnav).css({zIndex: zIndex++}).slideDown(options.speed);

-      if (this.nodeName.toLowerCase() == 'ul') {

-        var li = getActuator(this);

-        $(li).addClass('hover');

-        $('> a', li).addClass('hover');

-      }

-    }

-    

-    $('ul, li', this).hover(show, hide);

-    $('li', this).hover(

-      function() { $(this).addClass('hover'); $('> a', this).addClass('hover'); },

-      function() { $(this).removeClass('hover'); $('> a', this).removeClass('hover'); }

-    );

-    

-  });

-  

-};

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

+$(document).ready(function () {
+
+	// COLLAPSABLE WIDGETS (on Dashboard & Profile pages)
+	// toggle widget box contents
+	$('a.toggle_box_contents').bind('click', toggleContent);
+	
+	// toggle widget box edit panel
+	$('a.toggle_box_edit_panel').click(function () {
+		$(this.parentNode.parentNode).children(".collapsable_box_editpanel").slideToggle("fast");
+		return false;
+	});
+	
+	// toggle customise edit panel
+	$('a.toggle_customise_edit_panel').click(function () {
+		$('div#customise_editpanel').slideToggle("fast");
+		return false;
+	}); 
+	
+	// toggle plugin's settings nad more info on admin tools admin
+	$('a.pluginsettings_link').click(function () {
+		$(this.parentNode.parentNode).children(".pluginsettings").slideToggle("fast");
+		return false;
+	});
+	$('a.manifest_details').click(function () {
+		$(this.parentNode.parentNode).children(".manifest_file").slideToggle("fast");
+		return false;
+	});
+	// reusable generic hidden panel
+	$('a.collapsibleboxlink').click(function () {
+		$(this.parentNode.parentNode).children(".collapsible_box").slideToggle("fast");
+		return false;
+	});
+	
+	// WIDGET GALLERY EDIT PANEL
+	// Sortable widgets
+	var els = ['#leftcolumn_widgets', '#middlecolumn_widgets', '#rightcolumn_widgets', '#widget_picker_gallery' ];
+	var $els = $(els.toString());
+	
+	$els.sortable({
+		items: '.draggable_widget',
+		handle: '.drag_handle',
+		forcePlaceholderSize: true,
+		placeholder: 'ui-state-highlight',
+		cursor: 'move',
+		revert: true,
+		opacity: 0.9,
+		appendTo: 'body',
+		connectWith: els,
+		start:function(e,ui) {
+	
+		},
+		stop: function(e,ui) {	
+			// refresh list before updating hidden fields with new widget order		
+			$(this).sortable( "refresh" );
+			
+			var widgetNamesLeft = outputWidgetList('#leftcolumn_widgets');
+			var widgetNamesMiddle = outputWidgetList('#middlecolumn_widgets');
+			var widgetNamesRight = outputWidgetList('#rightcolumn_widgets');
+			
+			document.getElementById('debugField1').value = widgetNamesLeft;
+			document.getElementById('debugField2').value = widgetNamesMiddle;
+			document.getElementById('debugField3').value = widgetNamesRight;
+		}
+	});
+	
+	// bind more info buttons - called when new widgets are created
+	widget_moreinfo();
+	
+	// set-up hover class for dragged widgets
+	$("#rightcolumn_widgets").droppable({
+		accept: ".draggable_widget",
+		hoverClass: 'droppable-hover'
+	});
+	$("#middlecolumn_widgets").droppable({
+		accept: ".draggable_widget",
+		hoverClass: 'droppable-hover'
+	});
+	$("#leftcolumn_widgets").droppable({
+		accept: ".draggable_widget",
+		hoverClass: 'droppable-hover'
+	});
+
+}); /* end document ready function */
+
+
+// List active widgets for each page column
+function outputWidgetList(forElement) {
+	return( $("input[name='handler'], input[name='guid']", forElement ).makeDelimitedList("value") );	
+}
+
+// Make delimited list
+jQuery.fn.makeDelimitedList = function(elementAttribute) {
+
+	var delimitedListArray = new Array();
+	var listDelimiter = "::";
+	
+	// Loop over each element in the stack and add the elementAttribute to the array
+	this.each(function(e) {
+			var listElement = $(this);
+			// Add the attribute value to our values array
+			delimitedListArray[delimitedListArray.length] = listElement.attr(elementAttribute);
+		}
+	);
+	
+	// Return value list by joining the array
+	return(delimitedListArray.join(listDelimiter));
+}
+
+
+// Read each widgets collapsed/expanded state from cookie and apply
+function widget_state(forWidget) {
+
+	var thisWidgetState = $.cookie(forWidget);
+
+	if (thisWidgetState == 'collapsed') {
+		forWidget = "#" + forWidget;
+		$(forWidget).find("div.collapsable_box_content").hide();
+		$(forWidget).find("a.toggle_box_contents").html('+');
+		$(forWidget).find("a.toggle_box_edit_panel").fadeOut('medium');
+	};	
+}
+
+
+// Toggle widgets contents and save to a cookie
+var toggleContent = function(e) {
+var targetContent = $('div.collapsable_box_content', this.parentNode.parentNode);
+	if (targetContent.css('display') == 'none') {
+		targetContent.slideDown(400);
+		$(this).html('-');
+		$(this.parentNode).children(".toggle_box_edit_panel").fadeIn('medium');
+		
+		// set cookie for widget panel open-state
+		var thisWidgetName = $(this.parentNode.parentNode.parentNode).attr('id');
+		$.cookie(thisWidgetName, 'expanded', { expires: 365 });
+		
+	} else {
+		targetContent.slideUp(400);
+		$(this).html('+');
+		$(this.parentNode).children(".toggle_box_edit_panel").fadeOut('medium');
+		// make sure edit pane is closed
+		$(this.parentNode.parentNode).children(".collapsable_box_editpanel").hide();
+		
+		// set cookie for widget panel closed-state
+		var thisWidgetName = $(this.parentNode.parentNode.parentNode).attr('id');
+		$.cookie(thisWidgetName, 'collapsed', { expires: 365 });			
+	}
+	return false;
+};
+
+// More info tooltip in widget gallery edit panel
+function widget_moreinfo() {
+
+	$("img.more_info").hover(function(e) {										  
+	var widgetdescription = $("input[name='description']", this.parentNode.parentNode.parentNode ).attr('value');
+	$("body").append("<p id='widget_moreinfo'><b>"+ widgetdescription +" </b></p>");
+	
+		if (e.pageX < 900) {
+			$("#widget_moreinfo")
+				.css("top",(e.pageY + 10) + "px")
+				.css("left",(e.pageX + 10) + "px")
+				.fadeIn("medium");	
+		}	
+		else {
+			$("#widget_moreinfo")
+				.css("top",(e.pageY + 10) + "px")
+				.css("left",(e.pageX - 210) + "px")
+				.fadeIn("medium");		
+		}			
+	},
+	function() {
+		$("#widget_moreinfo").remove();
+	});	
+	
+	$("img.more_info").mousemove(function(e) {
+		// action on mousemove
+	});	
+};
+
+// COOKIES
+jQuery.cookie = function(name, value, options) {
+	if (typeof value != 'undefined') { // name and value given, set cookie
+    options = options || {};
+	    if (value === null) {
+	        value = '';
+	        options.expires = -1;
+	    }
+    var expires = '';
+    if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
+        var date;
+        if (typeof options.expires == 'number') {
+            date = new Date();
+            date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+        } else {
+            date = options.expires;
+        }
+        expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
+    }
+    // CAUTION: Needed to parenthesize options.path and options.domain
+    // in the following expressions, otherwise they evaluate to undefined
+    // in the packed version for some reason.
+    var path = options.path ? '; path=' + (options.path) : '';
+    var domain = options.domain ? '; domain=' + (options.domain) : '';
+    var secure = options.secure ? '; secure' : '';
+    document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+    
+	} else { // only name given, get cookie
+	    var cookieValue = null;
+	    if (document.cookie && document.cookie != '') {
+	        var cookies = document.cookie.split(';');
+	        for (var i = 0; i < cookies.length; i++) {
+	            var cookie = jQuery.trim(cookies[i]);
+	            // Does this cookie string begin with the name we want?
+	            if (cookie.substring(0, name.length + 1) == (name + '=')) {
+	                cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+	                break;
+	            }
+	        }
+	    }
+	    return cookieValue;
+	}
+};
+
+// ELGG TOOLBAR MENU
+$.fn.elgg_topbardropdownmenu = function(options) {
+    
+  options = $.extend({speed: 350}, options || {});
+  
+  this.each(function() {
+    
+    var root = this, zIndex = 5000;
+    
+    function getSubnav(ele) {
+      if (ele.nodeName.toLowerCase() == 'li') {
+        var subnav = $('> ul', ele);
+        return subnav.length ? subnav[0] : null;
+      } else {
+	      
+        return ele;
+      }
+    }
+    
+    function getActuator(ele) {
+      if (ele.nodeName.toLowerCase() == 'ul') {
+        return $(ele).parents('li')[0];
+      } else {
+        return ele;
+      }
+    }
+    
+    function hide() {
+      var subnav = getSubnav(this);
+      if (!subnav) return;
+      $.data(subnav, 'cancelHide', false);
+      setTimeout(function() {
+        if (!$.data(subnav, 'cancelHide')) {
+          $(subnav).slideUp(100);
+        }
+      }, 250);
+    }
+  
+    function show() {
+      var subnav = getSubnav(this);
+      if (!subnav) return;
+      $.data(subnav, 'cancelHide', true);
+      $(subnav).css({zIndex: zIndex++}).slideDown(options.speed);
+      if (this.nodeName.toLowerCase() == 'ul') {
+        var li = getActuator(this);
+        $(li).addClass('hover');
+        $('> a', li).addClass('hover');
+      }
+    }
+    
+    $('ul, li', this).hover(show, hide);
+    $('li', this).hover(
+      function() { $(this).addClass('hover'); $('> a', this).addClass('hover'); },
+      function() { $(this).removeClass('hover'); $('> a', this).removeClass('hover'); }
+    );
+    
+  });
+  
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/views/default/js/upload_js.php b/views/default/js/upload_js.php
index ab8c0dc20..cdd011729 100644
--- a/views/default/js/upload_js.php
+++ b/views/default/js/upload_js.php
@@ -1,57 +1,57 @@
-<script>

-/*

-Part of multi file uploader

-*/

-

-var number_of_files = 1;

-

-// wait for the DOM to be loaded 

-$(document).ready(function() { 

-	// bind 'file_form' and provide a simple callback function 

-	$('#file_form').submit(function() {

-		$('#form_container').hide();

-		$('#form_message').html('<div class="contentWrapper"><?php echo $vars['submit_message']; ?></div>');

-		$('#form_message').show();

-		$(this).ajaxSubmit(function(response_message) {

-			$('#form_message').html('<div class="contentWrapper">'+response_message+'</div>');

-		}); 

-		

-		return false;

-	});

-});

-

-function file_generate_bit(bit_label,prefix,classname,field_type,field_size) {

-	bit = document.createElement('p');

-    label = document.createElement('label');

-    textnode = document.createTextNode(bit_label);

-    label.appendChild(textnode);

-    el = document.createElement('br');

-    label.appendChild(el);

-    el = document.createElement('input');

-    el.type = field_type;

-    el.className = classname;

-    if (field_size > 0) {

-    	el.size = field_size;

-    }

-    el.name = prefix+number_of_files;

-    el.value = "";

-    label.appendChild(el);

-    bit.appendChild(label);

-    

-    return bit;    

-}

-

-function file_addtoform() {

-    var o,el;

-    o = document.getElementById('option_container');

-    title_label = "<?php echo elgg_echo("title"); ?>";

-    bit = file_generate_bit(title_label,'title_','input-text','text',0);

-    o.appendChild(bit);

-    file_label = "<?php echo elgg_echo("file:file"); ?>";

-    bit = file_generate_bit(file_label,'upload_','input-file','file',30);

-    o.appendChild(bit);

-    

-    number_of_files++;

-    document.file_form.number_of_files.value = number_of_files;

-}

+<script>
+/*
+Part of multi file uploader
+*/
+
+var number_of_files = 1;
+
+// wait for the DOM to be loaded 
+$(document).ready(function() { 
+	// bind 'file_form' and provide a simple callback function 
+	$('#file_form').submit(function() {
+		$('#form_container').hide();
+		$('#form_message').html('<div class="contentWrapper"><?php echo $vars['submit_message']; ?></div>');
+		$('#form_message').show();
+		$(this).ajaxSubmit(function(response_message) {
+			$('#form_message').html('<div class="contentWrapper">'+response_message+'</div>');
+		}); 
+		
+		return false;
+	});
+});
+
+function file_generate_bit(bit_label,prefix,classname,field_type,field_size) {
+	bit = document.createElement('p');
+    label = document.createElement('label');
+    textnode = document.createTextNode(bit_label);
+    label.appendChild(textnode);
+    el = document.createElement('br');
+    label.appendChild(el);
+    el = document.createElement('input');
+    el.type = field_type;
+    el.className = classname;
+    if (field_size > 0) {
+    	el.size = field_size;
+    }
+    el.name = prefix+number_of_files;
+    el.value = "";
+    label.appendChild(el);
+    bit.appendChild(label);
+    
+    return bit;    
+}
+
+function file_addtoform() {
+    var o,el;
+    o = document.getElementById('option_container');
+    title_label = "<?php echo elgg_echo("title"); ?>";
+    bit = file_generate_bit(title_label,'title_','input-text','text',0);
+    o.appendChild(bit);
+    file_label = "<?php echo elgg_echo("file:file"); ?>";
+    bit = file_generate_bit(file_label,'upload_','input-file','file',30);
+    o.appendChild(bit);
+    
+    number_of_files++;
+    document.file_form.number_of_files.value = number_of_files;
+}
 </script>
\ No newline at end of file