aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/php/theme_init.php4
-rw-r--r--view/tpl/jot-header.tpl18
-rw-r--r--view/tpl/smarty3/admin_site.tpl6
-rw-r--r--view/tpl/smarty3/event_head.tpl2
-rw-r--r--view/tpl/smarty3/jot-header.tpl18
-rw-r--r--view/tpl/smarty3/oembed_video.tpl7
6 files changed, 30 insertions, 25 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 59f2ff0cc..055e3e91b 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -8,7 +8,7 @@ head_add_css('library/fancybox/jquery.fancybox-1.3.4.css');
head_add_css('library/tiptip/tipTip.css');
head_add_css('library/jgrowl/jquery.jgrowl.css');
head_add_css('library/jslider/css/jslider.css');
-head_add_css('library/prettyphoto/css/prettyPhoto.css');
+head_add_css('library/colorbox/colorbox.css');
head_add_js('js/jquery.js');
head_add_js('js/jquery-migrate-1.1.1.js');
@@ -26,4 +26,4 @@ head_add_js('js/webtoolkit.base64.js');
head_add_js('js/main.js');
head_add_js('library/jslider/bin/jquery.slider.min.js');
head_add_js('docready.js');
-head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js');
+head_add_js('library/colorbox/jquery.colorbox-min.js');
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 4736f2137..8d19ab317 100644
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -13,9 +13,9 @@ function initEditor(cb){
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true;
- $("a#jot-perms-icon").prettyPhoto({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
$(".jothidden").show();
if (typeof cb!="undefined") cb();
@@ -88,10 +88,10 @@ function initEditor(cb){
editor = true;
// setup acl popup
- $("a#jot-perms-icon").prettyPhoto({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
- });
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
+ });
} else {
if (typeof cb!="undefined") cb();
}
@@ -252,7 +252,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);
})
@@ -270,7 +270,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/tpl/smarty3/admin_site.tpl b/view/tpl/smarty3/admin_site.tpl
index eaf067c27..96b1746f7 100644
--- a/view/tpl/smarty3/admin_site.tpl
+++ b/view/tpl/smarty3/admin_site.tpl
@@ -6,7 +6,7 @@
<script>
$(function(){
- $("#cnftheme").fancybox({
+ $("#cnftheme").prettyPhoto({
width: 800,
autoDimensions: false,
onStart: function(){
@@ -14,7 +14,7 @@
$("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
},
onComplete: function(){
- $("div#fancybox-content form").submit(function(e){
+ $("div#prettyPhoto-content form").submit(function(e){
var url = $(this).attr('action');
// can't get .serialize() to work...
var data={};
@@ -29,7 +29,7 @@
$.post(url, data, function(data) {
if(timer) clearTimeout(timer);
NavUpdate();
- $.fancybox.close();
+ $.prettyPhoto.close();
})
return false;
diff --git a/view/tpl/smarty3/event_head.tpl b/view/tpl/smarty3/event_head.tpl
index 6cbb98ae7..e0b9b4e4c 100644
--- a/view/tpl/smarty3/event_head.tpl
+++ b/view/tpl/smarty3/event_head.tpl
@@ -12,7 +12,7 @@
$.get(
'{{$baseurl}}/events/?id='+eventid,
function(data){
- $.fancybox(data);
+ $.prettyPhoto(data);
}
);
}
diff --git a/view/tpl/smarty3/jot-header.tpl b/view/tpl/smarty3/jot-header.tpl
index ab22b3775..ae0ccc8e8 100644
--- a/view/tpl/smarty3/jot-header.tpl
+++ b/view/tpl/smarty3/jot-header.tpl
@@ -18,9 +18,9 @@ function initEditor(cb){
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true;
- $("a#jot-perms-icon").prettyPhoto({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
});
$(".jothidden").show();
if (typeof cb!="undefined") cb();
@@ -93,10 +93,10 @@ function initEditor(cb){
editor = true;
// setup acl popup
- $("a#jot-perms-icon").prettyPhoto({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
- });
+ $("a#jot-perms-icon").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
+ });
} else {
if (typeof cb!="undefined") cb();
}
@@ -257,7 +257,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);
})
@@ -275,7 +275,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/tpl/smarty3/oembed_video.tpl b/view/tpl/smarty3/oembed_video.tpl
index bdfa11509..5c339a290 100644
--- a/view/tpl/smarty3/oembed_video.tpl
+++ b/view/tpl/smarty3/oembed_video.tpl
@@ -3,7 +3,12 @@
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
+<script type="text/javascript" charset="utf-8">
+ $(document).ready(function(){
+ $("a[rel^='prettyPhoto']").prettyPhoto();
+ });
+</script>
<a href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); return false;' style='float:left; margin: 1em; position: relative;'>
- <img width='{{$tw}}' height='{{$th}}' src='{{$turl}}' >
+ <img width='{{$tw}}' height='{{$th}}' src='{{$turl}}'>
<div style='position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url({{$baseurl}}/images/icons/48/play.png) no-repeat center center;'></div>
</a>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 00:26:43 +0000