From 7b15f27ba48f5a1b0e24290379e2524796776803 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 16 Mar 2012 13:31:59 -0400 Subject: weee, dispys get another update Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) (limited to 'view/theme/dispy/theme.php') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index cbfcb09e6..ac97948a3 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -64,7 +64,7 @@ $(document).ready(function() { $('#drop-' + id).addClass('iconspacer'); } ); - // notifications + // click outside notifications menu closes it $('html').click(function() { $('#nav-notifications-linkmenu').removeClass('selected'); document.getElementById("nav-notifications-menu").style.display = "none"; @@ -74,16 +74,7 @@ $(document).ready(function() { event.stopPropagation(); }); - // usermenu - $('html').click(function() { - $('#nav-user-linkmenu').removeClass('selected'); - document.getElementById("nav-user-menu").style.display = "none"; - }); - - $('#nav-user-linkmenu').click(function(event) { - event.stopPropagation(); - }); - + // main function in toolbar functioning function toggleToolbar() { if ( $('#nav-floater').is(':visible') ) { $('#nav-floater').slideUp('fast'); @@ -97,17 +88,35 @@ $(document).ready(function() { }); } }; + // our trigger for the toolbar button $('.floaterflip').click(function() { toggleToolbar(); return false; }); -}); - - EOT; + -- cgit v1.2.3 From 91fee866b7f870b66d770c7c4e6db0afd874de33 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 16 Mar 2012 16:43:34 -0400 Subject: make profiles-menu disappear when clicked outside it Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'view/theme/dispy/theme.php') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index ac97948a3..9f0fcba82 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -73,6 +73,15 @@ $(document).ready(function() { $('#nav-notifications-linkmenu').click(function(event) { event.stopPropagation(); }); + // click outside profiles menu closes it + $('html').click(function() { + $('#profiles-menu-trigger').removeClass('selected'); + document.getElementById("profiles-menu").style.display = "none"; + }); + + $('#profiles-menu').click(function(event) { + event.stopPropagation(); + }); // main function in toolbar functioning function toggleToolbar() { -- cgit v1.2.3 From 75883b196ed222b9972c87ce00b8e7c2ab29c05e Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 16 Mar 2012 21:23:24 -0400 Subject: remove auto-complete from darkzero-NS, dispys, since the comment one is now global Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 3 --- 1 file changed, 3 deletions(-) (limited to 'view/theme/dispy/theme.php') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 9f0fcba82..26e07b1f7 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -108,9 +108,6 @@ $(document).ready(function() { $(this).css({color: '#eec'}); }); - // make auto-complete work in more places - $(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl"); - /* $('#profile-photo-wrapper').mouseover(function() { $('.profile-edit-side-div').css({display: 'block'}); }).mouseout(function() { -- cgit v1.2.3 From 1d56224b08fe9781a050143f14c45fd518c5ca93 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 25 Mar 2012 01:12:28 -0400 Subject: increase version to 1.0 for dispys \o/ Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/dispy/theme.php') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 26e07b1f7..e3f8f5b45 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -3,7 +3,7 @@ /* * Name: Dispy * Description: Dispy, Friendica theme - * Version: 0.9 + * Version: 1.0 * Author: unknown * Maintainer: Simon */ -- cgit v1.2.3 From 2c4312012995aa3411cf5e5dbd0eb934a0801797 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 25 Mar 2012 03:22:16 -0400 Subject: dispy-dark not experimental. start implementing fpostit Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'view/theme/dispy/theme.php') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index e3f8f5b45..e898346ef 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -6,6 +6,7 @@ * Version: 1.0 * Author: unknown * Maintainer: Simon + * Screenshot: Screenshot */ @@ -126,3 +127,30 @@ $(document).ready(function() { EOT; +function dispy_community_info() { + $a = get_app(); + + $fostitJS = "javascript: (function() { + 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')) { + location.href = the_url; + } + if (/Firefox/.test(navigator.userAgent)) { + setTimeout(a_funct, 0) + } 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['right_aside'] = replace_macros($tpl, $aside); +} + -- cgit v1.2.3 From 3d62cb97822e0bd9e5be0c404664667cb7cb8d98 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 25 Mar 2012 17:13:24 -0400 Subject: minor fix to dispy theme.php Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/dispy/theme.php') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index e898346ef..3fa9a3353 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -131,7 +131,7 @@ function dispy_community_info() { $a = get_app(); $fostitJS = "javascript: (function() { - the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + + 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)); -- cgit v1.2.3 From 3d11c22b01e1581b4606312dcc38dfd7b7906502 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 25 Mar 2012 22:45:44 -0400 Subject: add in the search box Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/dispy/theme.php') diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 3fa9a3353..9db77d7f3 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -151,6 +151,6 @@ function dispy_community_info() { $aside['$url'] = $url; $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['right_aside'] = replace_macros($tpl, $aside); + $a->page['aside'] = replace_macros($tpl, $aside); } -- cgit v1.2.3 From c3388ad81336d45a40a66b69096f504ffa7e34cb Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 27 Mar 2012 04:40:31 -0400 Subject: more fixes for dispys Signed-off-by: Simon L'nu --- view/theme/dispy/theme.php | 7 ++++++- 1 file changed, 6 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 9db77d7f3..db8cf5ccd 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -6,7 +6,7 @@ * Version: 1.0 * Author: unknown * Maintainer: Simon - * Screenshot: Screenshot + * Screenshot: Screenshot */ @@ -154,3 +154,8 @@ function dispy_community_info() { $a->page['aside'] = replace_macros($tpl, $aside); } +//right_aside at profile pages +if ($a->argv[0] === "profile") { + // COMMUNITY + dispy_community_info(); +} -- cgit v1.2.3 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