harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #47 from beardy-unixer/master

Browse Source 
Quick Fix ACL
This commit is contained in:
friendica 2013-04-15 20:47:08 -07:00
commit b17cadfd0e
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
view/theme/redbasic/css/style.css
View File

@ -3659,6 +3659,15 @@ ul.menu-popup {
width: 690px; width: 690px;
float:left; float:left;
} }
div.pp_pic_holder {
width: 800px !important;
}
.pp_content {
width: 100% !important;
}
#acl-search { #acl-search {
float:right; float:right;
background: #ffffff url("../../../../images/search_18.png") no-repeat right center; background: #ffffff url("../../../../images/search_18.png") no-repeat right center;

8
view/tpl/jot-header.tpl
View File

@ -13,7 +13,7 @@ function initEditor(cb){
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true; editor = true;
$("a#jot-perms-icon").fancybox({ $("a#jot-perms-icon").prettyPhoto({
'transitionIn' : 'elastic', 'transitionIn' : 'elastic',
'transitionOut' : 'elastic' 'transitionOut' : 'elastic'
}); });
@ -88,7 +88,7 @@ function initEditor(cb){
editor = true; editor = true;
// setup acl popup // setup acl popup
$("a#jot-perms-icon").fancybox({ $("a#jot-perms-icon").prettyPhoyo({
'transitionIn' : 'elastic', 'transitionIn' : 'elastic',
'transitionOut' : 'elastic' 'transitionOut' : 'elastic'
}); });
@ -252,7 +252,7 @@ function enableOnUser(){
var bordercolor = $("input").css("border-color"); var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){ $.get('filer/', function(data){
$.fancybox(data); $.prettyPhoto(data);
$("#id_term").keypress(function(){ $("#id_term").keypress(function(){
$(this).css("border-color",bordercolor); $(this).css("border-color",bordercolor);
}) })
@ -270,7 +270,7 @@ function enableOnUser(){
// if(timer) clearTimeout(timer); // if(timer) clearTimeout(timer);
// timer = setTimeout(NavUpdate,3000); // timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;
$.fancybox.close(); $.prettyPhoto.close();
} else { } else {
$("#id_term").css("border-color","#FF0000"); $("#id_term").css("border-color","#FF0000");
} }

8
view/tpl/smarty3/jot-header.tpl
View File

@ -18,7 +18,7 @@ function initEditor(cb){
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true; editor = true;
$("a#jot-perms-icon").fancybox({ $("a#jot-perms-icon").prettyPhoto({
'transitionIn' : 'elastic', 'transitionIn' : 'elastic',
'transitionOut' : 'elastic' 'transitionOut' : 'elastic'
}); });
@ -93,7 +93,7 @@ function initEditor(cb){
editor = true; editor = true;
// setup acl popup // setup acl popup
$("a#jot-perms-icon").fancybox({ $("a#jot-perms-icon").prettyPhoyo({
'transitionIn' : 'elastic', 'transitionIn' : 'elastic',
'transitionOut' : 'elastic' 'transitionOut' : 'elastic'
}); });
@ -257,7 +257,7 @@ function enableOnUser(){
var bordercolor = $("input").css("border-color"); var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){ $.get('filer/', function(data){
$.fancybox(data); $.prettyPhoto(data);
$("#id_term").keypress(function(){ $("#id_term").keypress(function(){
$(this).css("border-color",bordercolor); $(this).css("border-color",bordercolor);
}) })
@ -275,7 +275,7 @@ function enableOnUser(){
// if(timer) clearTimeout(timer); // if(timer) clearTimeout(timer);
// timer = setTimeout(NavUpdate,3000); // timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;
$.fancybox.close(); $.prettyPhoto.close();
} else { } else {
$("#id_term").css("border-color","#FF0000"); $("#id_term").css("border-color","#FF0000");
} }