aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/js/main.js6
-rw-r--r--view/php/theme_init.php3
-rw-r--r--view/theme/redbasic/css/style.css2
-rwxr-xr-xview/tpl/admin_site.tpl8
4 files changed, 9 insertions, 10 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 80518768e..64e9e06f1 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -269,9 +269,9 @@
}
// fancyboxes
- $("a.popupbox").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic'
+ // Is this actually used anywhere?
+ $("a.popupbox").colorbox({
+ 'transition' : 'elastic'
});
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 5987835ac..93a07ed5f 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -2,7 +2,6 @@
require_once('include/plugin.php');
-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/jRange/jquery.range.css');
@@ -23,7 +22,7 @@ head_add_js('jquery.spin.js');
head_add_js('jquery.textinputs.js');
head_add_js('autocomplete.js');
head_add_js('library/jquery-textcomplete/jquery.textcomplete.js');
-head_add_js('library/fancybox/jquery.fancybox-1.3.4.js');
+head_add_js('library/colorbox/jquery.colorbox.js');
head_add_js('library/jquery.timeago.js');
head_add_js('library/readmore.js/readmore.js');
head_add_js('library/jquery_ac/friendica.complete.js');
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 7a6ceb968..c37d29d40 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1028,7 +1028,7 @@ footer {
background: none repeat scroll 0% 0% $cal_bgcolour !important;
}
-#fancybox-content {
+#colorbox {
border: 0px solid $fancybox_bgcolour;
background-color: $fancybox_bgcolour;
}
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 0003ddfc0..caeddeecb 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -1,15 +1,15 @@
<script>
$(function(){
- $("#cnftheme").fancybox({
+ $("#cnftheme").colorbox({
width: 800,
- autoDimensions: false,
- onStart: function(){
+ onLoad: function(){
var theme = $("#id_theme :selected").val();
$("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
},
onComplete: function(){
- $("div#fancybox-content form").submit(function(e){
+ $(this).colorbox.resize();
+ $("#colorbox form").submit(function(e){
var url = $(this).attr('action');
// can't get .serialize() to work...
var data={};