duckduckgo
/
zeroclickinfo-goodies
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CalendarToday: niggly formatting stuff. 

None of this really matters, but when I looked at my previous diff some
of this stuff annoyed me, so tidying up a bit.
master
Matt Miller 2014-08-19 14:39:28 -04:00
parent eecb9c315f
commit e7a2d170da
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/DDG/Goodie/CalendarToday.pm
View File

@ -32,7 +32,6 @@ my $month_regex = month_regex();
my $date_regex = date_regex();
handle remainder => sub {
my $rText, my $rHtml;
my $query = $_;
my $date_object = DateTime->now;
my ($currentDay, $currentMonth, $currentYear) = ($date_object->day(), $date_object->month(), $date_object->year());
@ -54,10 +53,10 @@ handle remainder => sub {
}
}
} else {
$highlightDay = $currentDay
}
$highlightDay = $currentDay;
}
my $the_year = $date_object->year();
my $the_year = $date_object->year();
my $the_month = $date_object->month();
# return calendar
my $start = parse_string_to_date($the_year . "-" . $the_month . "-1");
@ -83,8 +82,8 @@ sub format_result {
$rHtml .= $firstDay->strftime("%B %Y").'</b></th></tr><tr>';
for my $dayHeading (@weekDays) {
$rText .= "$dayHeading ";
$rHtml .= '<th>'.$dayHeading.'</th>';
$rText .= $dayHeading . ' ';
$rHtml .= '<th>' . $dayHeading . '</th>';
}
$rText .= " ".$firstDay->strftime("%B %Y")."\n";
$rHtml .= "</tr><tr>";
@ -99,11 +98,11 @@ sub format_result {
# Printing the month
for (my $dayNum = 1; $dayNum <= $lastDay; $dayNum++) {
my $padded_date = sprintf('%2s', $dayNum);
if($dayNum == $highlightDay) {
$rText .= "|".$padded_date.'|';
$rHtml .= '<td><span class="calendar__today circle">'.$dayNum.'</span></td>';
if ($dayNum == $highlightDay) {
$rText .= '|' . $padded_date . '|';
$rHtml .= '<td><span class="calendar__today circle">' . $dayNum . '</span></td>';
} else {
$rText .=" ".$padded_date.' ';
$rText .= ' ' . $padded_date . ' ';
$rHtml .= "<td>$dayNum</td>";
}