Skip to content

Fixed #2 #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexpsu wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fixed #2 #41

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd6602c
Fixed hollow cirlces and font
Feb 5, 2016
a979453
Fixed the wrong month from showing up
Feb 5, 2016
fb890f1
Got rid of the modulo because it wasn't needed
Feb 5, 2016
7da7b37
cleaned up some code
Feb 5, 2016
b30461d
Got rid of useless code
Feb 5, 2016
2f39442
Merge branch 'master' into issue_2
Feb 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/assets/stylesheets/sidebar_admin.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,7 @@
display: inline-block;
}
}

h3.sidebar_title {

@nathanallen nathanallen Feb 5, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How is this css style relevant to issue #2?

@alexpsu alexpsu Feb 5, 2016

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not, didn't see that I changed that in Master my bad.

font-family: monospace;
}
2 changes: 1 addition & 1 deletion lib/amazon_sidebar/app/views/amazon_sidebar/_content.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% unless sidebar.asins.empty? %>
<h3 class="sidebar-title"><%= h sidebar.title %></h3>
<h3 class="sidebar_title"><%= h sidebar.title %></h3>
<div class="sidebar-body" id="amazon_links">
<% 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&lt1=_blank&lc1=0000ff&bc1=000000&bg1=ffffff&f=ifr" %>
Expand Down
6 changes: 3 additions & 3 deletions lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<% unless sidebar.archives.blank? %>
<h3 class="sidebar_title"><%= sidebar.title %></h3>
<div class="sidebar_body">
<ul id="archives">
<div class="sidebar-body">

@tgaff tgaff Feb 6, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does changing the class here really help display the right months?

<ul>

@tgaff tgaff Feb 5, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are you sure this is an unused ID?

@tgaff tgaff Feb 6, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alexpsu

<% sidebar.archives.each do |month| %>
<% counter = sidebar.show_count ? "<em>(#{month[:article_count]})</em>" : "" %>
<li>
<%= 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]) ) %>
</li>
<% end %>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions lib/archives_sidebar/lib/archives_sidebar.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
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
}
Expand Down