Refs #2700 replaced most underscores with hyphens - there may be broken display code due to extent of this change

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

2 files changed, 39 insertions, 39 deletions

diff --git a/views/default/js/friendsPickerv1.php b/views/default/js/friendsPickerv1.php
index 2fa4e373f..e9a387844 100644
--- a/views/default/js/friendsPickerv1.php
+++ b/views/default/js/friendsPickerv1.php
@@ -12,7 +12,7 @@ jQuery.fn.friendsPicker = function(iterator) {
 	return this.each(function() {
 	
 		var container = $(this);
-		container.addClass("friends_picker");
+		container.addClass("friends-picker");
 		// set panelwidth manually as it's hidden initially - adjust this value for different themes/pagewidths 
 		var panelWidth = 730;
 
@@ -21,7 +21,7 @@ jQuery.fn.friendsPicker = function(iterator) {
 		// 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.friends_picker_container").css("width" , friendsPicker_containerWidth);
+		container.find("div.friends-picker-container").css("width" , friendsPicker_containerWidth);
 		
 		// global variables for container.each function below
 		var friendsPickerNavigationWidth = 0;
@@ -30,17 +30,17 @@ jQuery.fn.friendsPicker = function(iterator) {
 		// generate appropriate nav for each container
 		container.each(function(i) {
 			// generate Left and Right arrows
-			$(this).before("<div class='friends_picker_navigation_l' id='friends_picker_navigation_l" + iterator + "'><a href='#'>Left</a><\/div>");
-			$(this).after("<div class='friends_picker_navigation_r' id='friends_picker_navigation_r" + iterator + "'><a href='#'>Right</a><\/div>");
+			$(this).before("<div class='friends-picker-navigation-l' id='friends-picker-navigation-l" + iterator + "'><a href='#'>Left</a><\/div>");
+			$(this).after("<div class='friends-picker-navigation-r' id='friends-picker-navigation-r" + iterator + "'><a href='#'>Right</a><\/div>");
 			
 			// generate a-z tabs
-			$(this).before("<div class='friends_picker_navigation' id='friends_picker_navigation" + iterator + "'><ul><\/ul><\/div>");
+			$(this).before("<div class='friends-picker-navigation' id='friends-picker-navigation" + iterator + "'><ul><\/ul><\/div>");
 			$(this).find("div.panel").each(function(individualTabItemNumber) {
-				$("div#friends_picker_navigation" + iterator + " ul").append("<li class='tab" + (individualTabItemNumber+1) + "'><a href='#" + (individualTabItemNumber+1) + "'>" + $(this).attr("title") + "<\/a><\/li>");		
+				$("div#friends-picker-navigation" + iterator + " ul").append("<li class='tab" + (individualTabItemNumber+1) + "'><a href='#" + (individualTabItemNumber+1) + "'>" + $(this).attr("title") + "<\/a><\/li>");		
 			});
 			
 			// tabs navigation
-			$("div#friends_picker_navigation" + iterator + " a").each(function(individualTabItemNumber) {
+			$("div#friends-picker-navigation" + iterator + " a").each(function(individualTabItemNumber) {
 				// calc friendsPickerNavigationWidth by summing width of each li
 				friendsPickerNavigationWidth += $(this).parent().width();
 				// set-up individual tab clicks
@@ -48,45 +48,45 @@ jQuery.fn.friendsPicker = function(iterator) {
 					$(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.friends_picker_container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
+					$(this).parent().parent().parent().next().find("div.friends-picker-container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
 				});
 			});
 			
 			// Right arow click function
-			$("div#friends_picker_navigation_r" + iterator + " a").click(function() {
+			$("div#friends-picker-navigation-r" + iterator + " a").click(function() {
 				if (currentPanel == panelCount) {
 					var distanceToMoveFriendsPicker_container = 0;
 					currentPanel = 1; 
-					$(this).parent().parent().find("div.friends_picker_navigation a.current").removeClass("current").parent().parent().find("a:eq(0)").addClass("current");
+					$(this).parent().parent().find("div.friends-picker-navigation 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.friends_picker_navigation a.current").removeClass("current").parent().next().find("a").addClass("current");
+					$(this).parent().parent().find("div.friends-picker-navigation a.current").removeClass("current").parent().next().find("a").addClass("current");
 				};
-				$(this).parent().parent().find("div.friends_picker_container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
+				$(this).parent().parent().find("div.friends-picker-container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
 				return false;
 			});
 			
 			// Left arrow click function
-			$("div#friends_picker_navigation_l" + iterator + " a").click(function() {
+			$("div#friends-picker-navigation-l" + iterator + " a").click(function() {
 				if (currentPanel == 1) {
 					var distanceToMoveFriendsPicker_container = - (panelWidth*(panelCount - 1));
 					currentPanel = panelCount;
-					$(this).parent().parent().find("div.friends_picker_navigation a.current").removeClass("current").parent().parent().find("li:last a").addClass("current");
+					$(this).parent().parent().find("div.friends-picker-navigation 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.friends_picker_navigation a.current").removeClass("current").parent().prev().find("a").addClass("current");
+					$(this).parent().parent().find("div.friends-picker-navigation a.current").removeClass("current").parent().prev().find("a").addClass("current");
 				};
-				$(this).parent().parent().find("div.friends_picker_container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
+				$(this).parent().parent().find("div.friends-picker-container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
 				return false;
 			});
 						
 				// apply 'current' class to currently selected tab link
-				$("div#friends_picker_navigation" + iterator + " a:eq(0)").addClass("current");
+				$("div#friends-picker-navigation" + iterator + " a:eq(0)").addClass("current");
 		});
 
-		$("div#friends_picker_navigation" + iterator).append("<br />");		
+		$("div#friends-picker-navigation" + iterator).append("<br />");		
   });
 };
 
diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
index 49c12e30c..5157bb8bc 100644
--- a/views/default/js/initialise_elgg.php
+++ b/views/default/js/initialise_elgg.php
@@ -76,7 +76,7 @@ $(document).ready(function () {
 
 	$els.sortable({
 		items: '.draggable_widget',
-		handle: '.drag_handle',
+		handle: '.drag-handle',
 		forcePlaceholderSize: true,
 		placeholder: 'ui-state-highlight',
 		cursor: 'move',
@@ -119,47 +119,47 @@ $(document).ready(function () {
 	});
 
 	// user likes
-	$(".likes_list_button").click(function(event) {
-		if ($(this).next(".likes_list").css('display') == 'none') {	// show list
+	$(".likes-list_button").click(function(event) {
+		if ($(this).next(".likes-list").css('display') == 'none') {	// show list
 			// hide any other currently viewable likes lists
-			$('.likes_list').fadeOut();
+			$('.likes-list').fadeOut();
 
-			var topPosition = - $(this).next(".likes_list").height();
+			var topPosition = - $(this).next(".likes-list").height();
 			topPosition10 = topPosition + 10 + "px";
 			topPosition = topPosition - 5 + "px";
-			$('.likes_list').css('top',topPosition10);
-			$('.likes_list').css('left', -$('.likes_list').width()+110);
-			$(this).next(".likes_list").animate({opacity: "toggle", top: topPosition}, 500);
+			$('.likes-list').css('top',topPosition10);
+			$('.likes-list').css('left', -$('.likes-list').width()+110);
+			$(this).next(".likes-list").animate({opacity: "toggle", top: topPosition}, 500);
 
 			// set up cancel for a click outside the likes list
 			$(document).click(function(event) {
 					var target = $(event.target);
-					if (target.parents(".likes_list_holder").length == 0) {
-						$(".likes_list").fadeOut();
+					if (target.parents(".likes-list-holder").length == 0) {
+						$(".likes-list").fadeOut();
 					}
 			});
 
 		} else { // hide list
-			var topPosition = - $(this).next(".likes_list").height() + 5;
-			$(this).next(".likes_list").animate({opacity: "toggle", top: topPosition}, 500);
+			var topPosition = - $(this).next(".likes-list").height() + 5;
+			$(this).next(".likes-list").animate({opacity: "toggle", top: topPosition}, 500);
 		}
 	});
 
-	elgg_system_message();
+	elgg-system-message();
 
 }); /* end document ready function */
 
 
 
 // display & hide elgg system messages
-function elgg_system_message() {
-	$("#elgg_system_message").animate({opacity: 0.9}, 1000);
-	$("#elgg_system_message").animate({opacity: 0.9}, 5000);
-	$("#elgg_system_message").fadeOut('slow');
-
-	$("#elgg_system_message").click(function () {
-		$("#elgg_system_message").stop();
-		$("#elgg_system_message").fadeOut('slow');
+function elgg-system-message() {
+	$("#elgg-system-message").animate({opacity: 0.9}, 1000);
+	$("#elgg-system-message").animate({opacity: 0.9}, 5000);
+	$("#elgg-system-message").fadeOut('slow');
+
+	$("#elgg-system-message").click(function () {
+		$("#elgg-system-message").stop();
+		$("#elgg-system-message").fadeOut('slow');
 	return false;
 	});
 }