keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #180 from simonlnu/master

Browse source 
duh...
This commit is contained in:
Simon 2012-03-28 03:03:47 -07:00
commit c32ee4d226
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
view/theme/dispy-dark/theme.php
View file

@ -146,7 +146,7 @@ function dispydark_community_info() {
} else { } else {
a_funct(); a_funct();
} }
})();" ; })();";
$aside['$fostitJS'] = $fostitJS; $aside['$fostitJS'] = $fostitJS;
$url = $a->get_baseurl($ssl_state); $url = $a->get_baseurl($ssl_state);

22
view/theme/dispy/theme.php
View file

@ -91,11 +91,13 @@ $(document).ready(function() {
$('.floaterflip').css({ $('.floaterflip').css({
backgroundPosition: '-210px -60px' backgroundPosition: '-210px -60px'
}); });
$('.search-box').slideDown('fast');
} else { } else {
$('#nav-floater').slideDown('fast'); $('#nav-floater').slideDown('fast');
$('.floaterflip').css({ $('.floaterflip').css({
backgroundPosition: '-190px -60px' backgroundPosition: '-190px -60px'
}); });
$('.search-box').slideUp('fast');
} }
}; };
// our trigger for the toolbar button // our trigger for the toolbar button
@ -131,14 +133,12 @@ function dispy_community_info() {
$a = get_app(); $a = get_app();
$fostitJS = "javascript: (function() { $fostitJS = "javascript: (function() {
the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy/fpostit/fpostit.php?url=' + the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' +
encodeURIComponent(window.location.href) + '&title=' encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
+ encodeURIComponent(document.title) + '&text=' encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
+ encodeURIComponent('' + (window.getSelection document.getSelection() : document.selection.createRange().text));
? window.getSelection() : document.getSelection
? document.getSelection() : document.selection.createRange().text));
a_funct = function() { a_funct = function() {
if ( !window.open(the_url, 'fpostit', 'location=yes, links=no, scrollbars=no, toolbar=no, width=600, height=300') ) { if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) {
location.href = the_url; location.href = the_url;
} }
if (/Firefox/.test(navigator.userAgent)) { if (/Firefox/.test(navigator.userAgent)) {
@ -153,11 +153,13 @@ function dispy_community_info() {
$aside['$url'] = $url; $aside['$url'] = $url;
$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
$a->page['aside'] .= replace_macros($tpl, $aside); $a->page['aside_bottom'] = replace_macros($tpl, $aside);
} }
//aside at profile pages // use our 'default.php' instead of the system-wide one
$a->page['template'] = "theme/dispy-dark/default";
// aside on profile page
if ($a->argv[0] === "profile") { if ($a->argv[0] === "profile") {
dispy_community_info(); dispy_community_info();
} }