MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
friendica 2012-03-28 05:16:25 -07:00
commit e894775a39
4 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boot.php
View file

@ -563,6 +563,10 @@ function absurl($path) {
return $path;
}
function is_ajax() {
return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
}
// Primarily involved with database upgrade, but also sets the
// base url for use in cmdline programs which don't have

5
mod/viewsrc.php
View file

@ -25,7 +25,12 @@ function viewsrc_content(&$a) {
);
if(count($r))
if(is_ajax()) {
echo str_replace("\n",'<br />',$r[0]['body']);
killme();
} else {
$o .= str_replace("\n",'<br />',$r[0]['body']);
}
return $o;
}

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

@ -91,13 +91,13 @@ $(document).ready(function() {
$('.floaterflip').css({
backgroundPosition: '-210px -60px'
});
$('.search-box').slideDown('fast');
$('.search-box').slideUp('fast');
} else {
$('#nav-floater').slideDown('fast');
$('.floaterflip').css({
backgroundPosition: '-190px -60px'
});
$('.search-box').slideUp('fast');
$('.search-box').slideDown('fast');
}
};
// our trigger for the toolbar button
@ -156,9 +156,6 @@ function dispydark_community_info() {
$a->page['aside_bottom'] = replace_macros($tpl, $aside);
}
// 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") {
dispydark_community_info();

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

@ -91,13 +91,13 @@ $(document).ready(function() {
$('.floaterflip').css({
backgroundPosition: '-210px -60px'
});
$('.search-box').slideDown('fast');
$('.search-box').slideUp('fast');
} else {
$('#nav-floater').slideDown('fast');
$('.floaterflip').css({
backgroundPosition: '-190px -60px'
});
$('.search-box').slideUp('fast');
$('.search-box').slideDown('fast');
}
};
// our trigger for the toolbar button
@ -156,9 +156,6 @@ function dispy_community_info() {
$a->page['aside_bottom'] = replace_macros($tpl, $aside);
}
// 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") {
dispy_community_info();