From 0f25455d1b4594d44cf2cbf13839f3f8a39cb835 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Thu, 31 Jan 2013 08:40:03 -0700 Subject: [PATCH] starting switching to colorbox --- js/main.js | 6 +- view/admin_site.tpl | 59 ++++++++++--------- view/event_head.tpl | 2 +- view/head.tpl | 6 +- view/jot-header.tpl | 16 ++--- view/smarty3/admin_site.tpl | 59 ++++++++++--------- view/smarty3/event_head.tpl | 2 +- view/smarty3/head.tpl | 6 +- view/smarty3/jot-header.tpl | 16 ++--- view/theme/diabook/photo_view.tpl | 3 +- view/theme/diabook/smarty3/photo_view.tpl | 3 +- view/theme/diabook/theme.php | 8 +-- view/theme/dispy/jot-header.tpl | 16 ++--- view/theme/dispy/photo_edit.tpl | 6 +- view/theme/dispy/photo_view.tpl | 3 +- view/theme/dispy/smarty3/jot-header.tpl | 16 ++--- view/theme/dispy/smarty3/photo_edit.tpl | 6 +- view/theme/dispy/smarty3/photo_view.tpl | 3 +- view/theme/dispy/theme.php | 2 +- view/theme/slackr/events_reminder.tpl | 2 +- view/theme/slackr/smarty3/events_reminder.tpl | 2 +- 21 files changed, 130 insertions(+), 112 deletions(-) diff --git a/js/main.js b/js/main.js index ff1039be9..7eaff3c43 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 38d1fb8d0..e8fdd4258 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 ea7dc4466..559de24e3 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 588654352..7b1ed7de9 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 8b9e772e6..a442c4c64 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 2ff63ec2e..f033b52ee 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 4eb8c304f..3d7091fb7 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 27e561514..1b01b71a0 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 b893f1f6b..ce7dcf2a4 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 272b67048..3a8f7291e 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 e3908be00..55a8440d1 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 1ec98e877..faafb7537 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 a55958308..cab7dfb3f 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 00bf4dcb7..4aafc2175 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 3a3dcaca7..b9a92fda8 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 cfc8868ed..027cc8fb9 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 d0b7e19d7..2eb104ae1 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -52,7 +52,7 @@ function dispy_init(&$a) {