diff --git a/view/theme/decaf-mobile/end.tpl b/view/theme/decaf-mobile/end.tpl
index cb3824d9d1..2e78838e01 100644
--- a/view/theme/decaf-mobile/end.tpl
+++ b/view/theme/decaf-mobile/end.tpl
@@ -10,7 +10,8 @@
-->#}
-{##}
+{##}
{##}
{##}
diff --git a/view/theme/decaf-mobile/smarty3/end.tpl b/view/theme/decaf-mobile/smarty3/end.tpl
index e75845bac3..6914cfd246 100644
--- a/view/theme/decaf-mobile/smarty3/end.tpl
+++ b/view/theme/decaf-mobile/smarty3/end.tpl
@@ -15,7 +15,8 @@
-->*}}
-{{**}}
+{{**}}
{{**}}
{{**}}
diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl
index 3a8f7291ec..272b670488 100644
--- a/view/theme/diabook/photo_view.tpl
+++ b/view/theme/diabook/photo_view.tpl
@@ -11,8 +11,7 @@
{{ 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 55a8440d10..e3908be006 100644
--- a/view/theme/diabook/smarty3/photo_view.tpl
+++ b/view/theme/diabook/smarty3/photo_view.tpl
@@ -16,8 +16,7 @@
{{if $prevlink}}{{/if}}
-{{**}}
-
+
{{if $nextlink}}{{/if}}
{{$desc}}
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index faafb7537f..050c2a0b4c 100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -169,7 +169,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
$a->page['htmlhead'] .= '
-
+
diff --git a/view/theme/frost-mobile/head.tpl b/view/theme/frost-mobile/head.tpl
index 3d534300db..edfa5e4bbf 100644
--- a/view/theme/frost-mobile/head.tpl
+++ b/view/theme/frost-mobile/head.tpl
@@ -8,6 +8,7 @@
diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index d73c026396..4ea2f7cdad 100644
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -132,9 +132,9 @@
});
// fancyboxes
- /*$j("a.popupbox").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ /*$j("a.popupbox").colorbox({
+ 'inline' : true,
+ 'transition' : 'none'
});*/
diff --git a/view/theme/frost-mobile/js/theme.js b/view/theme/frost-mobile/js/theme.js
index e0ff5e7dc2..178202ce5c 100644
--- a/view/theme/frost-mobile/js/theme.js
+++ b/view/theme/frost-mobile/js/theme.js
@@ -295,9 +295,9 @@ function initEditor(cb){
$j("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true;
-/* $j("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'none',
- 'transitionOut' : 'none'
+/* $j("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});*/
$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
var parent = $j("#profile-jot-acl-wrapper").parent();
@@ -397,9 +397,9 @@ function initEditor(cb){
});
editor = true;
// setup acl popup
- $j("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ $j("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
}); */
} else {
if (typeof cb!="undefined") cb();
@@ -678,7 +678,7 @@ function showEvent(eventid) {
/* $j.get(
baseurl + '/events/?id='+eventid,
function(data){
- $j.fancybox(data);
+ $j.colorbox({html:data});
}
);*/
}
@@ -715,14 +715,14 @@ function itemFiler(id) {
/* if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/
liking = 1;
-/* $j.fancybox.close();*/
+/* $j.colorbox.close();*/
}
});
/* var bordercolor = $j("input").css("border-color");
$j.get('filer/', function(data){
- $j.fancybox(data);
+ $j.colorbox({html:data});
$j("#id_term").keypress(function(){
$j(this).css("border-color",bordercolor);
})
@@ -740,7 +740,7 @@ function itemFiler(id) {
if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);
liking = 1;
- $j.fancybox.close();
+ $j.colorbox.close();
} else {
$j("#id_term").css("border-color","#FF0000");
}
diff --git a/view/theme/frost-mobile/smarty3/end.tpl b/view/theme/frost-mobile/smarty3/end.tpl
index 6f0da0918e..c51bc4167f 100644
--- a/view/theme/frost-mobile/smarty3/end.tpl
+++ b/view/theme/frost-mobile/smarty3/end.tpl
@@ -13,7 +13,8 @@
-
+
diff --git a/view/theme/frost-mobile/smarty3/head.tpl b/view/theme/frost-mobile/smarty3/head.tpl
index 4ab78e2eb1..1799a74942 100644
--- a/view/theme/frost-mobile/smarty3/head.tpl
+++ b/view/theme/frost-mobile/smarty3/head.tpl
@@ -13,6 +13,7 @@
diff --git a/view/theme/frost/end.tpl b/view/theme/frost/end.tpl
index f24830e46b..eadf480bea 100644
--- a/view/theme/frost/end.tpl
+++ b/view/theme/frost/end.tpl
@@ -10,7 +10,7 @@
-
+
diff --git a/view/theme/frost/head.tpl b/view/theme/frost/head.tpl
index f4b0a103e6..bb6e9e200b 100644
--- a/view/theme/frost/head.tpl
+++ b/view/theme/frost/head.tpl
@@ -1,7 +1,7 @@
-
+
diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js
index 1c865ac3ae..f7bb4e2b54 100644
--- a/view/theme/frost/js/main.js
+++ b/view/theme/frost/js/main.js
@@ -124,9 +124,9 @@
});
// fancyboxes
- $j("a.popupbox").fancybox({
- 'transitionIn' : 'none',
- 'transitionOut' : 'none'
+ $j("a.popupbox").colorbox({
+ 'inline' : true,
+ 'transition' : 'none'
});
diff --git a/view/theme/frost/js/theme.js b/view/theme/frost/js/theme.js
index b0d6f49313..f46192c9be 100644
--- a/view/theme/frost/js/theme.js
+++ b/view/theme/frost/js/theme.js
@@ -270,37 +270,36 @@ $j(function(){
$j(function(){
- $j("#cnftheme").fancybox({
- width: 800,
- autoDimensions: false,
- onStart: function(){
- var theme = $j("#id_theme :selected").val();
- var theme_mobile = $j("#id_theme_mobile :selected").val();
- $j("#cnftheme").attr('href', baseurl + "/admin/themes/"+theme);
- },
- onComplete: function(){
- $j("div#fancybox-content form").submit(function(e){
- var url = $j(this).attr('action');
- // can't get .serialize() to work...
- var data={};
- $j(this).find("input").each(function(){
- data[$j(this).attr('name')] = $j(this).val();
- });
- $j(this).find("select").each(function(){
- data[$j(this).attr('name')] = $j(this).children(":selected").val();
- });
- console.log(":)", url, data);
+ $j("#cnftheme").click(function(){
+ $.colorbox({
+ width: 800,
+ height: '90%',
+ href: "$baseurl/admin/themes/" + $j("#id_theme :selected").val(),
+ onComplete: function(){
+ $j("div#fancybox-content form").submit(function(e){
+ var url = $j(this).attr('action');
+ // can't get .serialize() to work...
+ var data={};
+ $j(this).find("input").each(function(){
+ data[$j(this).attr('name')] = $j(this).val();
+ });
+ $j(this).find("select").each(function(){
+ data[$j(this).attr('name')] = $j(this).children(":selected").val();
+ });
+ console.log(":)", url, data);
- $j.post(url, data, function(data) {
- if(timer) clearTimeout(timer);
- NavUpdate();
- $j.fancybox.close();
- })
+ $j.post(url, data, function(data) {
+ if(timer) clearTimeout(timer);
+ NavUpdate();
+ $j.colorbox.close();
+ })
- return false;
- });
+ return false;
+ });
- }
+ }
+ });
+ return false;
});
});
@@ -389,7 +388,7 @@ function showEvent(eventid) {
$j.get(
baseurl + '/events/?id='+eventid,
function(data){
- $j.fancybox(data);
+ $j.colorbox({html:data});
}
);
}
@@ -622,9 +621,9 @@ function initEditor(cb){
$j("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true;
- $j("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'none', //'elastic',
- 'transitionOut' : 'none' //'elastic'
+ $j("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
$j(".jothidden").show();
if (typeof cb!="undefined") cb();
@@ -714,9 +713,9 @@ function initEditor(cb){
});
editor = true;
// setup acl popup
- $j("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'none',
- 'transitionOut' : 'none'
+ $j("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
} else {
if (typeof cb!="undefined") cb();
@@ -1015,7 +1014,7 @@ function itemFiler(id) {
var bordercolor = $j("input").css("border-color");
$j.get('filer/', function(data){
- $j.fancybox(data);
+ $j.colorbox({html:data});
$j("#id_term").keypress(function(){
$j(this).css("border-color",bordercolor);
})
@@ -1033,7 +1032,7 @@ function itemFiler(id) {
/* if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/
liking = 1;
- $j.fancybox.close();
+ $j.colorbox.close();
} else {
$j("#id_term").css("border-color","#FF0000");
}
diff --git a/view/theme/frost/photo_edit.tpl b/view/theme/frost/photo_edit.tpl
index e558fdb0eb..5907f19192 100644
--- a/view/theme/frost/photo_edit.tpl
+++ b/view/theme/frost/photo_edit.tpl
@@ -51,8 +51,8 @@
diff --git a/view/theme/frost/smarty3/end.tpl b/view/theme/frost/smarty3/end.tpl
index 242937e34e..4ed99a6e0e 100644
--- a/view/theme/frost/smarty3/end.tpl
+++ b/view/theme/frost/smarty3/end.tpl
@@ -15,7 +15,7 @@
-
+
diff --git a/view/theme/frost/smarty3/head.tpl b/view/theme/frost/smarty3/head.tpl
index 7c9a975026..ce89dc08ba 100644
--- a/view/theme/frost/smarty3/head.tpl
+++ b/view/theme/frost/smarty3/head.tpl
@@ -6,7 +6,7 @@
-
+
diff --git a/view/theme/frost/smarty3/photo_edit.tpl b/view/theme/frost/smarty3/photo_edit.tpl
index 04b39451ae..34fd8a0c18 100644
--- a/view/theme/frost/smarty3/photo_edit.tpl
+++ b/view/theme/frost/smarty3/photo_edit.tpl
@@ -56,8 +56,8 @@
diff --git a/view/theme/quattro/events_reminder.tpl b/view/theme/quattro/events_reminder.tpl
index fc13fa68b7..28b6a6675f 100644
--- a/view/theme/quattro/events_reminder.tpl
+++ b/view/theme/quattro/events_reminder.tpl
@@ -10,7 +10,7 @@
$.get(
'$baseurl/events/?id='+eventid,
function(data){
- $.fancybox(data);
+ $.colorbox({html:data});
}
);
}
diff --git a/view/theme/quattro/smarty3/events_reminder.tpl b/view/theme/quattro/smarty3/events_reminder.tpl
index e8a6b906bc..b188bd4a37 100644
--- a/view/theme/quattro/smarty3/events_reminder.tpl
+++ b/view/theme/quattro/smarty3/events_reminder.tpl
@@ -15,7 +15,7 @@
$.get(
'{{$baseurl}}/events/?id='+eventid,
function(data){
- $.fancybox(data);
+ $.colorbox({html:data});
}
);
}
diff --git a/view/theme/smoothly/jot-header.tpl b/view/theme/smoothly/jot-header.tpl
index b9f6149c24..79d8799a5f 100644
--- a/view/theme/smoothly/jot-header.tpl
+++ b/view/theme/smoothly/jot-header.tpl
@@ -14,9 +14,9 @@ function initEditor(cb){
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
$(".jothidden").show();
editor = true;
- $("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
$("#profile-jot-submit-wrapper").show();
{{ if $newpost }}
@@ -133,9 +133,9 @@ function initEditor(cb){
});
editor = true;
// setup acl popup
- $("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'none',
- 'transitionOut' : 'none'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
} else {
if (typeof cb!="undefined") cb();
@@ -324,7 +324,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);
})
@@ -342,7 +342,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/smoothly/smarty3/jot-header.tpl b/view/theme/smoothly/smarty3/jot-header.tpl
index 8519082399..0560969a6e 100644
--- a/view/theme/smoothly/smarty3/jot-header.tpl
+++ b/view/theme/smoothly/smarty3/jot-header.tpl
@@ -19,9 +19,9 @@ function initEditor(cb){
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
$(".jothidden").show();
editor = true;
- $("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
$("#profile-jot-submit-wrapper").show();
{{if $newpost}}
@@ -138,9 +138,9 @@ function initEditor(cb){
});
editor = true;
// setup acl popup
- $("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'none',
- 'transitionOut' : 'none'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
} else {
if (typeof cb!="undefined") cb();
@@ -329,7 +329,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);
})
@@ -347,7 +347,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/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
index da50716d93..9c0037f7f2 100644
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
@@ -14,9 +14,9 @@ function initEditor(cb) {
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$(".jothidden").show();
editor = true;
- $("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
$("#profile-jot-submit-wrapper").show();
{{ if $newpost }}
@@ -133,9 +133,9 @@ function initEditor(cb) {
});
editor = true;
// setup acl popup
- $("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'none',
- 'transitionOut' : 'none'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
} else {
if (typeof cb!="undefined") cb();
@@ -315,7 +315,7 @@ function initEditor(cb) {
var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){
- $.fancybox(data);
+ $.colorbox({html:data});
$("#id_term").keypress(function(){
$(this).css("border-color",bordercolor);
})
@@ -333,7 +333,7 @@ function initEditor(cb) {
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/testbubble/smarty3/jot-header.tpl b/view/theme/testbubble/smarty3/jot-header.tpl
index 67deaf8190..6b082738de 100644
--- a/view/theme/testbubble/smarty3/jot-header.tpl
+++ b/view/theme/testbubble/smarty3/jot-header.tpl
@@ -19,9 +19,9 @@ function initEditor(cb) {
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$(".jothidden").show();
editor = true;
- $("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
$("#profile-jot-submit-wrapper").show();
{{if $newpost}}
@@ -138,9 +138,9 @@ function initEditor(cb) {
});
editor = true;
// setup acl popup
- $("a#jot-perms-icon").fancybox({
- 'transitionIn' : 'none',
- 'transitionOut' : 'none'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
} else {
if (typeof cb!="undefined") cb();
@@ -320,7 +320,7 @@ function initEditor(cb) {
var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){
- $.fancybox(data);
+ $.colorbox({html:data});
$("#id_term").keypress(function(){
$(this).css("border-color",bordercolor);
})
@@ -338,7 +338,7 @@ function initEditor(cb) {
if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);
liking = 1;
- $.fancybox.close();
+ $.colorbox.close();
} else {
$("#id_term").css("border-color","#FF0000");
}