diff --git a/view/theme/blog/admin_aside.tpl b/view/theme/blog/admin_aside.tpl index 7893333..54a7859 100644 --- a/view/theme/blog/admin_aside.tpl +++ b/view/theme/blog/admin_aside.tpl @@ -27,18 +27,23 @@ {{ endif }} + - {{ if $admin.plugins_admin }}

$plugadmtxt

{{ endif }} +{{ if $admin.plugins_admin }} +
+

$plugadmtxt

+{{ endif }} +

$logtxt

-
\ No newline at end of file + diff --git a/view/theme/blog/jot-header.tpl b/view/theme/blog/jot-header.tpl index 099f9ff..630df97 100644 --- a/view/theme/blog/jot-header.tpl +++ b/view/theme/blog/jot-header.tpl @@ -13,13 +13,17 @@ 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({ - transitionIn : 'elastic', - transitionOut : 'elastic', - afterClose : function() { - $.fancybox("#profile-jot-wrapper"); - } - }); + $("a#jot-perms-icon").colorbox({ + href:$("a#jot-perms-icon").attr('href'), + inline: true, + onClosed : function() { + $.colorbox({ + href:"#profile-jot-wrapper", + inline: true, + open: true + }); + } + }); $(".jothidden").show(); if (typeof cb!="undefined") cb(); return; @@ -108,12 +112,16 @@ function initEditor(cb){ }); editor = true; // setup acl popup - $("a#jot-perms-icon").fancybox({ - transitionIn : 'elastic', - transitionOut : 'elastic', - afterClose : function() { - $.fancybox("#profile-jot-wrapper"); - } + $("a#jot-perms-icon").colorbox({ + href:$("a#jot-perms-icon").attr('href'), + inline: true, + onClosed : function() { + $.colorbox({ + href:"#profile-jot-wrapper", + inline: true, + open: true + }); + } }); } else { if (typeof cb!="undefined") cb(); @@ -133,10 +141,10 @@ function enableOnUser(){ $(document).ready(function() { - $("a.showjot").fancybox({ - transitionIn : 'elastic', - transitionOut : 'elastic', - beforeShow : function() { + $("a.showjot").colorbox({ + href: $("a.showjot").attr('href'), + inline: true, + onOpen : function() { enableOnUser(); } }); @@ -288,7 +296,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); }) @@ -306,7 +314,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/theme/blog/jot.tpl b/view/theme/blog/jot.tpl index 4c14eff..2d4957a 100644 --- a/view/theme/blog/jot.tpl +++ b/view/theme/blog/jot.tpl @@ -56,9 +56,9 @@
$jotnets
- Ok + Ok
-$share \ No newline at end of file +$share diff --git a/view/theme/blog/settings.tpl b/view/theme/blog/settings.tpl index e14c3fe..a92b6a4 100644 --- a/view/theme/blog/settings.tpl +++ b/view/theme/blog/settings.tpl @@ -90,7 +90,7 @@ $group_select
$aclselect
- Ok + Ok
diff --git a/view/theme/blog/threaded_conversation.tpl b/view/theme/blog/threaded_conversation.tpl index eb942d6..e79d4dc 100644 --- a/view/theme/blog/threaded_conversation.tpl +++ b/view/theme/blog/threaded_conversation.tpl @@ -23,7 +23,12 @@ $live_update $(document).ready(function(){ // setup reply popup forms - $(".reply-link").fancybox(); + $(".reply-link").colorbox({ + href: function() { + return $(this).attr('href'); + }, + inline: true + }); }); @@ -35,4 +40,4 @@ $live_update $('#li-comment-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000); -{{ endif }} \ No newline at end of file +{{ endif }}