From bcf8a571f96f1f93ee3d2f8c6a6da7f9d6bd5da8 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 05:52:28 -0400 Subject: add some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broken last push) Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'view/theme/dispy/theme.php') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index db8cf5ccd..d451a6b93 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -132,11 +132,13 @@ function dispy_community_info() { $fostitJS = "javascript: (function() { the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy/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)); + 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')) { + 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)) { @@ -144,18 +146,18 @@ function dispy_community_info() { } else { a_funct(); } - })();" ; + })();"; $aside['$fostitJS'] = $fostitJS; $url = $a->get_baseurl($ssl_state); $aside['$url'] = $url; $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['aside'] = replace_macros($tpl, $aside); + $a->page['aside'] .= replace_macros($tpl, $aside); } -//right_aside at profile pages +//aside at profile pages if ($a->argv[0] === "profile") { - // COMMUNITY dispy_community_info(); } + -- cgit v1.2.3 From 356e654521a3d93e4ba14c4d243df259b0d21c4f Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 06:03:04 -0400 Subject: doh fix Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'view/theme/dispy/theme.php') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index d451a6b93..190872d01 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -91,11 +91,13 @@ $(document).ready(function() { $('.floaterflip').css({ backgroundPosition: '-210px -60px' }); + $('.search-box').slideDown('fast'); } else { $('#nav-floater').slideDown('fast'); $('.floaterflip').css({ backgroundPosition: '-190px -60px' }); + $('.search-box').slideUp('fast'); } }; // our trigger for the toolbar button @@ -131,14 +133,12 @@ function dispy_community_info() { $a = get_app(); $fostitJS = "javascript: (function() { - the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy/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)); + the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/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') ) { + 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)) { @@ -153,11 +153,13 @@ function dispy_community_info() { $aside['$url'] = $url; $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") { dispy_community_info(); } - -- cgit v1.2.3 From 3d5e711780391fece27af1aaf915b81aca7536fe Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 06:20:13 -0400 Subject: WITH is going on? Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view/theme/dispy/theme.php') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 190872d01..15e54f7e2 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -157,7 +157,8 @@ function dispy_community_info() { } // use our 'default.php' instead of the system-wide one -$a->page['template'] = "theme/dispy-dark/default"; +$theme_name = 'dispy'; +//$a->page['template'] = "theme/dispy/default"; // aside on profile page if ($a->argv[0] === "profile") { -- cgit v1.2.3 From 4a75ea2f42c44318fa018a0753c54e0a7ce42188 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 28 Mar 2012 06:47:38 -0400 Subject: really fix it this time... Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'view/theme/dispy/theme.php') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 15e54f7e2..9789fd0fa 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -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,10 +156,6 @@ function dispy_community_info() { $a->page['aside_bottom'] = replace_macros($tpl, $aside); } -// use our 'default.php' instead of the system-wide one -$theme_name = 'dispy'; -//$a->page['template'] = "theme/dispy/default"; - // aside on profile page if ($a->argv[0] === "profile") { dispy_community_info(); -- cgit v1.2.3