From 3c32602a3a54996a187a9a727162f90c203037fd Mon Sep 17 00:00:00 2001
From: Mailkov <miticomilko@hotmail.com>
Date: Sat, 26 Dec 2015 12:19:58 +0000
Subject: [PATCH] connect week_day position on content

---
 lib/DDG/Goodie/CalendarToday.pm               | 18 +++++--
 .../goodie/calendar_today/content.handlebars  | 49 +++----------------
 2 files changed, 20 insertions(+), 47 deletions(-)

diff --git a/lib/DDG/Goodie/CalendarToday.pm b/lib/DDG/Goodie/CalendarToday.pm
index 414ba05fd..d2a4d09ca 100755
--- a/lib/DDG/Goodie/CalendarToday.pm
+++ b/lib/DDG/Goodie/CalendarToday.pm
@@ -99,8 +99,11 @@ sub format_result {
     # Skip to the first day of the week
     $rText .= "    " x $first_day_num;
    # $rHtml .= "<td>&nbsp;</td>" x $first_day_num;
-    my $weekDayNum = $first_day_num;
 
+    my @weeks;
+    my @week_day = (" ") x $first_day_num;
+    my $weekDayNum = $first_day_num;
+    
     # Printing the month
     for (my $dayNum = 1; $dayNum <= $lastDay; $dayNum++) {
         my $padded_date = sprintf('%2s', $dayNum);
@@ -111,16 +114,20 @@ sub format_result {
             $rText .= ' ' . $padded_date . ' ';
            # $rHtml .= "<td>$dayNum</td>";
         }
-
+        push @week_day, $dayNum;
         # next row after 7 cells
         $weekDayNum++;
         if ($weekDayNum == 7) {
-          $weekDayNum = 0;
-          $rText .= "\n";
+            push @weeks, [@week_day];
+            $weekDayNum = 0;
+            undef @week_day;
+            $rText .= "\n";
          # $rHtml .= "</tr><tr>";
         }
     }
-
+    if (@week_day ne "") {
+        push @weeks, [@week_day];
+    }
     $rText .= "\n";
    # $rHtml .="</tr></table>";
 
@@ -132,6 +139,7 @@ sub format_result {
             month_year => $firstDay->strftime("%B %Y"),
             previous_month => $previous->strftime("%B %Y"),
             next_month => $next->strftime("%B %Y"),
+            weeks => \@weeks,
         },
         templates => {
             group => 'text',
diff --git a/share/goodie/calendar_today/content.handlebars b/share/goodie/calendar_today/content.handlebars
index aba9c798f..aacb6e2e7 100644
--- a/share/goodie/calendar_today/content.handlebars
+++ b/share/goodie/calendar_today/content.handlebars
@@ -25,46 +25,11 @@
         <th>F</th>
         <th>S</th>
     </tr>
-    <tr>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>1</td>
-        <td>2</td>
-        <td>3</td>
-        <td>4</td>
-        <td>5</td>
-    </tr>
-    <tr>
-        <td>6</td>
-        <td>7</td>
-        <td>8</td>
-        <td>9</td>
-        <td>10</td>
-        <td>11</td>
-        <td>12</td>
-    </tr>
-    <tr>
-        <td>13</td>
-        <td>14</td>
-        <td>15</td>
-        <td>16</td>
-        <td>17</td>
-        <td>18</td>
-        <td>19</td>
-    </tr>
-    <tr>
-        <td>20</td>
-        <td>21</td>
-        <td>22</td>
-        <td>23</td>
-        <td>24</td>
-        <td>25</td>
-        <td>26</td>
-    </tr>
-    <tr>
-        <td>27</td>
-        <td>28</td>
-        <td>29</td>
-        <td>30</td>
-    </tr>
+    {{#each weeks}}
+        <tr>
+        {{#each this}}
+        <td>{{this}}</td>
+        {{/each}}    
+        </tr>
+    {{/each}}
 </table>
\ No newline at end of file