diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/php/theme_init.php | 4 | ||||
| -rw-r--r-- | view/tpl/jot-header.tpl | 18 | ||||
| -rw-r--r-- | view/tpl/smarty3/jot-header.tpl | 18 |
3 files changed, 21 insertions, 19 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 59f2ff0cc..2738daf75 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -9,6 +9,7 @@ head_add_css('library/tiptip/tipTip.css'); head_add_css('library/jgrowl/jquery.jgrowl.css'); head_add_css('library/jslider/css/jslider.css'); head_add_css('library/prettyphoto/css/prettyPhoto.css'); +head_add_css('library/colorbox/colorbox.css'); head_add_js('js/jquery.js'); head_add_js('js/jquery-migrate-1.1.1.js'); @@ -26,4 +27,5 @@ head_add_js('js/webtoolkit.base64.js'); head_add_js('js/main.js'); head_add_js('library/jslider/bin/jquery.slider.min.js'); head_add_js('docready.js'); -head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js'); +head_add_js('library/colorbox/js/jquery.prettyPhoto.js'); +head_add_js('library/colorbox/jquery.colorbox-min.js'); diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 4736f2137..8d19ab317 100644 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -13,9 +13,9 @@ function initEditor(cb){ $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); editor = true; - $("a#jot-perms-icon").prettyPhoto({ - 'transitionIn' : 'elastic', - 'transitionOut' : 'elastic' + $("a#jot-perms-icon").colorbox({ + 'inline' : true, + 'transition' : 'elastic' }); $(".jothidden").show(); if (typeof cb!="undefined") cb(); @@ -88,10 +88,10 @@ function initEditor(cb){ editor = true; // setup acl popup - $("a#jot-perms-icon").prettyPhoto({ - 'transitionIn' : 'elastic', - 'transitionOut' : 'elastic' - }); + $("a#jot-perms-icon").colorbox({ + 'inline' : true, + 'transition' : 'elastic' + }); } else { if (typeof cb!="undefined") cb(); } @@ -252,7 +252,7 @@ function enableOnUser(){ var bordercolor = $("input").css("border-color"); $.get('filer/', function(data){ - $.fancybox(data); + $.colorbox({html: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(); + $.colorbox.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 ab22b3775..ae0ccc8e8 100644 --- a/view/tpl/smarty3/jot-header.tpl +++ b/view/tpl/smarty3/jot-header.tpl @@ -18,9 +18,9 @@ function initEditor(cb){ $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); editor = true; - $("a#jot-perms-icon").prettyPhoto({ - 'transitionIn' : 'elastic', - 'transitionOut' : 'elastic' + $("a#jot-perms-icon").colorbox({ + 'inline' : true, + 'transition' : 'elastic' }); $(".jothidden").show(); if (typeof cb!="undefined") cb(); @@ -93,10 +93,10 @@ function initEditor(cb){ editor = true; // setup acl popup - $("a#jot-perms-icon").prettyPhoto({ - 'transitionIn' : 'elastic', - 'transitionOut' : 'elastic' - }); + $("a#jot-perms-icon").colorbox({ + 'inline' : true, + 'transition' : 'elastic' + }); } else { if (typeof cb!="undefined") cb(); } @@ -257,7 +257,7 @@ function enableOnUser(){ var bordercolor = $("input").css("border-color"); $.get('filer/', function(data){ - $.fancybox(data); + $.colorbox({html: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(); + $.colorbox.close(); } else { $("#id_term").css("border-color","#FF0000"); } |