From fc61616c53181a0484d773a08f9b0411896a5064 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 24 Apr 2012 08:12:30 +0200 Subject: events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id]) --- boot.php | 8 ++-- view/event_head.tpl | 127 +++++++++++++++++++++++++++++----------------------- 2 files changed, 75 insertions(+), 60 deletions(-) diff --git a/boot.php b/boot.php index d2758c643..f024d64ce 100644 --- a/boot.php +++ b/boot.php @@ -1249,11 +1249,11 @@ if(! function_exists('get_events')) { $o .= '
'; foreach($r as $rr) { - if($rr['adjust']) - $md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m\#\l\i\n\k\-j'); + $md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m'); else - $md = datetime_convert('UTC','UTC',$rr['start'],'Y/m\#\l\i\n\k\-j'); + $md = datetime_convert('UTC','UTC',$rr['start'],'Y/m'); + $md .= "/#link-".$rr['id']; $title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... '; if(! $title) @@ -1262,7 +1262,7 @@ if(! function_exists('get_events')) { $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']); $today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false); - $o .= '
' . $title . '' + $o .= '
' . $title . '' . day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : '') . '
' ; } diff --git a/view/event_head.tpl b/view/event_head.tpl index 97201e722..471748b97 100644 --- a/view/event_head.tpl +++ b/view/event_head.tpl @@ -3,8 +3,17 @@ src="$baseurl/library/fullcalendar/fullcalendar.min.js"> - -- cgit v1.2.3 From 62ad5043d639c839ce4ae85f80f9cc5aed880d39 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 24 Apr 2012 09:50:10 +0200 Subject: remove html from get_birthdays() and get_events() --- boot.php | 56 ++++++++++++++++++++++++++------------------- view/birthdays_reminder.tpl | 10 ++++++++ view/events_reminder.tpl | 10 ++++++++ 3 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 view/birthdays_reminder.tpl create mode 100644 view/events_reminder.tpl diff --git a/boot.php b/boot.php index f024d64ce..7584c1c5b 100644 --- a/boot.php +++ b/boot.php @@ -1174,11 +1174,7 @@ if(! function_exists('get_birthdays')) { } $classtoday = $istoday ? ' birthday-today ' : ''; if($total) { - $o .= '
' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '
'; - $o .= '
'; } } - return $o; + $tpl = get_markup_template("birthdays_reminder.tpl"); + return replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), + '$classtoday' => $classtoday, + '$count' => $total, + '$event_reminders' => t('Birthday Reminders'), + '$event_title' => t('Birthdays this week:'), + '$events' => $r, + )); } } @@ -1215,7 +1220,6 @@ if(! function_exists('get_events')) { require_once('include/bbcode.php'); $a = get_app(); - $o = ''; if(! local_user()) return $o; @@ -1242,13 +1246,10 @@ if(! function_exists('get_events')) { if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) $istoday = true; } - $classtoday = (($istoday) ? ' event-today ' : ''); + $classtoday = (($istoday) ? 'event-today' : ''); - $o .= '
' . t('Event Reminders') . ' ' . '(' . count($r) . ')' . '
'; - $o .= ''; } - return $o; + $tpl = get_markup_template("events_reminder.tpl"); + return replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), + '$classtoday' => $classtoday, + '$count' => count($r), + '$event_reminders' => t('Event Reminders'), + '$event_title' => t('Events this week:'), + '$events' => $r, + )); } } diff --git a/view/birthdays_reminder.tpl b/view/birthdays_reminder.tpl new file mode 100644 index 000000000..c0422c1d7 --- /dev/null +++ b/view/birthdays_reminder.tpl @@ -0,0 +1,10 @@ +{{ if $count }} +
$event_reminders ($count)
+ +{{ endif }} + diff --git a/view/events_reminder.tpl b/view/events_reminder.tpl new file mode 100644 index 000000000..fe7e33980 --- /dev/null +++ b/view/events_reminder.tpl @@ -0,0 +1,10 @@ +{{ if $count }} + + +{{ endif }} + -- cgit v1.2.3 From c9a8dbc322fbbd595a0e9a74a8fa68ddc1c187f6 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 24 Apr 2012 09:50:44 +0200 Subject: quattro: small week calendar view for event/birthday reminders --- view/theme/quattro/birthdays_reminder.tpl | 1 + view/theme/quattro/events_reminder.tpl | 39 +++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 view/theme/quattro/birthdays_reminder.tpl create mode 100644 view/theme/quattro/events_reminder.tpl diff --git a/view/theme/quattro/birthdays_reminder.tpl b/view/theme/quattro/birthdays_reminder.tpl new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/view/theme/quattro/birthdays_reminder.tpl @@ -0,0 +1 @@ + diff --git a/view/theme/quattro/events_reminder.tpl b/view/theme/quattro/events_reminder.tpl new file mode 100644 index 000000000..fc13fa68b --- /dev/null +++ b/view/theme/quattro/events_reminder.tpl @@ -0,0 +1,39 @@ + + + +
+
-- cgit v1.2.3 From fbdb8fc43a3cb03f25102f15a1deaf8408e9122a Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 24 Apr 2012 01:02:22 -0700 Subject: fix tags test with new url --- tests/get_tags_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php index e5c6485de..40f016747 100644 --- a/tests/get_tags_test.php +++ b/tests/get_tags_test.php @@ -202,8 +202,8 @@ class GetTagsTest extends PHPUnit_Framework_TestCase { } $this->assertEquals("cid:15", $inform); - $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?search=test%20case]test case[/url]", $str_tags); - $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?search=test%20case]test case[/url]", $text); + $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?tag=test%20case]test case[/url]", $str_tags); + $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?tag=test%20case]test case[/url]", $text); } -- cgit v1.2.3 From fade45ca767cbb8dbd73f8cf2b92a1607418bab4 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 24 Apr 2012 20:00:49 +0100 Subject: Diabook-dark, couple of new icons, and another css fix. --- view/theme/diabook/diabook-dark/icons/pencil.png | Bin 286 -> 567 bytes view/theme/diabook/diabook-dark/icons/pencil2.png | Bin 384 -> 567 bytes view/theme/diabook/diabook-dark/icons/scroll_top.png | Bin 296 -> 1062 bytes view/theme/diabook/diabook-dark/style-network.css | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/diabook/diabook-dark/icons/pencil.png b/view/theme/diabook/diabook-dark/icons/pencil.png index 772e49b17..cc316a7de 100644 Binary files a/view/theme/diabook/diabook-dark/icons/pencil.png and b/view/theme/diabook/diabook-dark/icons/pencil.png differ diff --git a/view/theme/diabook/diabook-dark/icons/pencil2.png b/view/theme/diabook/diabook-dark/icons/pencil2.png index 3b47d1864..791433db7 100644 Binary files a/view/theme/diabook/diabook-dark/icons/pencil2.png and b/view/theme/diabook/diabook-dark/icons/pencil2.png differ diff --git a/view/theme/diabook/diabook-dark/icons/scroll_top.png b/view/theme/diabook/diabook-dark/icons/scroll_top.png index 0e7f7ae6a..fe20d1c4c 100644 Binary files a/view/theme/diabook/diabook-dark/icons/scroll_top.png and b/view/theme/diabook/diabook-dark/icons/scroll_top.png differ diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css index d236297b7..7ddedb320 100644 --- a/view/theme/diabook/diabook-dark/style-network.css +++ b/view/theme/diabook/diabook-dark/style-network.css @@ -493,7 +493,7 @@ code { float: right; } .tool a { - color: #3465a4; + color: #88a9d2; } .tool a:hover { text-decoration: none; -- cgit v1.2.3 From a28fea987ef35220c654ebcba675efcc0f54264b Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 24 Apr 2012 20:07:08 +0100 Subject: Diabook-dark css fix --- view/theme/diabook/diabook-dark/style-profile.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css index 8824d18fe..b052b77ff 100644 --- a/view/theme/diabook/diabook-dark/style-profile.css +++ b/view/theme/diabook/diabook-dark/style-profile.css @@ -440,7 +440,7 @@ a:hover { clear: both; } .fakelink { - color: #1872A2; + color: #88a9d2; /* color: #3e3e8c; */ text-decoration: none; cursor: pointer; @@ -493,7 +493,7 @@ code { float: right; } .tool a { - color: ##3F8FBA; + color: ##3465a4; } .tool a:hover { text-decoration: none; @@ -1261,7 +1261,7 @@ transition: all 0.2s ease-in-out; padding-top: 10px; } .tread-wrapper a{ - color: #1872A2; + color: #88a9d2; } .wall-item-decor { -- cgit v1.2.3 From 08b990a314286d12cd39e4c90a69c2ffd33d10dc Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 25 Apr 2012 00:19:57 +0200 Subject: diabook-themes: small fix --- view/theme/diabook/icons/scroll_bottom.png | Bin 0 -> 444 bytes view/theme/diabook/nav.tpl | 2 +- view/theme/diabook/theme.php | 37 +++++++++++++++++++++++------ 3 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 view/theme/diabook/icons/scroll_bottom.png diff --git a/view/theme/diabook/icons/scroll_bottom.png b/view/theme/diabook/icons/scroll_bottom.png new file mode 100644 index 000000000..eba301b34 Binary files /dev/null and b/view/theme/diabook/icons/scroll_bottom.png differ diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index e0ffa4f7b..ce27400f6 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -136,7 +136,7 @@ - +
$langselector
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 269015d0a..073e270ef 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -356,25 +356,48 @@ $(document).ready(function() { $(this).attr("src",newString+"?"+wmode+"&"+oldString); } else $(this).attr("src",ifr_source+"?"+wmode); + }); - - $("a[href=#top]").click(function() { - $("html, body").animate({scrollTop:0}, "slow"); - return false; - }); - }); function yt_iframe() { - $("iframe").load(function() { var ifr_src = $(this).contents().find("body iframe").attr("src"); $("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent"); }); }; + +function scrolldown(){ + $("html, body").animate({scrollTop:$(document).height()}, "slow"); + return false; + }; + +function scrolltop(){ + $("html, body").animate({scrollTop:0}, "slow"); + return false; + }; + +$(window).scroll(function () { + + + var scrollInfo = $(window).scrollTop(); + + if (scrollInfo <= "900"){ + $("a#top").attr("id","down"); + $("a#down").attr("onclick","scrolldown()"); + $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png"); + } + + if (scrollInfo > "900"){ + $("a#down").attr("id","top"); + $("a#top").attr("onclick","scrolltop()"); + $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png"); + } + + }); '; -- cgit v1.2.3 From e72eaf24086a6f8c8b6f315ca8f404444b02d210 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 25 Apr 2012 02:43:50 +0200 Subject: zero-themes: add bbcode-toolbar to commentbox --- view/theme/darkzero-NS/comment_item.tpl | 59 +++++++++++++++++++++++++ view/theme/darkzero-NS/editicons.png | Bin 0 -> 6300 bytes view/theme/darkzero-NS/theme.php | 35 +++++++++++++++ view/theme/darkzero/comment_item.tpl | 59 +++++++++++++++++++++++++ view/theme/darkzero/editicons.png | Bin 0 -> 6300 bytes view/theme/darkzero/theme.php | 36 +++++++++++++++ view/theme/duepuntozero/comment_item.tpl | 59 +++++++++++++++++++++++++ view/theme/duepuntozero/editicons.png | Bin 0 -> 6300 bytes view/theme/duepuntozero/style.css | 73 +++++++++++++++++++++++++++++++ view/theme/duepuntozero/theme.php | 35 +++++++++++++++ view/theme/greenzero/comment_item.tpl | 59 +++++++++++++++++++++++++ view/theme/greenzero/editicons.png | Bin 0 -> 6300 bytes view/theme/greenzero/theme.php | 35 +++++++++++++++ view/theme/purplezero/comment_item.tpl | 59 +++++++++++++++++++++++++ view/theme/purplezero/editicons.png | Bin 0 -> 6300 bytes view/theme/purplezero/theme.php | 35 +++++++++++++++ view/theme/slack-NS/comment_item.tpl | 59 +++++++++++++++++++++++++ view/theme/slack-NS/editicons.png | Bin 0 -> 6300 bytes view/theme/slack-NS/theme.php | 35 +++++++++++++++ view/theme/slackr/comment_item.tpl | 59 +++++++++++++++++++++++++ view/theme/slackr/editicons.png | Bin 0 -> 6300 bytes view/theme/slackr/theme.php | 35 +++++++++++++++ 22 files changed, 732 insertions(+) create mode 100755 view/theme/darkzero-NS/comment_item.tpl create mode 100644 view/theme/darkzero-NS/editicons.png create mode 100755 view/theme/darkzero/comment_item.tpl create mode 100644 view/theme/darkzero/editicons.png create mode 100755 view/theme/duepuntozero/comment_item.tpl create mode 100644 view/theme/duepuntozero/editicons.png create mode 100755 view/theme/greenzero/comment_item.tpl create mode 100644 view/theme/greenzero/editicons.png create mode 100755 view/theme/purplezero/comment_item.tpl create mode 100644 view/theme/purplezero/editicons.png create mode 100755 view/theme/slack-NS/comment_item.tpl create mode 100644 view/theme/slack-NS/editicons.png create mode 100755 view/theme/slackr/comment_item.tpl create mode 100644 view/theme/slackr/editicons.png diff --git a/view/theme/darkzero-NS/comment_item.tpl b/view/theme/darkzero-NS/comment_item.tpl new file mode 100755 index 000000000..375aff8fa --- /dev/null +++ b/view/theme/darkzero-NS/comment_item.tpl @@ -0,0 +1,59 @@ +
+
+ + + + + + + +
+ $mytitle +
+
+
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+
+ + {{ if $qcomment }} + {{ for $qcomment as $qc }} + $qc +   + {{ endfor }} + {{ endif }} + +
+ + +
+
+ +
diff --git a/view/theme/darkzero-NS/editicons.png b/view/theme/darkzero-NS/editicons.png new file mode 100644 index 000000000..171a40876 Binary files /dev/null and b/view/theme/darkzero-NS/editicons.png differ diff --git a/view/theme/darkzero-NS/theme.php b/view/theme/darkzero-NS/theme.php index 6c1aa7f12..bdf4b8cef 100644 --- a/view/theme/darkzero-NS/theme.php +++ b/view/theme/darkzero-NS/theme.php @@ -14,6 +14,41 @@ $a->theme_info = array( function darkzero_NS_init(&$a) { $a->page['htmlhead'] .= <<< EOT