From 3c49df5b78ba50ed9b58119960be59d77ddb6008 Mon Sep 17 00:00:00 2001 From: bachtsui Date: Fri, 5 Feb 2016 11:55:06 -0800 Subject: [PATCH 1/6] Removed a +1 for months to get the correct hyperlinks --- .../views/archives_sidebar/_content.html.erb | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb b/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb index 7d74c3347..cde5588da 100644 --- a/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb +++ b/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb @@ -1,13 +1,13 @@ <% unless sidebar.archives.blank? %> -

<%= sidebar.title %>

-
- -
-<% end %> +

<%= sidebar.title %>

+
+ +
+<% end %> \ No newline at end of file From e91551b43d6dada56d4628cda65c68bb169260c4 Mon Sep 17 00:00:00 2001 From: bachtsui Date: Fri, 5 Feb 2016 11:57:38 -0800 Subject: [PATCH 2/6] Decided to do Modulous 13, fixed issue #2 --- lib/archives_sidebar/lib/archives_sidebar.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/archives_sidebar/lib/archives_sidebar.rb b/lib/archives_sidebar/lib/archives_sidebar.rb index b77559ca6..9a5e879cb 100644 --- a/lib/archives_sidebar/lib/archives_sidebar.rb +++ b/lib/archives_sidebar/lib/archives_sidebar.rb @@ -30,11 +30,11 @@ def parse_request(_contents, _params) article_counts = Content.find_by_sql(["select count(*) as count, #{date_func} from contents where type='Article' and published = ? and published_at < ? group by year,month order by year desc,month desc limit ? ", true, Time.now, count.to_i]) @archives = article_counts.map do |entry| - month = (entry.month.to_i%12)+1 + month = (entry.month.to_i%13) year = entry.year.to_i { name: I18n.l(Date.new(year, month), format: '%B %Y'), - month: month - 1, + month: month, year: year, article_count: entry.count } From 1402d8f7dbb9d8fe650b640d6b412f25395fc67b Mon Sep 17 00:00:00 2001 From: bachtsui Date: Fri, 5 Feb 2016 12:13:52 -0800 Subject: [PATCH 3/6] Fixed indentation space by one --- .../views/archives_sidebar/_content.html.erb | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb b/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb index cde5588da..46a748c31 100644 --- a/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb +++ b/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb @@ -1,13 +1,13 @@ <% unless sidebar.archives.blank? %> -

<%= sidebar.title %>

-
-
    - <% sidebar.archives.each do |month| %> - <% counter = sidebar.show_count ? "(#{month[:article_count]})" : "" %> -
  • - <%= link_to"#{month[:name]} #{counter}".html_safe, articles_by_month_path( month[:year], "%02i" % (month[:month]) ) %> -
    • - <% end %> -
-
+

<%= sidebar.title %>

+
+
    + <% sidebar.archives.each do |month| %> + <% counter = sidebar.show_count ? "(#{month[:article_count]})" : "" %> +
  • + <%= link_to"#{month[:name]} #{counter}".html_safe, articles_by_month_path( month[:year], "%02i" % (month[:month]) ) %> +
    • + <% end %> +
+
<% end %> \ No newline at end of file From 4fcd8b2d03af9ac1b64d9d247061e08a7f5c6ce4 Mon Sep 17 00:00:00 2001 From: bachtsui Date: Fri, 5 Feb 2016 12:17:03 -0800 Subject: [PATCH 4/6] Reverted class names back from dashes to underscore --- .../app/views/archives_sidebar/_content.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb b/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb index 46a748c31..bc31cd2a0 100644 --- a/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb +++ b/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb @@ -1,6 +1,6 @@ <% unless sidebar.archives.blank? %> -

<%= sidebar.title %>

-
+

<%= sidebar.title %>

+
    <% sidebar.archives.each do |month| %> <% counter = sidebar.show_count ? "(#{month[:article_count]})" : "" %> From a216f7188a0e375c7ad986d38423e78c09ba4e34 Mon Sep 17 00:00:00 2001 From: bachtsui Date: Fri, 5 Feb 2016 14:04:40 -0800 Subject: [PATCH 5/6] Removed modulous from month = (entry.month.to_i) --- lib/archives_sidebar/lib/archives_sidebar.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/archives_sidebar/lib/archives_sidebar.rb b/lib/archives_sidebar/lib/archives_sidebar.rb index 9a5e879cb..2edc9bb3b 100644 --- a/lib/archives_sidebar/lib/archives_sidebar.rb +++ b/lib/archives_sidebar/lib/archives_sidebar.rb @@ -30,7 +30,7 @@ def parse_request(_contents, _params) article_counts = Content.find_by_sql(["select count(*) as count, #{date_func} from contents where type='Article' and published = ? and published_at < ? group by year,month order by year desc,month desc limit ? ", true, Time.now, count.to_i]) @archives = article_counts.map do |entry| - month = (entry.month.to_i%13) + month = (entry.month.to_i) year = entry.year.to_i { name: I18n.l(Date.new(year, month), format: '%B %Y'), From 4e0ef72d9179cab0a6ec73fbffe0a0733fd49acd Mon Sep 17 00:00:00 2001 From: bachtsui Date: Fri, 5 Feb 2016 14:25:55 -0800 Subject: [PATCH 6/6] Removed parentheses and trailing white space --- lib/archives_sidebar/lib/archives_sidebar.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/archives_sidebar/lib/archives_sidebar.rb b/lib/archives_sidebar/lib/archives_sidebar.rb index 2edc9bb3b..74655138c 100644 --- a/lib/archives_sidebar/lib/archives_sidebar.rb +++ b/lib/archives_sidebar/lib/archives_sidebar.rb @@ -30,7 +30,7 @@ def parse_request(_contents, _params) article_counts = Content.find_by_sql(["select count(*) as count, #{date_func} from contents where type='Article' and published = ? and published_at < ? group by year,month order by year desc,month desc limit ? ", true, Time.now, count.to_i]) @archives = article_counts.map do |entry| - month = (entry.month.to_i) + month = entry.month.to_i year = entry.year.to_i { name: I18n.l(Date.new(year, month), format: '%B %Y'),