finish updating themes for colorbox

diff --git a/view/theme/decaf-mobile/end.tpl b/view/theme/decaf-mobile/end.tpl
index cb3824d9d165971b1d8caa8c57e467872fd52b04..2e78838e01f946ee7485f30e32482dc5db28d0a0 100644 (file)
--- 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 5ad82b4c5de3b23cf75a6b6ae211b94bfdbcc7cf..a8b2133189021ad033802af6e8c9a1263d093a5f 100644 (file)
--- 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 e75845bac380497a2a7d4a0709de2bb6a383b216..6914cfd246e3a63c5a5cf6444bad2c3a368ac3f9 100644 (file)
--- 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 ad9e1ad2813791b5469404bd3ef3db38c98babbd..07398391f12757b982302636ca2473d3b8e30d2d 100644 (file)
--- 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 3a8f7291ec9da03cf7d2e7daf258f77aa19f12eb..272b67048801f3dce99d96d470ca04fca5f13ba5 100644 (file)
--- 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 55a8440d10c48b558c7fb35bdd1ea09b4e979049..e3908be006c5e452460df59642b66aa7971a1a72 100644 (file)
--- 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 faafb7537f670a59fc33b012ed800183556ccb50..050c2a0b4c1d2c56b205b1bd3812e7bc8f7695d2 100644 (file)
--- 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 cab7dfb3fda8910b01735fd58c95bc3c321eb4f1..a5595830851ae9143d82a4ef28bcd5db3509a977 100644 (file)
--- 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 027cc8fb9d46d0f1b8122ccb13286eec84b364ba..cfc8868edf92dbadea0304fc0f1f9f55037c6100 100644 (file)
--- 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 2eb104ae1e91578e66a0828f76f6e5fd3621ac1d..a3b6b7f6eabd0c68370fffff65a6e75501b2a2e2 100644 (file)
--- 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 9183f7a32c6669c6b6c5f09aae39bcf39d572b0f..d2679935c9197c4657c22ecb65f97b583e6269e3 100644 (file)
--- 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 3d534300db1d905ac06eb022fec846fbdb6d7115..edfa5e4bbf1b5c19ca973e912c89fa1288d0e766 100644 (file)
--- 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 d73c026396626c48fac46f1c5e47405a997ba72e..4ea2f7cdade534830fb698203840a26a4a028e90 100644 (file)
--- 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 e0ff5e7dc2a1e3ab7f81d0ac4ca0675e75ef6e6e..178202ce5c794e1aec948a169d2a58b1a809e37a 100644 (file)
--- 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 6f0da0918e3882d0503a24a3f65faf86cdfdd1ef..c51bc4167ff183fad1790073cba6d98e9c185f22 100644 (file)
--- 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 4ab78e2eb1541449f26d2c7e502ce34181d59978..1799a74942fe65877aa3fd6ad78788c1b0c0a6d5 100644 (file)
--- 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 f24830e46be2f87fa26993fe97483dc56ab70aa0..eadf480bea4426860e34fb208d1aee8fa79e3a78 100644 (file)
--- 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 f4b0a103e64d37174f82320afbf887aa2c278769..bb6e9e200b3cfcc3587470de17167ba21b4a6e18 100644 (file)
--- 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 1c865ac3ae7c64d60dcaeedf4695d3f28e15301a..f7bb4e2b54e31f8de488dff4368f9746b39cbee6 100644 (file)
--- 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 b0d6f493131c4545dc913feb4b84ec259805c93d..f46192c9be6986dbefef8fef43722e24ff2e6838 100644 (file)
--- 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 e558fdb0eb4db5288c85b8fbb4c8d12d1990b891..5907f191921b9274213ddcc421a51186062796ad 100644 (file)
--- 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 242937e34e4dee9650ff6e1b9360ba3a69adf3ba..4ed99a6e0e877da11c8457ec29629329df55aaf6 100644 (file)
--- 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 7c9a975026e4c058aa20f319c2f7fbe5b1384eb4..ce89dc08ba06193e01adde66fb98f3346e9c7072 100644 (file)
--- 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 04b39451ae2ae9b601648edd81e3214c93a294bd..34fd8a0c18ed04dcb7becbdce284d633518f1543 100644 (file)
--- 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 fc13fa68b79a258aab349afb8196039d886e20b6..28b6a6675fe9ec535d07a80174aef5cf81565cda 100644 (file)
--- 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 e8a6b906bc25f96ed8999bb4d6bc3b0e3cd57449..b188bd4a3776dd3a4365fcbf4b69fd30ca0cc78b 100644 (file)
--- 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 b9f6149c2482283a229789b8ff8ab989194e658b..79d8799a5f6647f919bb493e9501c7872d13f022 100644 (file)
--- 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 85190823995fa884d335a549f84326249b924c4a..0560969a6e0658f54d61abcc50e325dbc74550d9 100644 (file)
--- 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 da50716d936576279c39a44cdcf20a41954fe341..9c0037f7f242cc0ca1541fdca5b06257b25a10d1 100644 (file)
--- 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 67deaf8190a8b1cfe299f074d0ed923c6fe4a618..6b082738def04738831c0ecc9c8dc197376f76f9 100644 (file)
--- 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");
                                }