Merge pull request #47 from beardy-unixer/master

Quick Fix ACL

3 files changed, 17 insertions, 8 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 26d296216..165eefc3d 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3659,6 +3659,15 @@ ul.menu-popup {
 	width: 690px;
 	float:left;
 }
+
+div.pp_pic_holder {
+width: 800px !important;
+}
+
+.pp_content {
+width: 100% !important;
+}
+
 #acl-search {
 	float:right;
 	background: #ffffff url("../../../../images/search_18.png") no-repeat right center;
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 700a815cf..1c4c43903 100644
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -13,7 +13,7 @@ function initEditor(cb){
 			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
 			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
 			editor = true;
-			$("a#jot-perms-icon").fancybox({
+			$("a#jot-perms-icon").prettyPhoto({
 				'transitionIn' : 'elastic',
 				'transitionOut' : 'elastic'
 			});
@@ -88,7 +88,7 @@ function initEditor(cb){
 
 		editor = true;
 		// setup acl popup
-		$("a#jot-perms-icon").fancybox({
+		$("a#jot-perms-icon").prettyPhoyo({
 			'transitionIn' : 'elastic',
 			'transitionOut' : 'elastic'
 		}); 
@@ -252,7 +252,7 @@ function enableOnUser(){
 		var bordercolor = $("input").css("border-color");
 		
 		$.get('filer/', function(data){
-			$.fancybox(data);
+			$.prettyPhoto(data);
 			$("#id_term").keypress(function(){
 				$(this).css("border-color",bordercolor);
 			})
@@ -270,7 +270,7 @@ function enableOnUser(){
 //					if(timer) clearTimeout(timer);
 //					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
-					$.fancybox.close();
+					$.prettyPhoto.close();
 				} else {
 					$("#id_term").css("border-color","#FF0000");
 				}
diff --git a/view/tpl/smarty3/jot-header.tpl b/view/tpl/smarty3/jot-header.tpl
index cce83e30b..c1b6d62e2 100644
--- a/view/tpl/smarty3/jot-header.tpl
+++ b/view/tpl/smarty3/jot-header.tpl
@@ -18,7 +18,7 @@ function initEditor(cb){
 			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
 			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
 			editor = true;
-			$("a#jot-perms-icon").fancybox({
+			$("a#jot-perms-icon").prettyPhoto({
 				'transitionIn' : 'elastic',
 				'transitionOut' : 'elastic'
 			});
@@ -93,7 +93,7 @@ function initEditor(cb){
 
 		editor = true;
 		// setup acl popup
-		$("a#jot-perms-icon").fancybox({
+		$("a#jot-perms-icon").prettyPhoyo({
 			'transitionIn' : 'elastic',
 			'transitionOut' : 'elastic'
 		}); 
@@ -257,7 +257,7 @@ function enableOnUser(){
 		var bordercolor = $("input").css("border-color");
 		
 		$.get('filer/', function(data){
-			$.fancybox(data);
+			$.prettyPhoto(data);
 			$("#id_term").keypress(function(){
 				$(this).css("border-color",bordercolor);
 			})
@@ -275,7 +275,7 @@ function enableOnUser(){
 //					if(timer) clearTimeout(timer);
 //					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
-					$.fancybox.close();
+					$.prettyPhoto.close();
 				} else {
 					$("#id_term").css("border-color","#FF0000");
 				}