urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calendar: Improved display of arrows.

master
Joey Hess 2010-04-15 20:12:03 -04:00
parent 425f6a8de2
commit 142e025ae4
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
IkiWiki/Plugin/calendar.pm
View File

@ -164,11 +164,11 @@ sub format_month (@) {
# Start producing the month calendar # Start producing the month calendar
$calendar=<<EOF; $calendar=<<EOF;
<table class="month-calendar"> <table class="month-calendar">
<caption class="month-calendar-head"> <tr>
$purl <th class="month-calendar-arrow">$purl</th>
$url <th class="month-calendar-head" colspan="5">$url</th>
$nurl <th class="month-calendar-arrow">$nurl</th>
</caption> </tr>
<tr> <tr>
EOF EOF
@ -312,13 +312,14 @@ sub format_year (@) {
add_depends($params{page}, "$archivebase/$nyear", deptype("presence")); add_depends($params{page}, "$archivebase/$nyear", deptype("presence"));
# Start producing the year calendar # Start producing the year calendar
my $m=$params{months_per_row}-2;
$calendar=<<EOF; $calendar=<<EOF;
<table class="year-calendar"> <table class="year-calendar">
<caption class="year-calendar-head"> <tr>
$purl <th class="year-calendar-arrow">$purl</th>
$url <th class="year-calendar-head" colspan="$m">$url</th>
$nurl <th class="year-calendar-arrow">$nurl</th>
</caption> </tr>
<tr> <tr>
<th class="year-calendar-subhead" colspan="$params{months_per_row}">Months</th> <th class="year-calendar-subhead" colspan="$params{months_per_row}">Months</th>
</tr> </tr>

1
debian/changelog vendored
View File

@ -43,6 +43,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
* sidebar: Add global_sidebars setting. * sidebar: Add global_sidebars setting.
* conditional: Fix bug that forced "all" mode off by default. * conditional: Fix bug that forced "all" mode off by default.
* calendarmonth.tmpl: The month calendar is now put in a sidebar. * calendarmonth.tmpl: The month calendar is now put in a sidebar.
* calendar: Improved display of arrows.
-- Joey Hess <joeyh@debian.org> Sun, 04 Apr 2010 12:17:11 -0400 -- Joey Hess <joeyh@debian.org> Sun, 04 Apr 2010 12:17:11 -0400

2
doc/plugins/calendar.mdwn
View File

@ -14,6 +14,7 @@ customization.
* `month-calendar` - The month calendar as a whole. * `month-calendar` - The month calendar as a whole.
* `month-calendar-head` - The head of the month calendar (ie,"March"). * `month-calendar-head` - The head of the month calendar (ie,"March").
* `month-calendar-arrow` - Arrow pointing to previous/next month.
* `month-calendar-day-head` - A column head in the month calendar (ie, a * `month-calendar-day-head` - A column head in the month calendar (ie, a
day-of-week abbreviation). day-of-week abbreviation).
* `month-calendar-day-noday`, `month-calendar-day-link`, * `month-calendar-day-noday`, `month-calendar-day-link`,
@ -27,6 +28,7 @@ customization.
weekends. weekends.
* `year-calendar` - The year calendar as a whole. * `year-calendar` - The year calendar as a whole.
* `year-calendar-head` - The head of the year calendar (ie, "2007"). * `year-calendar-head` - The head of the year calendar (ie, "2007").
* `year-calendar-arrow` - Arrow pointing to previous/next year.
* `year-calendar-subhead` - For example, "Months". * `year-calendar-subhead` - For example, "Months".
* `year-calendar-month-link`, `year-calendar-month-nolink`, * `year-calendar-month-link`, `year-calendar-month-nolink`,
`year-calendar-month-future`, `year-calendar-this-month` - The month `year-calendar-month-future`, `year-calendar-this-month` - The month

8
doc/style.css
View File

@ -431,3 +431,11 @@ pre.hl { color:#000000; background-color:#ffffff; }
/* For the calendar plugin. */ /* For the calendar plugin. */
.month-calendar-day-this-day { background-color: #eee; } .month-calendar-day-this-day { background-color: #eee; }
.year-calendar-this-month { background-color: #eee; } .year-calendar-this-month { background-color: #eee; }
.month-calendar-arrow A:link,
.year-calendar-arrow A:link,
.month-calendar-arrow A:visited,
.year-calendar-arrow A:visited {
text-decoration: none;
font-weight: normal;
font-size: 150%;
}