From 65bbdfa87a21d34384aa1f0a584d3516b27db7fd Mon Sep 17 00:00:00 2001
From: Tomasz Gieniusz <tomasz.gieniusz@gmail.com>
Date: Sun, 21 Oct 2012 14:36:13 +0200
Subject: [PATCH] year

---
 config/locales/en.yml                              |  6 +++++-
 lib/git_stats/stats_view/charts/activity_charts.rb | 11 +++++++++++
 lib/git_stats/stats_view/charts/charts.rb          |  2 +-
 templates/activity.haml                            |  8 ++++++++
 templates/layout.haml                              |  2 +-
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 550c476aa..b7de8534e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -23,4 +23,8 @@ en:
   day_of_week: Day of week
   hour_of_week: Hour of week
   month: Month
-  month_of_year: Month of year
\ No newline at end of file
+  month_of_year: Month of year
+  commits_by_wday: Commits by day of week
+  commits_by_month: Commits by month of year
+  year: Year
+  commits_by_year: Commits by year
\ No newline at end of file
diff --git a/lib/git_stats/stats_view/charts/activity_charts.rb b/lib/git_stats/stats_view/charts/activity_charts.rb
index cd069d23b..fea8a0f53 100644
--- a/lib/git_stats/stats_view/charts/activity_charts.rb
+++ b/lib/git_stats/stats_view/charts/activity_charts.rb
@@ -41,6 +41,17 @@ module GitStats
             )
           end
         end
+
+        def activity_by_year
+          Chart.new do |f|
+            f.column_hash_chart(
+                title: :commits_by_year.t,
+                y_text: :commits.t,
+                x_text: :year.t,
+                data: @activity.by_year
+            )
+          end
+        end
       end
     end
   end
diff --git a/lib/git_stats/stats_view/charts/charts.rb b/lib/git_stats/stats_view/charts/charts.rb
index f273bfcce..11e7f2b3b 100644
--- a/lib/git_stats/stats_view/charts/charts.rb
+++ b/lib/git_stats/stats_view/charts/charts.rb
@@ -5,7 +5,7 @@ module GitStats
         delegate :files_by_extension, :lines_by_extension, :files_by_date, :lines_by_date,
                  :lines_added_by_author, :lines_deleted_by_author, to: :repo_charts
         delegate :by_authors_wday, to: :authors_charts
-        delegate :activity_by_hour, :activity_by_wday, :activity_by_month, to: :activity_charts
+        delegate :activity_by_hour, :activity_by_wday, :activity_by_month, :activity_by_year, to: :activity_charts
 
         attr_reader :repo
 
diff --git a/templates/activity.haml b/templates/activity.haml
index 97f95dc82..ad9823000 100644
--- a/templates/activity.haml
+++ b/templates/activity.haml
@@ -8,6 +8,8 @@
       %a{:href => '#hour_of_week', 'data-toogle' => 'tab'}= :hour_of_week.t
     %li
       %a{:href => '#month_of_year', 'data-toogle' => 'tab'}= :month_of_year.t
+    %li
+      %a{:href => '#year', 'data-toogle' => 'tab'}= :year.t
 
   .tab-content
     .tab-pane.active{id: 'hour_of_day'}
@@ -78,3 +80,9 @@
           - repo.activity.by_month_array.each do |commits|
             %td= (commits * 100.0 / repo.activity.by_month_array.sum).round(2)
       = high_chart("activity_by_month", charts.activity_by_month)
+
+
+    .tab-pane{id: 'year'}
+      .page-header
+        %h1.pagination-centered= :year.t
+      = high_chart("activity_by_year", charts.activity_by_year)
\ No newline at end of file
diff --git a/templates/layout.haml b/templates/layout.haml
index b58eb5afb..89c63a627 100644
--- a/templates/layout.haml
+++ b/templates/layout.haml
@@ -21,7 +21,7 @@
           })
         });
   %body
-    %div.navbar.navbar-inverse.navbar-fixed-top
+    %div.navbar.navbar-fixed-top
       %div.navbar-inner
         %div.container
           %a.btn.btn-navbar{'data-toggle' => "collapse", 'data-target' => ".nav-collapse"}