diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-23 05:03:05 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-23 05:03:05 -0400 |
| commit | bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4 (patch) | |
| tree | 93cd7fe6c2b9b0cc5851cb8324b5f6591d990f7f /view/theme/slackr | |
| parent | e56af0e09e0852c7215546d6f9db32ce5cc21b39 (diff) | |
| parent | 61dba985c14ebcfd20d18b579aee9b781f98bc23 (diff) | |
| download | volse-hubzilla-bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4.tar.gz volse-hubzilla-bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4.tar.bz2 volse-hubzilla-bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
photo rotation
event calendar theming
import quattro event reminder
mark bubbles unsupported
keep FB out of private notes
clear submanage, etc from session on logout
if identity (uid) changes - reload any other open browser windows on next ping.
* master:
Diffstat (limited to 'view/theme/slackr')
| -rw-r--r-- | view/theme/slackr/birthdays_reminder.tpl | 1 | ||||
| -rw-r--r-- | view/theme/slackr/events_reminder.tpl | 39 | ||||
| -rw-r--r-- | view/theme/slackr/style.css | 3 | ||||
| -rw-r--r-- | view/theme/slackr/theme.php | 1 |
4 files changed, 44 insertions, 0 deletions
diff --git a/view/theme/slackr/birthdays_reminder.tpl b/view/theme/slackr/birthdays_reminder.tpl new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/view/theme/slackr/birthdays_reminder.tpl @@ -0,0 +1 @@ + diff --git a/view/theme/slackr/events_reminder.tpl b/view/theme/slackr/events_reminder.tpl new file mode 100644 index 000000000..fc13fa68b --- /dev/null +++ b/view/theme/slackr/events_reminder.tpl @@ -0,0 +1,39 @@ +<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' /> +<script language="javascript" type="text/javascript" + src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script> +<script> + // start calendar from yesterday + var yesterday= new Date() + yesterday.setDate(yesterday.getDate()-1) + + function showEvent(eventid) { + $.get( + '$baseurl/events/?id='+eventid, + function(data){ + $.fancybox(data); + } + ); + } + $(document).ready(function() { + $('#events-reminder').fullCalendar({ + firstDay: yesterday.getDay(), + year: yesterday.getFullYear(), + month: yesterday.getMonth(), + date: yesterday.getDate(), + events: '$baseurl/events/json/', + header: { + left: '', + center: '', + right: '' + }, + timeFormat: 'H(:mm)', + defaultView: 'basicWeek', + height: 50, + eventClick: function(calEvent, jsEvent, view) { + showEvent(calEvent.id); + } + }); + }); +</script> +<div id="events-reminder"></div> +<br> diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css index 41f4e58ee..635f5bcf0 100644 --- a/view/theme/slackr/style.css +++ b/view/theme/slackr/style.css @@ -40,6 +40,9 @@ nav #site-location { right: 36px; } +.fc-event-skin { + background-color: #3465a4 !important; +} .wall-item-photo, .photo, .contact-block-img, .my-comment-photo { border-radius: 3px; -moz-border-radius: 3px; diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php index 99e061a2f..516132f5c 100644 --- a/view/theme/slackr/theme.php +++ b/view/theme/slackr/theme.php @@ -45,6 +45,7 @@ function cmtBbClose(id) { } $(document).ready(function() { + $('html').click(function() { $("#nav-notifications-menu" ).hide(); }); $('.group-edit-icon').hover( |