From fd6602c68332047d68865dbe6387c3493710d737 Mon Sep 17 00:00:00 2001 From: Alex Rao Date: Fri, 5 Feb 2016 10:32:22 -0800 Subject: [PATCH 1/5] Fixed hollow cirlces and font --- app/assets/stylesheets/sidebar_admin.css.scss | 4 ++++ lib/amazon_sidebar/app/views/amazon_sidebar/_content.html.erb | 2 +- .../app/views/archives_sidebar/_content.html.erb | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/sidebar_admin.css.scss b/app/assets/stylesheets/sidebar_admin.css.scss index 727a40f7b..dde541a93 100644 --- a/app/assets/stylesheets/sidebar_admin.css.scss +++ b/app/assets/stylesheets/sidebar_admin.css.scss @@ -34,3 +34,7 @@ display: inline-block; } } + +h3.sidebar_title { + font-family: monospace; +} diff --git a/lib/amazon_sidebar/app/views/amazon_sidebar/_content.html.erb b/lib/amazon_sidebar/app/views/amazon_sidebar/_content.html.erb index 0605cd1e1..d04a8976b 100644 --- a/lib/amazon_sidebar/app/views/amazon_sidebar/_content.html.erb +++ b/lib/amazon_sidebar/app/views/amazon_sidebar/_content.html.erb @@ -1,5 +1,5 @@ <% unless sidebar.asins.empty? %> -

<%= h sidebar.title %>

+

<%= h sidebar.title %>

<% for asin in sidebar.asins %> <% url = "http://rcm.amazon.com/e/cm?t=#{@sidebar.associate_id}&o=1&p=8&l=as1&asins=#{asin}&fc1=000000&IS2=1<1=_blank&lc1=0000ff&bc1=000000&bg1=ffffff&f=ifr" %> 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..33e847308 100644 --- a/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb +++ b/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb @@ -1,7 +1,7 @@ <% unless sidebar.archives.blank? %>

<%= sidebar.title %>

-
-
    +
    +
      <% sidebar.archives.each do |month| %> <% counter = sidebar.show_count ? "(#{month[:article_count]})" : "" %>
    • From a9794539acaedaab3f2969e94d3a5d49316c1fbc Mon Sep 17 00:00:00 2001 From: Alex Rao Date: Fri, 5 Feb 2016 14:21:42 -0800 Subject: [PATCH 2/5] Fixed the wrong month from showing up --- 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 b77559ca6..e0c7cea26 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%12)+1 + month = (entry.month.to_i%12) year = entry.year.to_i { name: I18n.l(Date.new(year, month), format: '%B %Y'), From fb890f1b36d275d354d4e4ba15cd1a5d0761c89f Mon Sep 17 00:00:00 2001 From: Alex Rao Date: Fri, 5 Feb 2016 14:28:56 -0800 Subject: [PATCH 3/5] Got rid of the modulo because it wasn't needed --- 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 e0c7cea26..95dc2f10c 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%12) + month = (entry.month.to_i) year = entry.year.to_i { name: I18n.l(Date.new(year, month), format: '%B %Y'), From 7da7b372276fce0d37fbece370b19ca94ef012bb Mon Sep 17 00:00:00 2001 From: Alex Rao Date: Fri, 5 Feb 2016 14:39:23 -0800 Subject: [PATCH 4/5] cleaned up some code --- .../app/views/archives_sidebar/_content.html.erb | 2 +- lib/archives_sidebar/lib/archives_sidebar.rb | 2 +- 2 files 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 33e847308..ec4f9040d 100644 --- a/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb +++ b/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb @@ -5,7 +5,7 @@ <% 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]+1) ) %> + <%= link_to"#{month[:name]} #{counter}".html_safe, articles_by_month_path( month[:year], "%02i" % (month[:month]) ) %>
      • <% end %>
    diff --git a/lib/archives_sidebar/lib/archives_sidebar.rb b/lib/archives_sidebar/lib/archives_sidebar.rb index 95dc2f10c..a65c419b8 100644 --- a/lib/archives_sidebar/lib/archives_sidebar.rb +++ b/lib/archives_sidebar/lib/archives_sidebar.rb @@ -34,7 +34,7 @@ def parse_request(_contents, _params) 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 b30461d75f821ac44a155f1095ff652d213455d0 Mon Sep 17 00:00:00 2001 From: Alex Rao Date: Fri, 5 Feb 2016 14:55:34 -0800 Subject: [PATCH 5/5] Got rid of useless code --- app/assets/stylesheets/sidebar_admin.css.scss | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/assets/stylesheets/sidebar_admin.css.scss b/app/assets/stylesheets/sidebar_admin.css.scss index dde541a93..d86b9ff4c 100644 --- a/app/assets/stylesheets/sidebar_admin.css.scss +++ b/app/assets/stylesheets/sidebar_admin.css.scss @@ -33,8 +33,4 @@ right: 20px; display: inline-block; } -} - -h3.sidebar_title { - font-family: monospace; -} +} \ No newline at end of file