Merge remote-tracking branch 'upstream/master' into bootstrap

Conflicts:
	view/php/theme_init.php

1 files changed, 10 insertions, 16 deletions

diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index e40a94fcc..e41fde2b8 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -16,23 +16,27 @@ function cmtBbClose(comment, id) {
 	return false;
 }
 
+//document.jotpermslock = 'icon-lock';
+//document.jotpermsunlock = 'icon-unlock';
+
+
 $(document).ready(function() {
 
 $('.group-edit-icon').hover(
 	function() {
-		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
+		$(this).css('opacity','1.0');},
 	function() {
-		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
-	);
+		$(this).css('opacity','0');}
+);
 
 $('.sidebar-group-element').hover(
 	function() {
 		id = $(this).attr('id');
-		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+		$('#edit-' + id).css('opacity','1.0');},
 
 	function() {
 		id = $(this).attr('id');
-		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+		$('#edit-' + id).css('opacity','0');}
 	);
 
 
@@ -43,16 +47,6 @@ $('.savedsearchdrop').hover(
 		$(this).css('opacity','0');}
 	);
 
-$('.savedsearchterm').hover(
-	function() {
-		id = $(this).attr('id');
-		$('#dropicon-' + id).css('opacity','1.0');},
-
-	function() {
-		id = $(this).attr('id');
-		$('#dropicon-' + id).css('opacity','0');
-	});
-
 });
 
 
@@ -68,4 +62,4 @@ $(document).ready(function(){
 		}
 	};
 	setInterval(function () {checkNotify();}, 10 * 1000);
-});
\ No newline at end of file
+});