clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

finish updating themes for colorbox

This commit is contained in:
Zach Prezkuta 2013-02-04 18:06:43 -07:00
parent 0f25455d1b
commit 1033e8896f
30 changed files with 114 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
view/theme/decaf-mobile/end.tpl
View File

@ -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/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/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/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/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/library/jgrowl/jquery.jgrowl_minimized.js"></script>
<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/acl.js" ></script> <script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/acl.js" ></script>

1
view/theme/decaf-mobile/head.tpl
View File

@ -8,6 +8,7 @@
<base href="$baseurl/" /> <base href="$baseurl/" />
<meta name="generator" content="$generator" /> <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/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/tiptip/tipTip.css" type="text/css" media="screen" />
<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />-->#} <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />-->#}

3
view/theme/decaf-mobile/smarty3/end.tpl
View File

@ -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}}/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}}/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}}/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/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}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/acl.js" ></script> <script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/acl.js" ></script>

1
view/theme/decaf-mobile/smarty3/head.tpl
View File

@ -13,6 +13,7 @@
<base href="{{$baseurl}}/" /> <base href="{{$baseurl}}/" />
<meta name="generator" content="{{$generator}}" /> <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/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/tiptip/tipTip.css" type="text/css" media="screen" />
<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />-->*}} <link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />-->*}}

3
view/theme/diabook/photo_view.tpl
View File

@ -11,8 +11,7 @@
</div> </div>
{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }} {{ 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"><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>
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }} {{ 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-photo-end"></div>
<div id="photo-caption">$desc</div> <div id="photo-caption">$desc</div>

3
view/theme/diabook/smarty3/photo_view.tpl
View File

@ -16,8 +16,7 @@
</div> </div>
{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}} {{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"><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>
{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}} {{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-photo-end"></div>
<div id="photo-caption">{{$desc}}</div> <div id="photo-caption">{{$desc}}</div>

2
view/theme/diabook/theme.php
View File

@ -169,7 +169,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
$a->page['htmlhead'] .= ' $a->page['htmlhead'] .= '
<script> <script>
$(function() { $(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#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#mapcontrol-link").colorbox({inline:true,onClosed: function() { $("#mapcontrol").attr("style","display: none;");}} );
$("a#closeicon").colorbox({inline:true,onClosed: function() { $("#boxsettings").attr("style","display: none;");}} ); $("a#closeicon").colorbox({inline:true,onClosed: function() { $("#boxsettings").attr("style","display: none;");}} );

3
view/theme/dispy/photo_view.tpl
View File

@ -11,8 +11,7 @@
</div> </div>
{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }} {{ 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"><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>
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }} {{ 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-photo-end"></div>
<div id="photo-caption">$desc</div> <div id="photo-caption">$desc</div>

3
view/theme/dispy/smarty3/photo_view.tpl
View File

@ -16,8 +16,7 @@
</div> </div>
{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}} {{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"><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>
{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}} {{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-photo-end"></div>
<div id="photo-caption">{{$desc}}</div> <div id="photo-caption">{{$desc}}</div>

2
view/theme/dispy/theme.php
View File

@ -52,7 +52,7 @@ function dispy_init(&$a) {
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
// Select all links with lightbox class // Select all links with lightbox class
$("img.lightbox").colorbox({maxHeight:"90%"}); $("a.lightbox").colorbox({maxHeight:"90%"});
$('.group-edit-icon').hover( $('.group-edit-icon').hover(
function() { function() {

3
view/theme/frost-mobile/end.tpl
View File

@ -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/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/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/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/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/library/jgrowl/jquery.jgrowl_minimized.js"></script>
<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/acl.min.js" ></script> <script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/acl.min.js" ></script>

1
view/theme/frost-mobile/head.tpl
View File

@ -8,6 +8,7 @@
<base href="$baseurl/" /> <base href="$baseurl/" />
<meta name="generator" content="$generator" /> <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/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/tiptip/tipTip.css" type="text/css" media="screen" />-->
<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" /> <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />

6
view/theme/frost-mobile/js/main.js
View File

@ -132,9 +132,9 @@
}); });
// fancyboxes // fancyboxes
/*$j("a.popupbox").fancybox({ /*$j("a.popupbox").colorbox({
'transitionIn' : 'elastic', 'inline' : true,
'transitionOut' : 'elastic' 'transition' : 'none'
});*/ });*/

20
view/theme/frost-mobile/js/theme.js
View File

@ -295,9 +295,9 @@ function initEditor(cb){
$j("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $j("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); $j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true; editor = true;
/* $j("a#jot-perms-icon").fancybox({ /* $j("a#jot-perms-icon").colorbox({
'transitionIn' : 'none', 'inline' : true,
'transitionOut' : 'none' 'transition' : 'elastic'
});*/ });*/
$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function () { $j("a#jot-perms-icon, a#settings-default-perms-menu").click(function () {
var parent = $j("#profile-jot-acl-wrapper").parent(); var parent = $j("#profile-jot-acl-wrapper").parent();
@ -397,9 +397,9 @@ function initEditor(cb){
}); });
editor = true; editor = true;
// setup acl popup // setup acl popup
$j("a#jot-perms-icon").fancybox({ $j("a#jot-perms-icon").colorbox({
'transitionIn' : 'elastic', 'inline' : true,
'transitionOut' : 'elastic' 'transition' : 'elastic'
}); */ }); */
} else { } else {
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
@ -678,7 +678,7 @@ function showEvent(eventid) {
/* $j.get( /* $j.get(
baseurl + '/events/?id='+eventid, baseurl + '/events/?id='+eventid,
function(data){ function(data){
$j.fancybox(data); $j.colorbox({html:data});
} }
);*/ );*/
} }
@ -715,14 +715,14 @@ function itemFiler(id) {
/* if(timer) clearTimeout(timer); /* if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/ timer = setTimeout(NavUpdate,3000);*/
liking = 1; liking = 1;
/* $j.fancybox.close();*/ /* $j.colorbox.close();*/
} }
}); });
/* var bordercolor = $j("input").css("border-color"); /* var bordercolor = $j("input").css("border-color");
$j.get('filer/', function(data){ $j.get('filer/', function(data){
$j.fancybox(data); $j.colorbox({html:data});
$j("#id_term").keypress(function(){ $j("#id_term").keypress(function(){
$j(this).css("border-color",bordercolor); $j(this).css("border-color",bordercolor);
}) })
@ -740,7 +740,7 @@ function itemFiler(id) {
if(timer) clearTimeout(timer); if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000); timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;
$j.fancybox.close(); $j.colorbox.close();
} else { } else {
$j("#id_term").css("border-color","#FF0000"); $j("#id_term").css("border-color","#FF0000");
} }

3
view/theme/frost-mobile/smarty3/end.tpl
View File

@ -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}}/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}}/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}}/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/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}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/acl.min.js" ></script> <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/acl.min.js" ></script>

1
view/theme/frost-mobile/smarty3/head.tpl
View File

@ -13,6 +13,7 @@
<base href="{{$baseurl}}/" /> <base href="{{$baseurl}}/" />
<meta name="generator" content="{{$generator}}" /> <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/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/tiptip/tipTip.css" type="text/css" media="screen" />-->
<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" /> <link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />

2
view/theme/frost/end.tpl
View File

@ -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/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/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/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/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/library/jgrowl/jquery.jgrowl_minimized.js"></script>
<script type="text/javascript" src="$baseurl/view/theme/frost/js/acl.min.js" ></script> <script type="text/javascript" src="$baseurl/view/theme/frost/js/acl.min.js" ></script>

2
view/theme/frost/head.tpl
View File

@ -1,7 +1,7 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<base href="$baseurl/" /> <base href="$baseurl/" />
<meta name="generator" content="$generator" /> <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/tiptip/tipTip.css" type="text/css" media="screen" />-->
<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" /> <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />

6
view/theme/frost/js/main.js
View File

@ -124,9 +124,9 @@
}); });
// fancyboxes // fancyboxes
$j("a.popupbox").fancybox({ $j("a.popupbox").colorbox({
'transitionIn' : 'none', 'inline' : true,
'transitionOut' : 'none' 'transition' : 'none'
}); });

73
view/theme/frost/js/theme.js
View File

@ -270,37 +270,36 @@ $j(function(){
$j(function(){ $j(function(){
$j("#cnftheme").fancybox({ $j("#cnftheme").click(function(){
width: 800, $.colorbox({
autoDimensions: false, width: 800,
onStart: function(){ height: '90%',
var theme = $j("#id_theme :selected").val(); href: "$baseurl/admin/themes/" + $j("#id_theme :selected").val(),
var theme_mobile = $j("#id_theme_mobile :selected").val(); onComplete: function(){
$j("#cnftheme").attr('href', baseurl + "/admin/themes/"+theme); $j("div#fancybox-content form").submit(function(e){
}, var url = $j(this).attr('action');
onComplete: function(){ // can't get .serialize() to work...
$j("div#fancybox-content form").submit(function(e){ var data={};
var url = $j(this).attr('action'); $j(this).find("input").each(function(){
// can't get .serialize() to work... data[$j(this).attr('name')] = $j(this).val();
var data={}; });
$j(this).find("input").each(function(){ $j(this).find("select").each(function(){
data[$j(this).attr('name')] = $j(this).val(); data[$j(this).attr('name')] = $j(this).children(":selected").val();
}); });
$j(this).find("select").each(function(){ console.log(":)", url, data);
data[$j(this).attr('name')] = $j(this).children(":selected").val();
});
console.log(":)", url, data);
$j.post(url, data, function(data) { $j.post(url, data, function(data) {
if(timer) clearTimeout(timer); if(timer) clearTimeout(timer);
NavUpdate(); NavUpdate();
$j.fancybox.close(); $j.colorbox.close();
}) })
return false; return false;
}); });
} }
});
return false;
}); });
}); });
@ -389,7 +388,7 @@ function showEvent(eventid) {
$j.get( $j.get(
baseurl + '/events/?id='+eventid, baseurl + '/events/?id='+eventid,
function(data){ 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").css({ 'height': 200, 'color': '#000' });
$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); $j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true; editor = true;
$j("a#jot-perms-icon").fancybox({ $j("a#jot-perms-icon").colorbox({
'transitionIn' : 'none', //'elastic', 'inline' : true,
'transitionOut' : 'none' //'elastic' 'transition' : 'elastic'
}); });
$j(".jothidden").show(); $j(".jothidden").show();
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
@ -714,9 +713,9 @@ function initEditor(cb){
}); });
editor = true; editor = true;
// setup acl popup // setup acl popup
$j("a#jot-perms-icon").fancybox({ $j("a#jot-perms-icon").colorbox({
'transitionIn' : 'none', 'inline' : true,
'transitionOut' : 'none' 'transition' : 'elastic'
}); });
} else { } else {
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
@ -1015,7 +1014,7 @@ function itemFiler(id) {
var bordercolor = $j("input").css("border-color"); var bordercolor = $j("input").css("border-color");
$j.get('filer/', function(data){ $j.get('filer/', function(data){
$j.fancybox(data); $j.colorbox({html:data});
$j("#id_term").keypress(function(){ $j("#id_term").keypress(function(){
$j(this).css("border-color",bordercolor); $j(this).css("border-color",bordercolor);
}) })
@ -1033,7 +1032,7 @@ function itemFiler(id) {
/* if(timer) clearTimeout(timer); /* if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000);*/ timer = setTimeout(NavUpdate,3000);*/
liking = 1; liking = 1;
$j.fancybox.close(); $j.colorbox.close();
} else { } else {
$j("#id_term").css("border-color","#FF0000"); $j("#id_term").css("border-color","#FF0000");
} }

6
view/theme/frost/photo_edit.tpl
View File

@ -51,8 +51,8 @@
</form> </form>
<!--<script> <!--<script>
$("a#photo-edit-perms-menu").fancybox({ $("a#photo-edit-perms-menu").colorbox({
'transitionIn' : 'none', 'inline' : true,
'transitionOut' : 'none' 'transition' : 'none'
}); });
</script>--> </script>-->

2
view/theme/frost/smarty3/end.tpl
View File

@ -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}}/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}}/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}}/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/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}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/acl.min.js" ></script> <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/acl.min.js" ></script>

2
view/theme/frost/smarty3/head.tpl
View File

@ -6,7 +6,7 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<base href="{{$baseurl}}/" /> <base href="{{$baseurl}}/" />
<meta name="generator" content="{{$generator}}" /> <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/tiptip/tipTip.css" type="text/css" media="screen" />-->
<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" /> <link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />

6
view/theme/frost/smarty3/photo_edit.tpl
View File

@ -56,8 +56,8 @@
</form> </form>
<!--<script> <!--<script>
$("a#photo-edit-perms-menu").fancybox({ $("a#photo-edit-perms-menu").colorbox({
'transitionIn' : 'none', 'inline' : true,
'transitionOut' : 'none' 'transition' : 'none'
}); });
</script>--> </script>-->

2
view/theme/quattro/events_reminder.tpl
View File

@ -10,7 +10,7 @@
$.get( $.get(
'$baseurl/events/?id='+eventid, '$baseurl/events/?id='+eventid,
function(data){ function(data){
$.fancybox(data); $.colorbox({html:data});
} }
); );
} }

2
view/theme/quattro/smarty3/events_reminder.tpl
View File

@ -15,7 +15,7 @@
$.get( $.get(
'{{$baseurl}}/events/?id='+eventid, '{{$baseurl}}/events/?id='+eventid,
function(data){ function(data){
$.fancybox(data); $.colorbox({html:data});
} }
); );
} }

16
view/theme/smoothly/jot-header.tpl
View File

@ -14,9 +14,9 @@ function initEditor(cb){
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
$(".jothidden").show(); $(".jothidden").show();
editor = true; editor = true;
$("a#jot-perms-icon").fancybox({ $("a#jot-perms-icon").colorbox({
'transitionIn' : 'elastic', 'inline' : true,
'transitionOut' : 'elastic' 'transition' : 'elastic'
}); });
$("#profile-jot-submit-wrapper").show(); $("#profile-jot-submit-wrapper").show();
{{ if $newpost }} {{ if $newpost }}
@ -133,9 +133,9 @@ function initEditor(cb){
}); });
editor = true; editor = true;
// setup acl popup // setup acl popup
$("a#jot-perms-icon").fancybox({ $("a#jot-perms-icon").colorbox({
'transitionIn' : 'none', 'inline' : true,
'transitionOut' : 'none' 'transition' : 'elastic'
}); });
} else { } else {
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
@ -324,7 +324,7 @@ function enableOnUser(){
var bordercolor = $("input").css("border-color"); var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){ $.get('filer/', function(data){
$.fancybox(data); $.colorbox({html:data});
$("#id_term").keypress(function(){ $("#id_term").keypress(function(){
$(this).css("border-color",bordercolor); $(this).css("border-color",bordercolor);
}) })
@ -342,7 +342,7 @@ function enableOnUser(){
// if(timer) clearTimeout(timer); // if(timer) clearTimeout(timer);
// timer = setTimeout(NavUpdate,3000); // timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;
$.fancybox.close(); $.colorbox.close();
} else { } else {
$("#id_term").css("border-color","#FF0000"); $("#id_term").css("border-color","#FF0000");
} }

16
view/theme/smoothly/smarty3/jot-header.tpl
View File

@ -19,9 +19,9 @@ function initEditor(cb){
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); $("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
$(".jothidden").show(); $(".jothidden").show();
editor = true; editor = true;
$("a#jot-perms-icon").fancybox({ $("a#jot-perms-icon").colorbox({
'transitionIn' : 'elastic', 'inline' : true,
'transitionOut' : 'elastic' 'transition' : 'elastic'
}); });
$("#profile-jot-submit-wrapper").show(); $("#profile-jot-submit-wrapper").show();
{{if $newpost}} {{if $newpost}}
@ -138,9 +138,9 @@ function initEditor(cb){
}); });
editor = true; editor = true;
// setup acl popup // setup acl popup
$("a#jot-perms-icon").fancybox({ $("a#jot-perms-icon").colorbox({
'transitionIn' : 'none', 'inline' : true,
'transitionOut' : 'none' 'transition' : 'elastic'
}); });
} else { } else {
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
@ -329,7 +329,7 @@ function enableOnUser(){
var bordercolor = $("input").css("border-color"); var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){ $.get('filer/', function(data){
$.fancybox(data); $.colorbox({html:data});
$("#id_term").keypress(function(){ $("#id_term").keypress(function(){
$(this).css("border-color",bordercolor); $(this).css("border-color",bordercolor);
}) })
@ -347,7 +347,7 @@ function enableOnUser(){
// if(timer) clearTimeout(timer); // if(timer) clearTimeout(timer);
// timer = setTimeout(NavUpdate,3000); // timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;
$.fancybox.close(); $.colorbox.close();
} else { } else {
$("#id_term").css("border-color","#FF0000"); $("#id_term").css("border-color","#FF0000");
} }

16
view/theme/testbubble/jot-header.tpl
View File

@ -14,9 +14,9 @@ function initEditor(cb) {
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$(".jothidden").show(); $(".jothidden").show();
editor = true; editor = true;
$("a#jot-perms-icon").fancybox({ $("a#jot-perms-icon").colorbox({
'transitionIn' : 'elastic', 'inline' : true,
'transitionOut' : 'elastic' 'transition' : 'elastic'
}); });
$("#profile-jot-submit-wrapper").show(); $("#profile-jot-submit-wrapper").show();
{{ if $newpost }} {{ if $newpost }}
@ -133,9 +133,9 @@ function initEditor(cb) {
}); });
editor = true; editor = true;
// setup acl popup // setup acl popup
$("a#jot-perms-icon").fancybox({ $("a#jot-perms-icon").colorbox({
'transitionIn' : 'none', 'inline' : true,
'transitionOut' : 'none' 'transition' : 'elastic'
}); });
} else { } else {
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
@ -315,7 +315,7 @@ function initEditor(cb) {
var bordercolor = $("input").css("border-color"); var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){ $.get('filer/', function(data){
$.fancybox(data); $.colorbox({html:data});
$("#id_term").keypress(function(){ $("#id_term").keypress(function(){
$(this).css("border-color",bordercolor); $(this).css("border-color",bordercolor);
}) })
@ -333,7 +333,7 @@ function initEditor(cb) {
if(timer) clearTimeout(timer); if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000); timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;
$.fancybox.close(); $.colorbox.close();
} else { } else {
$("#id_term").css("border-color","#FF0000"); $("#id_term").css("border-color","#FF0000");
} }

16
view/theme/testbubble/smarty3/jot-header.tpl
View File

@ -19,9 +19,9 @@ function initEditor(cb) {
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$(".jothidden").show(); $(".jothidden").show();
editor = true; editor = true;
$("a#jot-perms-icon").fancybox({ $("a#jot-perms-icon").colorbox({
'transitionIn' : 'elastic', 'inline' : true,
'transitionOut' : 'elastic' 'transition' : 'elastic'
}); });
$("#profile-jot-submit-wrapper").show(); $("#profile-jot-submit-wrapper").show();
{{if $newpost}} {{if $newpost}}
@ -138,9 +138,9 @@ function initEditor(cb) {
}); });
editor = true; editor = true;
// setup acl popup // setup acl popup
$("a#jot-perms-icon").fancybox({ $("a#jot-perms-icon").colorbox({
'transitionIn' : 'none', 'inline' : true,
'transitionOut' : 'none' 'transition' : 'elastic'
}); });
} else { } else {
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();
@ -320,7 +320,7 @@ function initEditor(cb) {
var bordercolor = $("input").css("border-color"); var bordercolor = $("input").css("border-color");
$.get('filer/', function(data){ $.get('filer/', function(data){
$.fancybox(data); $.colorbox({html:data});
$("#id_term").keypress(function(){ $("#id_term").keypress(function(){
$(this).css("border-color",bordercolor); $(this).css("border-color",bordercolor);
}) })
@ -338,7 +338,7 @@ function initEditor(cb) {
if(timer) clearTimeout(timer); if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000); timer = setTimeout(NavUpdate,3000);
liking = 1; liking = 1;
$.fancybox.close(); $.colorbox.close();
} else { } else {
$("#id_term").css("border-color","#FF0000"); $("#id_term").css("border-color","#FF0000");
} }