From 707a5dbae7fa895186d73abd22486dab33710dc6 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 10 Apr 2012 05:48:42 -0400 Subject: [PATCH] aaah, nice asides ;). we'll be updating these soon Signed-off-by: Simon L'nu --- view/theme/dispy-dark/communityhome.tpl | 4 +- view/theme/dispy-dark/default.php | 9 +- view/theme/dispy-dark/style.css | 4 +- view/theme/dispy-dark/theme.php | 238 ++++++++++++------------ view/theme/dispy/communityhome.tpl | 4 +- view/theme/dispy/default.php | 9 +- view/theme/dispy/nav.tpl | 3 - view/theme/dispy/style.css | 4 +- view/theme/dispy/theme.php | 231 ++++++++++++----------- view/theme/dispy/wall_item.tpl | 19 +- view/theme/dispy/wallwall_item.tpl | 21 +-- 11 files changed, 278 insertions(+), 268 deletions(-) diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl index 340b7216cf..edabab6110 100644 --- a/view/theme/dispy-dark/communityhome.tpl +++ b/view/theme/dispy-dark/communityhome.tpl @@ -37,10 +37,8 @@ {{ endif }} -{{ if $lastusers_title }} -

PostIt to Friendica

'PostIt' to Friendica

Post to Friendica from anywhere by bookmarking this link.

-{{ endif }} diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php index e74ec1a4f9..24df92a722 100644 --- a/view/theme/dispy-dark/default.php +++ b/view/theme/dispy-dark/default.php @@ -7,13 +7,18 @@ -

+ -

+ diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index a3248c13c2..a6e0c94f5e 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -2603,8 +2603,8 @@ div[id$="wrapper"] br { } .icon.drop, .icon.drophide, .icon.delete { - float: right; - margin: 5px; + float: left; + /*margin: 5px;*/ } .icon.s22.delete { display: block; diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index e1dc8ba0c6..c9028b9a9a 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -3,126 +3,135 @@ /* * Name: Dispy Dark * Description: Dispy Dark, Friendica theme - * Version: 1.0 + * Version: 1.1 * Author: Simon * Maintainer: Simon * Screenshot: Screenshot */ +$a = get_app(); $a->theme_info = array( - 'extends' => 'dispy-dark', + 'name' => 'dispy-dark', + 'version' => '1.1' ); -$a->page['htmlhead'] .= <<< EOT - + EOT; +} -function dispydark_community_info() { +function dispy_dark_community_info() { $a = get_app(); + $url = $a->get_baseurl($ssl_state); + $aside['$url'] = $url; - $aside['$lastusers_title'] = t('Last users'); - $aside['$lastusers_items'] = array(); - $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); - - $fostitJS = "javascript: (function() { - the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + + $fpostitJS = <<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)); @@ -135,18 +144,11 @@ function dispydark_community_info() { } else { a_funct(); } - })();"; + })(); +FPI; - $aside['$fostitJS'] = $fostitJS; - $url = $a->get_baseurl($ssl_state); - $aside['$url'] = $url; - - $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['aside_bottom'] = replace_macros($tpl, $aside); + $aside['$fpostitJS'] = $fpostitJS; + $tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl'); + return $a->page['aside_bottom'] = replace_macros($tpl, $aside); } -// aside on profile page -//if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { - dispydark_community_info(); -//} - diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl index 340b7216cf..edabab6110 100644 --- a/view/theme/dispy/communityhome.tpl +++ b/view/theme/dispy/communityhome.tpl @@ -37,10 +37,8 @@ {{ endif }} -{{ if $lastusers_title }} -

PostIt to Friendica

'PostIt' to Friendica

Post to Friendica from anywhere by bookmarking this link.

-{{ endif }} diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php index e74ec1a4f9..24df92a722 100644 --- a/view/theme/dispy/default.php +++ b/view/theme/dispy/default.php @@ -7,13 +7,18 @@ -

+ -

+ diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index e38b2bbe2f..34aba50de3 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -56,7 +56,6 @@ works --> {{ endif }} - {{ if $nav.contacts }}

$nav.contacts.1

{{ endif }} @@ -75,11 +74,9 @@ works --> {{ if $nav.admin }}

$nav.admin.1

{{ endif }} - {{ if $nav.login }}

{{ endif }} - {{ if $nav.logout }}

$nav.logout.1

{{ endif }} diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 622cf57341..0c162b4608 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -2603,8 +2603,8 @@ div[id$="wrapper"] br { } .icon.drop, .icon.drophide, .icon.delete { - float: right; - margin: 5px; + float: left; + /*margin: 5px;*/ } .icon.s22.delete { display: block; diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index d0f6797cba..5df193aa60 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -3,122 +3,135 @@ /* * Name: Dispy * Description: Dispy, Friendica theme - * Version: 1.0 + * Version: 1.1 * Author: unknown * Maintainer: Simon * Screenshot: Screenshot */ +$a = get_app(); $a->theme_info = array( - 'extends' => 'dispy', + 'name' => 'dispy', + 'version' => '1.1' ); -$a->page['htmlhead'] .= <<< EOT - + EOT; +} function dispy_community_info() { $a = get_app(); + $url = $a->get_baseurl($ssl_state); + $aside['$url'] = $url; - $fostitJS = "javascript: (function() { - the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' + + $fpostitJS = <<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)); @@ -131,17 +144,11 @@ function dispy_community_info() { } else { a_funct(); } - })();"; + })(); +FPI; - $aside['$fostitJS'] = $fostitJS; - $url = $a->get_baseurl($ssl_state); - $aside['$url'] = $url; - - $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['aside_bottom'] = replace_macros($tpl, $aside); + $aside['$fpostitJS'] = $fpostitJS; + $tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl'); + return $a->page['aside_bottom'] = replace_macros($tpl, $aside); } -// aside on profile page -if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) { - dispy_community_info(); -} diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 8acaeaf027..52af07532b 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -4,9 +4,7 @@