diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/head.tpl | 1 | ||||
| -rw-r--r-- | view/photo_edit.tpl | 5 | ||||
| -rw-r--r-- | view/theme/darkbubble/unsupported | 0 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 10 | ||||
| -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 | ||||
| -rw-r--r-- | view/theme/testbubble/unsupported | 0 |
9 files changed, 57 insertions, 3 deletions
diff --git a/view/head.tpl b/view/head.tpl index dfb626ebc..0fffc1344 100644 --- a/view/head.tpl +++ b/view/head.tpl @@ -29,6 +29,7 @@ <script> var updateInterval = $update_interval; + var localUser = $local_user; function confirmDelete() { return confirm("$delitem"); } function commentOpen(obj,id) { diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl index 9950cc4ac..f6059a7ec 100644 --- a/view/photo_edit.tpl +++ b/view/photo_edit.tpl @@ -17,6 +17,11 @@ <input name="newtag" id="photo-edit-newtag" size="84" title="$help_tags" type="text" /> <div id="photo-edit-tags-end"></div> + <div id="photo-edit-rotate-wrapper"> + <div id="photo-edit-rotate-label">$rotate</div> + <input type="checkbox" name="rotate" value="1" /> + </div> + <div id="photo-edit-rotate-end"></div> <div id="photo-edit-perms" class="photo-edit-perms" > <a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button" title="$permissions"/> diff --git a/view/theme/darkbubble/unsupported b/view/theme/darkbubble/unsupported new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/view/theme/darkbubble/unsupported diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index c556dcead..fca935dee 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2118,7 +2118,7 @@ aside input[type='text'] { margin-bottom: 15px; } -#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label { +#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label { float: left; width: 150px; } @@ -2127,7 +2127,7 @@ aside input[type='text'] { margin-bottom: 15px; } -#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname { +#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate { float: left; margin-bottom: 25px; } @@ -2138,10 +2138,14 @@ aside input[type='text'] { margin-bottom: 25px; } -#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end { +#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end { clear: both; } +#photo-edit-rotate-end { + margin-bottom: 15px; +} + #photo-edit-delete-button { margin-left: 200px; } 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( diff --git a/view/theme/testbubble/unsupported b/view/theme/testbubble/unsupported new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/view/theme/testbubble/unsupported |