3 files changed, 19 insertions, 20 deletions

diff --git a/mod/tabbed_profile/start.php b/mod/tabbed_profile/start.php
index 08b2ed5bd..59771ab30 100644
--- a/mod/tabbed_profile/start.php
+++ b/mod/tabbed_profile/start.php
@@ -33,7 +33,6 @@ function profile_init() {
 
 	elgg_extend_view('html_head/extend', 'profile/metatags');
 	elgg_extend_view('css/screen', 'profile/css');
-	elgg_extend_view('js/elgg', 'profile/javascript');
 
 	// Register actions
 	elgg_register_action("profile/addcomment", $CONFIG->pluginspath . "tabbed_profile/actions/addcomment.php");
diff --git a/mod/tabbed_profile/views/default/profile/css.php b/mod/tabbed_profile/views/default/profile/css.php
index 45c67b6b2..2b4ef11a3 100644
--- a/mod/tabbed_profile/views/default/profile/css.php
+++ b/mod/tabbed_profile/views/default/profile/css.php
@@ -39,10 +39,10 @@
 /* ***************************************
 	default avatar icons
 *************************************** */
-.usericon {
+.elgg-user-icon {
 	position:relative;
 }
-.usericon.tiny,
+.elgg-user-icon.tiny,
 img.tiny {
 	width:25px;
 	height:25px;
@@ -56,7 +56,7 @@ img.tiny {
 	-khtml-background-size: 25px;
 	-moz-background-size: 25px;
 }
-.usericon.small,
+.elgg-user-icon.small,
 img.small {
 	width:40px;
 	height:40px;
@@ -389,7 +389,7 @@ p.visit_twitter a {
 	height:15px;
 }
 /* user avatar submenu options */
-.usericon .sub_menu { 
+.elgg-user-icon .sub_menu { 
 	display:none; 
 	position:absolute; 
 	padding:0; 
@@ -405,31 +405,31 @@ p.visit_twitter a {
 	-moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
 	font-size:14px;
 }
-div.usericon a.icon img {
+div.elgg-user-icon a.icon img {
 	z-index:10;
 }
-.usericon .sub_menu a:link, 
-.usericon .sub_menu a:visited, 
-.usericon .sub_menu a:hover { 
+.elgg-user-icon .sub_menu a:link, 
+.elgg-user-icon .sub_menu a:visited, 
+.elgg-user-icon .sub_menu a:hover { 
 	display:block;
 	font-weight: normal;
 }	
-.usericon .sub_menu a:hover {
+.elgg-user-icon .sub_menu a:hover {
 	background:#cccccc;
 	text-decoration:none;
 }
-.usericon .sub_menu .displayname {
+.elgg-user-icon .sub_menu .displayname {
 	padding:0 !important;
 	margin:0 !important;
 	border-bottom:solid 1px #dddddd !important;
 	font-size:14px !important;
 }
-.usericon .sub_menu .displayname a {
+.elgg-user-icon .sub_menu .displayname a {
 	padding:3px 3px 3px 8px;
 	font-size:14px;
 	font-weight: bold;
 }
-.usericon .sub_menu .displayname a .username {
+.elgg-user-icon .sub_menu .displayname a .username {
 	display:block;
 	font-weight: normal;
 	font-size:12px;
@@ -441,7 +441,7 @@ div.usericon a.icon img {
 	margin-bottom:0;
 	padding-left:0;
 }
-.usericon .sub_menu a {
+.elgg-user-icon .sub_menu a {
 	padding:2px 3px 2px 8px;
 	font-size:12px;
 }
@@ -449,10 +449,10 @@ div.usericon a.icon img {
 .user_menu_admin {
 	border-top:solid 1px #dddddd;
 }
-.usericon .sub_menu li.user_menu_admin a {
+.elgg-user-icon .sub_menu li.user_menu_admin a {
 	color:red;
 }
-.usericon .sub_menu li.user_menu_admin a:hover {
+.elgg-user-icon .sub_menu li.user_menu_admin a:hover {
 	color:white;
 	background:red;
 }
diff --git a/mod/tabbed_profile/views/default/profile/javascript.php b/mod/tabbed_profile/views/default/profile/javascript.php
index 96b57fb95..b0dbc79ee 100644
--- a/mod/tabbed_profile/views/default/profile/javascript.php
+++ b/mod/tabbed_profile/views/default/profile/javascript.php
@@ -22,7 +22,7 @@ function setup_avatar_menu(parent) {
 	}
 
 	// avatar image menu link
-	$(parent).find("div.usericon img").mouseover(function() {
+	$(parent).find("div.elgg-user-icon img").mouseover(function() {
 		// find nested avatar_menu_button and show
 		$(this.parentNode.parentNode).children(".avatar_menu_button").show();
 		$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow");
@@ -56,7 +56,7 @@ function setup_avatar_menu(parent) {
 		}
 		else {
 			// get avatar dimensions
-			var avatar = $(this).parent().parent().parent().find("div.usericon");
+			var avatar = $(this).parent().parent().parent().find("div.elgg-user-icon");
 			//alert( "avatarWidth: " + avatar.width() + ", avatarHeight: " + avatar.height() );
 
 			// move submenu position so it aligns with arrow graphic
@@ -118,8 +118,8 @@ function setup_avatar_menu(parent) {
 	// and hide arrow button
 	$(document).click(function(event) {
 			var target = $(event.target);
-			if (target.parents(".usericon").length == 0) {
-				$(".usericon div.sub_menu").fadeOut();
+			if (target.parents(".elgg-user-icon").length == 0) {
+				$(".elgg-user-icon div.sub_menu").fadeOut();
 				$(".avatar_menu_button").removeClass("avatar_menu_arrow");
 				$(".avatar_menu_button").removeClass("avatar_menu_arrow_on");
 				$(".avatar_menu_button").removeClass("avatar_menu_arrow_hover");