aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy/theme.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-15 16:49:54 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-15 16:49:54 +0200
commita147d6113c081694d4209002fa5e57106d4c6f41 (patch)
treede6f940efa0439ab3d54ff7d280e221b7b59d348 /view/theme/dispy/theme.php
parente825a73f1de308b6ae0ae3cc5549263704a14594 (diff)
parentf994f9abc6092106659a29f5ee1be0706825c203 (diff)
downloadvolse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.tar.gz
volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.tar.bz2
volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.zip
Merge commit 'upstream/master'
Diffstat (limited to 'view/theme/dispy/theme.php')
-rw-r--r--view/theme/dispy/theme.php41
1 files changed, 21 insertions, 20 deletions
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 8af61d78b..125910593 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -76,7 +76,7 @@ function dispy_init(&$a) {
// click outside notifications menu closes it
$('html').click(function() {
$('#nav-notifications-linkmenu').removeClass('selected');
- document.getElementById("nav-notifications-menu").style.display = "none";
+ $('#nav-notifications-menu').css({display: 'none'});
});
$('#nav-notifications-linkmenu').click(function(event) {
@@ -85,7 +85,7 @@ function dispy_init(&$a) {
// click outside profiles menu closes it
$('html').click(function() {
$('#profiles-menu-trigger').removeClass('selected');
- document.getElementById("profiles-menu").style.display = "none";
+ $('#profiles-menu').css({display: 'none'});
});
$('#profiles-menu').click(function(event) {
@@ -120,7 +120,7 @@ function dispy_init(&$a) {
});
$('a[href=#top]').click(function() {
- $('html, body').animate({scrollTop:0}, '500');
+ $('html, body').animate({scrollTop:0}, 'slow');
return false;
});
@@ -138,6 +138,8 @@ function dispy_init(&$a) {
});
</script>
EOT;
+
+ js_in_foot();
}
function dispy_community_info() {
@@ -145,26 +147,25 @@ function dispy_community_info() {
$url = $a->get_baseurl($ssl_state);
$aside['$url'] = $url;
- $fpostitJS = <<<FPI
- javascript: (function() {
- the_url = ' . $url . '/view/theme/' . $a->theme_info['name'] . '/fpostit/fpostit.php?url=' +
- encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
- encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
- document.getSelection() : document.selection.createRange().text));
- a_funct = function() {
- if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) {
- location.href = the_url;
- }
- if (/Firefox/.test(navigator.userAgent)) {
- setTimeout(a_funct, 0)
- } else {
- a_funct();
- }
- })();
-FPI;
+ $fpostitJS = "javascript:(function() {"
+ . "the_url = '" . $url . "/view/theme/".$a->theme_info['name']."/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
+ a_funct = function() {
+ if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url;};
+ if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0);}
+ else {a_funct();}})()";
$aside['$fpostitJS'] = $fpostitJS;
$tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
}
+function js_in_foot() {
+ /** @purpose insert stuff in bottom of page
+ */
+ $a = get_app();
+ $baseurl = $a->get_baseurl($ssl_state);
+ $bottom['$baseurl'] = $baseurl;
+ $tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
+
+ return $a->page['bottom'] = replace_macros($tpl, $bottom);
+}