From f1db6907860efcd4f48380bb8c0f88272adb91a8 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 8 Apr 2012 13:49:52 -0400 Subject: [PATCH 1/6] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: prepare for using a master theme_init() provide theme_init() functions rev updates API: API is now enhanced. mentions, repeat and destroy now works. "vier": Some design stuff "vier": Bookmarks now look better. API: template for test function added The "vier"-theme is now working again. But there is still work needed New script that checks if a script is running poller: An optional lockfile is used to check if the poller is already running Several improvements * master: From 707a5dbae7fa895186d73abd22486dab33710dc6 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 10 Apr 2012 05:48:42 -0400 Subject: [PATCH 2/6] 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 | 224 ++++++++++++------------ 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 | 217 ++++++++++++----------- view/theme/dispy/wall_item.tpl | 19 +- view/theme/dispy/wallwall_item.tpl | 21 ++- 11 files changed, 264 insertions(+), 254 deletions(-) diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl index 340b7216c..edabab611 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 e74ec1a4f..24df92a72 100644 --- a/view/theme/dispy-dark/default.php +++ b/view/theme/dispy-dark/default.php @@ -7,13 +7,18 @@ -