Added main menu with links for current month and file upload

janimattiellonen · janimattiellonen · commit 7902825df16a · 2011-12-03T17:40:30.000+02:00
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
@@ -14,6 +14,13 @@
         <link type="text/css" href="/css/ui-lightness/jquery-ui-1.8.16.custom.css" rel="stylesheet" />
     </head>
     <body>
+        <nav>
+            <ul>
+                <li><a href="{{path('stats_stats_list') }}">{{'Current month'|trans}}</a></li>
+                <li><a href="{{path('stats_stats_select_file') }}">{{'Upload new statistics'|trans}}</a></li>
+            </ul>
+        </nav>
+        
         <div id="main">
             {% block container %}{% endblock %}
         </div>
diff --git a/src/Stats/BankBundle/Component/Date/DateRange.php b/src/Stats/BankBundle/Component/Date/DateRange.php
@@ -17,7 +17,7 @@ public function withFirstDay($month, $year)
     {
         $this->checkMonth($month);
         
-        return new \DateTime("2011-$month-01");
+        return new \DateTime("$year-$month-01");
     }
     
     /**
diff --git a/src/Stats/BankBundle/Resources/less/stats.less b/src/Stats/BankBundle/Resources/less/stats.less
@@ -3,6 +3,38 @@ body {
     margin: 20px;
 }
 
+nav
+{
+    float: left;
+    width: 93%;
+    margin: 5px 20px 20px 20px;
+    border-radius: 15px 15px 15px 15px;
+    background: #3B3C3C;
+
+    ul
+    {
+        li
+        {
+            list-style-type: none;
+            display: inline;
+            margin-right: 10px;
+    
+            a
+            {
+                color: white;
+                text-decoration: none;
+
+                &:hover
+                {
+                    text-decoration: underline;
+                }
+            }
+
+        }
+    }
+}
+
+
 #main
 {
     float: left;

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function withFirstDay($month, $year)`
`17`	`17`	`{`
`18`	`18`	`$this->checkMonth($month);`
`19`	`19`
`20`		`- return new \DateTime("2011-$month-01");`
	`20`	`+ return new \DateTime("$year-$month-01");`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`/**`