friendica
/
friendicablog
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move to colorbox

This commit is contained in:
fabrixxm 2013-02-11 15:19:40 -05:00
parent a8c9d81ad0
commit 2b1dc3576f
5 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
view/theme/blog/admin_aside.tpl
View File

@ -27,18 +27,23 @@
</ul>
{{ endif }}
</div>
{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }}
{{ if $admin.plugins_admin }}
<div class="widget">
<h3>$plugadmtxt</h3>
<ul class='admin linklist'>
{{ for $admin.plugins_admin as $l }}
<li class='admin link button $l.2'><a href='$l.0'>$l.1</a></li>
{{ endfor }}
</ul>
</div>
{{ endif }}
<div class="widget">
<h3>$logtxt</h3>
<ul class='admin linklist'>
<li class='admin link button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
</ul>
</div>
</div>

46
view/theme/blog/jot-header.tpl
View File

@ -13,13 +13,17 @@ function initEditor(cb){
$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true;
$("a#jot-perms-icon").fancybox({
transitionIn : 'elastic',
transitionOut : 'elastic',
afterClose : function() {
$.fancybox("#profile-jot-wrapper");
}
});
$("a#jot-perms-icon").colorbox({
href:$("a#jot-perms-icon").attr('href'),
inline: true,
onClosed : function() {
$.colorbox({
href:"#profile-jot-wrapper",
inline: true,
open: true
});
}
});
$(".jothidden").show();
if (typeof cb!="undefined") cb();
return;
@ -108,12 +112,16 @@ function initEditor(cb){
});
editor = true;
// setup acl popup
$("a#jot-perms-icon").fancybox({
transitionIn : 'elastic',
transitionOut : 'elastic',
afterClose : function() {
$.fancybox("#profile-jot-wrapper");
}
$("a#jot-perms-icon").colorbox({
href:$("a#jot-perms-icon").attr('href'),
inline: true,
onClosed : function() {
$.colorbox({
href:"#profile-jot-wrapper",
inline: true,
open: true
});
}
});
} else {
if (typeof cb!="undefined") cb();
@ -133,10 +141,10 @@ function enableOnUser(){
$(document).ready(function() {
$("a.showjot").fancybox({
transitionIn : 'elastic',
transitionOut : 'elastic',
beforeShow : function() {
$("a.showjot").colorbox({
href: $("a.showjot").attr('href'),
inline: true,
onOpen : function() {
enableOnUser();
}
});
@ -288,7 +296,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);
})
@ -306,7 +314,7 @@ function enableOnUser(){
// if(timer) clearTimeout(timer);
// timer = setTimeout(NavUpdate,3000);
liking = 1;
$.fancybox.close();
$.colorbox.close();
} else {
$("#id_term").css("border-color","#FF0000");
}

4
view/theme/blog/jot.tpl
View File

@ -56,9 +56,9 @@
<div id="profile-jot-email-end"></div>
$jotnets
<div class="buttonbar" >
<a href="#" class="button" onclick="$.fancybox.close(); return false;">Ok</a>
<a href="#" class="button" onclick="$.colorbox.close(); return false;">Ok</a>
</div>
</div>
</div>
<a href="#profile-jot-wrapper" class="showjot button">$share</a>
<a href="#profile-jot-wrapper" class="showjot button">$share</a>

2
view/theme/blog/settings.tpl
View File

@ -90,7 +90,7 @@ $group_select
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
$aclselect
<div class="buttonbar" >
<a href="#" class="button" onclick="$.fancybox.close(); return false;">Ok</a>
<a href="#" class="button" onclick="$.colorbox.close(); return false;">Ok</a>
</div>
</div>
</div>

9
view/theme/blog/threaded_conversation.tpl
View File

@ -23,7 +23,12 @@ $live_update
$(document).ready(function(){
// setup reply popup forms
$(".reply-link").fancybox();
$(".reply-link").colorbox({
href: function() {
return $(this).attr('href');
},
inline: true
});
});
</script>
@ -35,4 +40,4 @@ $live_update
$('#li-comment-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);
</script>
{{ endif }}
{{ endif }}