Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-17 04:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

finish updating themes for colorbox

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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/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>

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

@ -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" />

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

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

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

@ -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");
}

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

@ -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>-->

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}}/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>

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

@ -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" />

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

@ -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>-->