From 1033e8896fc908156f128974b29a8e486f2d4792 Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Mon, 4 Feb 2013 18:06:43 -0700
Subject: [PATCH] finish updating themes for colorbox

---
 view/theme/decaf-mobile/end.tpl               |  3 +-
 view/theme/decaf-mobile/head.tpl              |  1 +
 view/theme/decaf-mobile/smarty3/end.tpl       |  3 +-
 view/theme/decaf-mobile/smarty3/head.tpl      |  1 +
 view/theme/diabook/photo_view.tpl             |  3 +-
 view/theme/diabook/smarty3/photo_view.tpl     |  3 +-
 view/theme/diabook/theme.php                  |  2 +-
 view/theme/dispy/photo_view.tpl               |  3 +-
 view/theme/dispy/smarty3/photo_view.tpl       |  3 +-
 view/theme/dispy/theme.php                    |  2 +-
 view/theme/frost-mobile/end.tpl               |  3 +-
 view/theme/frost-mobile/head.tpl              |  1 +
 view/theme/frost-mobile/js/main.js            |  6 +-
 view/theme/frost-mobile/js/theme.js           | 20 ++---
 view/theme/frost-mobile/smarty3/end.tpl       |  3 +-
 view/theme/frost-mobile/smarty3/head.tpl      |  1 +
 view/theme/frost/end.tpl                      |  2 +-
 view/theme/frost/head.tpl                     |  2 +-
 view/theme/frost/js/main.js                   |  6 +-
 view/theme/frost/js/theme.js                  | 73 +++++++++----------
 view/theme/frost/photo_edit.tpl               |  6 +-
 view/theme/frost/smarty3/end.tpl              |  2 +-
 view/theme/frost/smarty3/head.tpl             |  2 +-
 view/theme/frost/smarty3/photo_edit.tpl       |  6 +-
 view/theme/quattro/events_reminder.tpl        |  2 +-
 .../theme/quattro/smarty3/events_reminder.tpl |  2 +-
 view/theme/smoothly/jot-header.tpl            | 16 ++--
 view/theme/smoothly/smarty3/jot-header.tpl    | 16 ++--
 view/theme/testbubble/jot-header.tpl          | 16 ++--
 view/theme/testbubble/smarty3/jot-header.tpl  | 16 ++--
 30 files changed, 114 insertions(+), 111 deletions(-)

diff --git a/view/theme/decaf-mobile/end.tpl b/view/theme/decaf-mobile/end.tpl
index cb3824d9d..2e78838e0 100644
--- a/view/theme/decaf-mobile/end.tpl
+++ b/view/theme/decaf-mobile/end.tpl
@@ -10,7 +10,8 @@
 <script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/jquery.divgrow-1.3.1.f1.js" ></script>
 <script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
 <script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/fk.autocomplete.js" ></script>-->#}
-{#<!--<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>-->#}
+{#<!--<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="$baseurl/library/colorbox/jquery.colorbox-min.js"></script>-->#}
 {#<!--<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>-->#}
 {#<!--<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
 <script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/acl.js" ></script>
diff --git a/view/theme/decaf-mobile/head.tpl b/view/theme/decaf-mobile/head.tpl
index 5ad82b4c5..a8b213318 100644
--- a/view/theme/decaf-mobile/head.tpl
+++ b/view/theme/decaf-mobile/head.tpl
@@ -8,6 +8,7 @@
 <base href="$baseurl/" />
 <meta name="generator" content="$generator" />
 {#<!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/colorbox/colorbox.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />-->#}
 
diff --git a/view/theme/decaf-mobile/smarty3/end.tpl b/view/theme/decaf-mobile/smarty3/end.tpl
index e75845bac..6914cfd24 100644
--- a/view/theme/decaf-mobile/smarty3/end.tpl
+++ b/view/theme/decaf-mobile/smarty3/end.tpl
@@ -15,7 +15,8 @@
 <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.divgrow-1.3.1.f1.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/fk.autocomplete.js" ></script>-->*}}
-{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>-->*}}
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>-->*}}
 {{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}}
 {{*<!--<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/acl.js" ></script>
diff --git a/view/theme/decaf-mobile/smarty3/head.tpl b/view/theme/decaf-mobile/smarty3/head.tpl
index ad9e1ad28..07398391f 100644
--- a/view/theme/decaf-mobile/smarty3/head.tpl
+++ b/view/theme/decaf-mobile/smarty3/head.tpl
@@ -13,6 +13,7 @@
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
 {{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />-->*}}
 
diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl
index 3a8f7291e..272b67048 100644
--- a/view/theme/diabook/photo_view.tpl
+++ b/view/theme/diabook/photo_view.tpl
@@ -11,8 +11,7 @@
 </div>
 
 {{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-{#<!--<div id="photo-photo"><a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a></div>-->#}
-<div id="photo-photo"><img href="$photo.href" class="lightbox" style="cursor:pointer;" src="$photo.src" /></div>
+<div id="photo-photo"><a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a></div>
 {{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
 <div id="photo-photo-end"></div>
 <div id="photo-caption">$desc</div>
diff --git a/view/theme/diabook/smarty3/photo_view.tpl b/view/theme/diabook/smarty3/photo_view.tpl
index 55a8440d1..e3908be00 100644
--- a/view/theme/diabook/smarty3/photo_view.tpl
+++ b/view/theme/diabook/smarty3/photo_view.tpl
@@ -16,8 +16,7 @@
 </div>
 
 {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
-{{*<!--<div id="photo-photo"><a href="{{$photo.href}}" class="lightbox" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>-->*}}
-<div id="photo-photo"><img href="{{$photo.href}}" class="lightbox" style="cursor:pointer;" src="{{$photo.src}}" /></div>
+<div id="photo-photo"><a href="{{$photo.href}}" class="lightbox" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
 {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
 <div id="photo-photo-end"></div>
 <div id="photo-caption">{{$desc}}</div>
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index faafb7537..050c2a0b4 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'] .= '
 	<script>
 	 $(function() {
-		$("img.lightbox").colorbox({maxHeight:"90%"}); // Select all links with lightbox class
+		$("a.lightbox").colorbox({maxHeight:"90%"}); // Select all links with lightbox class
 	 	$("a#twittersettings-link").colorbox({inline:true,onClosed: function() { $("#twittersettings").attr("style","display: none;");}} );
 		$("a#mapcontrol-link").colorbox({inline:true,onClosed: function() { $("#mapcontrol").attr("style","display: none;");}} );
 		$("a#closeicon").colorbox({inline:true,onClosed: function() { $("#boxsettings").attr("style","display: none;");}} );
diff --git a/view/theme/dispy/photo_view.tpl b/view/theme/dispy/photo_view.tpl
index cab7dfb3f..a55958308 100644
--- a/view/theme/dispy/photo_view.tpl
+++ b/view/theme/dispy/photo_view.tpl
@@ -11,8 +11,7 @@
 </div>
 
 {{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-{#<!--<div id="photo-photo"><a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a></div>-->#}
-<div id="photo-photo"><img href="$photo.href" class="lightbox" style="cursor:pointer;" src="$photo.src" /></div>
+<div id="photo-photo"><a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a></div>
 {{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
 <div id="photo-photo-end"></div>
 <div id="photo-caption">$desc</div>
diff --git a/view/theme/dispy/smarty3/photo_view.tpl b/view/theme/dispy/smarty3/photo_view.tpl
index 027cc8fb9..cfc8868ed 100644
--- a/view/theme/dispy/smarty3/photo_view.tpl
+++ b/view/theme/dispy/smarty3/photo_view.tpl
@@ -16,8 +16,7 @@
 </div>
 
 {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
-{{*<!--<div id="photo-photo"><a href="{{$photo.href}}" class="lightbox" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>-->*}}
-<div id="photo-photo"><img href="{{$photo.href}}" class="lightbox" style="cursor:pointer;" src="{{$photo.src}}" /></div>
+<div id="photo-photo"><a href="{{$photo.href}}" class="lightbox" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
 {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
 <div id="photo-photo-end"></div>
 <div id="photo-caption">{{$desc}}</div>
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 2eb104ae1..a3b6b7f6e 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -52,7 +52,7 @@ function dispy_init(&$a) {
 	<script type="text/javascript">
 	$(document).ready(function() {
 		// Select all links with lightbox class
-		$("img.lightbox").colorbox({maxHeight:"90%"});
+		$("a.lightbox").colorbox({maxHeight:"90%"});
 
     	$('.group-edit-icon').hover(
 			function() {
diff --git a/view/theme/frost-mobile/end.tpl b/view/theme/frost-mobile/end.tpl
index 9183f7a32..d2679935c 100644
--- a/view/theme/frost-mobile/end.tpl
+++ b/view/theme/frost-mobile/end.tpl
@@ -8,7 +8,8 @@
 <script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/main.min.js" ></script>
 <script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
 <script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
-<!--<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>-->
+<!--<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="$baseurl/library/colorbox/jquery.colorbox-min.js"></script>-->
 <!--<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>-->
 <script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
 <script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/acl.min.js" ></script>
diff --git a/view/theme/frost-mobile/head.tpl b/view/theme/frost-mobile/head.tpl
index 3d534300d..edfa5e4bb 100644
--- a/view/theme/frost-mobile/head.tpl
+++ b/view/theme/frost-mobile/head.tpl
@@ -8,6 +8,7 @@
 <base href="$baseurl/" />
 <meta name="generator" content="$generator" />
 <!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/colorbox/colorbox.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />-->
 <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
 
diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index d73c02639..4ea2f7cda 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 e0ff5e7dc..178202ce5 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 6f0da0918..c51bc4167 100644
--- a/view/theme/frost-mobile/smarty3/end.tpl
+++ b/view/theme/frost-mobile/smarty3/end.tpl
@@ -13,7 +13,8 @@
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/main.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
-<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>-->
+<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>-->
 <!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->
 <script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/acl.min.js" ></script>
diff --git a/view/theme/frost-mobile/smarty3/head.tpl b/view/theme/frost-mobile/smarty3/head.tpl
index 4ab78e2eb..1799a7494 100644
--- a/view/theme/frost-mobile/smarty3/head.tpl
+++ b/view/theme/frost-mobile/smarty3/head.tpl
@@ -13,6 +13,7 @@
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
 <!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />-->
 <link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
 
diff --git a/view/theme/frost/end.tpl b/view/theme/frost/end.tpl
index f24830e46..eadf480be 100644
--- a/view/theme/frost/end.tpl
+++ b/view/theme/frost/end.tpl
@@ -10,7 +10,7 @@
 <script type="text/javascript" src="$baseurl/view/theme/frost/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
 <script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
 <script type="text/javascript" src="$baseurl/view/theme/frost/js/fk.autocomplete.min.js" ></script>
-<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="$baseurl/library/colorbox/jquery.colorbox-min.js"></script>
 <!--<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>-->
 <script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
 <script type="text/javascript" src="$baseurl/view/theme/frost/js/acl.min.js" ></script>
diff --git a/view/theme/frost/head.tpl b/view/theme/frost/head.tpl
index f4b0a103e..bb6e9e200 100644
--- a/view/theme/frost/head.tpl
+++ b/view/theme/frost/head.tpl
@@ -1,7 +1,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="$baseurl/" />
 <meta name="generator" content="$generator" />
-<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="$baseurl/library/colorbox/colorbox.css" type="text/css" media="screen" />
 <!--<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />-->
 <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
 
diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js
index 1c865ac3a..f7bb4e2b5 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 b0d6f4931..f46192c9b 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 e558fdb0e..5907f1919 100644
--- a/view/theme/frost/photo_edit.tpl
+++ b/view/theme/frost/photo_edit.tpl
@@ -51,8 +51,8 @@
 </form>
 
 <!--<script>
-	$("a#photo-edit-perms-menu").fancybox({
-		'transitionIn' : 'none',
-		'transitionOut' : 'none'
+	$("a#photo-edit-perms-menu").colorbox({
+		'inline' : true,
+		'transition' : 'none'
 	}); 
 </script>-->
diff --git a/view/theme/frost/smarty3/end.tpl b/view/theme/frost/smarty3/end.tpl
index 242937e34..4ed99a6e0 100644
--- a/view/theme/frost/smarty3/end.tpl
+++ b/view/theme/frost/smarty3/end.tpl
@@ -15,7 +15,7 @@
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/fk.autocomplete.min.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>
 <!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->
 <script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/acl.min.js" ></script>
diff --git a/view/theme/frost/smarty3/head.tpl b/view/theme/frost/smarty3/head.tpl
index 7c9a97502..ce89dc08b 100644
--- a/view/theme/frost/smarty3/head.tpl
+++ b/view/theme/frost/smarty3/head.tpl
@@ -6,7 +6,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
-<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
 <!--<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />-->
 <link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
 
diff --git a/view/theme/frost/smarty3/photo_edit.tpl b/view/theme/frost/smarty3/photo_edit.tpl
index 04b39451a..34fd8a0c1 100644
--- a/view/theme/frost/smarty3/photo_edit.tpl
+++ b/view/theme/frost/smarty3/photo_edit.tpl
@@ -56,8 +56,8 @@
 </form>
 
 <!--<script>
-	$("a#photo-edit-perms-menu").fancybox({
-		'transitionIn' : 'none',
-		'transitionOut' : 'none'
+	$("a#photo-edit-perms-menu").colorbox({
+		'inline' : true,
+		'transition' : 'none'
 	}); 
 </script>-->
diff --git a/view/theme/quattro/events_reminder.tpl b/view/theme/quattro/events_reminder.tpl
index fc13fa68b..28b6a6675 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 e8a6b906b..b188bd4a3 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 b9f6149c2..79d8799a5 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 851908239..0560969a6 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 da50716d9..9c0037f7f 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 67deaf819..6b082738d 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");
 				}