Merge branch 'master' of git@github.com:gallery/gallery3-contrib
Conflicts: modules/calendarview/controllers/calendarview.php
This commit is contained in:
commit
85570acabd
@ -32,6 +32,7 @@ class CalendarView_Controller extends Controller {
|
|||||||
|
|
||||||
// Draw the page.
|
// Draw the page.
|
||||||
$template = new Theme_View("page.html", "other", "CalendarView");
|
$template = new Theme_View("page.html", "other", "CalendarView");
|
||||||
|
$template->css("calendarview_calendar.css");
|
||||||
$template->page_title = t("Gallery :: Calendar");
|
$template->page_title = t("Gallery :: Calendar");
|
||||||
$template->content = new View("calendarview_year.html");
|
$template->content = new View("calendarview_year.html");
|
||||||
$template->content->calendar_year = $display_year;
|
$template->content->calendar_year = $display_year;
|
||||||
|
8
modules/calendarview/css/calendarview_calendar.css
Normal file
8
modules/calendarview/css/calendarview_calendar.css
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
table.calendar { text-align: center; width:100px; }
|
||||||
|
table.calendar caption { font-size: 1.5em; padding: 0.2em; }
|
||||||
|
table.calendar th, table.calendar td { padding: 0.2em; background: #fff; border: 0; }
|
||||||
|
table.calendar td:hover { background: #ddf; }
|
||||||
|
table.calendar td.prev-next { background: #ccc; color: #999; }
|
||||||
|
table.calendar td.today { color: #800; }
|
||||||
|
#cal_user, #cal_year, #g-view-calendar-form li { display: inline; }
|
||||||
|
#SaveSettings { float: right; }
|
@ -1,15 +1,4 @@
|
|||||||
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||||
<style type="text/css">
|
|
||||||
table.calendar { text-align: center; width:100px; }
|
|
||||||
table.calendar caption { font-size: 1.5em; padding: 0.2em; }
|
|
||||||
table.calendar th, table.calendar td { padding: 0.2em; background: #fff; border: 0; }
|
|
||||||
table.calendar td:hover { background: #ddf; }
|
|
||||||
table.calendar td.prev-next { background: #ccc; color: #999; }
|
|
||||||
table.calendar td.today { color: #800; }
|
|
||||||
select, li {
|
|
||||||
display: inline;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<h1 align="center"><?=$calendar_year ?></h1>
|
<h1 align="center"><?=$calendar_year ?></h1>
|
||||||
<?= $calendar_user_year_form ?>
|
<?= $calendar_user_year_form ?>
|
||||||
|
@ -43,7 +43,11 @@ else
|
|||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
<? if ($day[1] == true) { ?>
|
||||||
<td class="<?php echo implode(' ', $classes) ?>"><span class="day"><?php echo $day[0] ?></span><?php echo $output ?></td>
|
<td class="<?php echo implode(' ', $classes) ?>"><span class="day"><?php echo $day[0] ?></span><?php echo $output ?></td>
|
||||||
|
<? } else { ?>
|
||||||
|
<td></td>
|
||||||
|
<? } ?>
|
||||||
<?php endforeach ?>
|
<?php endforeach ?>
|
||||||
</tr>
|
</tr>
|
||||||
<?php endforeach ?>
|
<?php endforeach ?>
|
||||||
|
Reference in New Issue
Block a user