diff --git a/js/main.js b/js/main.js
index ff1039be9d..7eaff3c43c 100644
--- a/js/main.js
+++ b/js/main.js
@@ -103,9 +103,13 @@
});
// fancyboxes
- $("a.popupbox").fancybox({
+ /*$("a.popupbox").fancybox({
'transitionIn' : 'elastic',
'transitionOut' : 'elastic'
+ });*/
+ $("a.popupbox").colorbox({
+ 'inline' : true,
+ 'transition' : 'none'
});
diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 38d1fb8d04..e8fdd42589 100644
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -1,37 +1,40 @@
diff --git a/view/event_head.tpl b/view/event_head.tpl
index ea7dc44663..559de24e31 100644
--- a/view/event_head.tpl
+++ b/view/event_head.tpl
@@ -7,7 +7,7 @@
$.get(
'$baseurl/events/?id='+eventid,
function(data){
- $.fancybox(data);
+ $.colorbox({html:data});
}
);
}
diff --git a/view/head.tpl b/view/head.tpl
index 588654352d..7b1ed7de93 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -1,7 +1,8 @@
-
+{##}
+
@@ -23,7 +24,8 @@
-
+{##}
+
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 8b9e772e60..a442c4c648 100644
--- a/view/jot-header.tpl
+++ b/view/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").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
$(".jothidden").show();
if (typeof cb!="undefined") cb();
@@ -105,9 +105,9 @@ function initEditor(cb){
});
editor = true;
// setup acl popup
- $("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
} else {
if (typeof cb!="undefined") cb();
@@ -274,7 +274,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);
})
@@ -292,7 +292,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/smarty3/admin_site.tpl b/view/smarty3/admin_site.tpl
index 2ff63ec2e7..f033b52eef 100644
--- a/view/smarty3/admin_site.tpl
+++ b/view/smarty3/admin_site.tpl
@@ -6,37 +6,40 @@
diff --git a/view/smarty3/event_head.tpl b/view/smarty3/event_head.tpl
index 4eb8c304fb..3d7091fb7a 100644
--- a/view/smarty3/event_head.tpl
+++ b/view/smarty3/event_head.tpl
@@ -12,7 +12,7 @@
$.get(
'{{$baseurl}}/events/?id='+eventid,
function(data){
- $.fancybox(data);
+ $.colorbox({html:data});
}
);
}
diff --git a/view/smarty3/head.tpl b/view/smarty3/head.tpl
index 27e5615149..1b01b71a05 100644
--- a/view/smarty3/head.tpl
+++ b/view/smarty3/head.tpl
@@ -6,7 +6,8 @@
-
+{{**}}
+
@@ -28,7 +29,8 @@
-
+{{**}}
+
diff --git a/view/smarty3/jot-header.tpl b/view/smarty3/jot-header.tpl
index b893f1f6b1..ce7dcf2a4d 100644
--- a/view/smarty3/jot-header.tpl
+++ b/view/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").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
$(".jothidden").show();
if (typeof cb!="undefined") cb();
@@ -110,9 +110,9 @@ function initEditor(cb){
});
editor = true;
// setup acl popup
- $("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
} else {
if (typeof cb!="undefined") cb();
@@ -279,7 +279,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);
})
@@ -297,7 +297,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/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl
index 272b670488..3a8f7291ec 100644
--- a/view/theme/diabook/photo_view.tpl
+++ b/view/theme/diabook/photo_view.tpl
@@ -11,7 +11,8 @@
{{ if $prevlink }}
{{ endif }}
-
+{##}
+
{{ if $nextlink }}{{ endif }}
$desc
diff --git a/view/theme/diabook/smarty3/photo_view.tpl b/view/theme/diabook/smarty3/photo_view.tpl
index e3908be006..55a8440d10 100644
--- a/view/theme/diabook/smarty3/photo_view.tpl
+++ b/view/theme/diabook/smarty3/photo_view.tpl
@@ -16,7 +16,8 @@
{{if $prevlink}}{{/if}}
-
+{{**}}
+
{{if $nextlink}}{{/if}}
{{$desc}}
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 1ec98e877a..faafb7537f 100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -169,10 +169,10 @@ if ($color=="dark") $color_path = "/diabook-dark/";
$a->page['htmlhead'] .= '
diff --git a/view/theme/dispy/photo_view.tpl b/view/theme/dispy/photo_view.tpl
index a559583085..cab7dfb3fd 100644
--- a/view/theme/dispy/photo_view.tpl
+++ b/view/theme/dispy/photo_view.tpl
@@ -11,7 +11,8 @@
{{ if $prevlink }}{{ endif }}
-
+{##}
+
{{ if $nextlink }}{{ endif }}
$desc
diff --git a/view/theme/dispy/smarty3/jot-header.tpl b/view/theme/dispy/smarty3/jot-header.tpl
index 00bf4dcb7b..4aafc2175d 100644
--- a/view/theme/dispy/smarty3/jot-header.tpl
+++ b/view/theme/dispy/smarty3/jot-header.tpl
@@ -16,9 +16,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").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
$(".jothidden").show();
if (typeof cb!="undefined") cb();
@@ -107,9 +107,9 @@ function initEditor(cb) {
});
editor = true;
// setup acl popup
- $("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
} else {
if (typeof cb!="undefined") cb();
@@ -273,7 +273,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);
})
@@ -291,7 +291,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/dispy/smarty3/photo_edit.tpl b/view/theme/dispy/smarty3/photo_edit.tpl
index 3a3dcaca76..b9a92fda81 100644
--- a/view/theme/dispy/smarty3/photo_edit.tpl
+++ b/view/theme/dispy/smarty3/photo_edit.tpl
@@ -51,8 +51,8 @@
diff --git a/view/theme/dispy/smarty3/photo_view.tpl b/view/theme/dispy/smarty3/photo_view.tpl
index cfc8868edf..027cc8fb9d 100644
--- a/view/theme/dispy/smarty3/photo_view.tpl
+++ b/view/theme/dispy/smarty3/photo_view.tpl
@@ -16,7 +16,8 @@
{{if $prevlink}}{{/if}}
-
+{{**}}
+
{{if $nextlink}}{{/if}}
{{$desc}}
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index d0b7e19d76..2eb104ae1e 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -52,7 +52,7 @@ function dispy_init(&$a) {