Skip to content
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

Month sorting #30

Closed
wants to merge 8 commits into from
Closed

Month sorting #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b6f70fc
Added psych to gemfile
jroers Feb 5, 2016
5f8c43f
Changed font family for titles to be monospace, changed li tags to be…
jroers Feb 5, 2016
2b8fb29
Removed sanity check with months hash
jroers Feb 5, 2016
d530582
Merge pull request #1 from jroers/fix_sidebar_styles
jroers Feb 5, 2016
0c29dc6
January was being interpreted as the year prior. No idea why. Added l…
jroers Feb 5, 2016
c246835
Modified the +1 after month[:month] - this caused a redirect to the w…
jroers Feb 5, 2016
bc70c68
Months.to_i doesn't need mod 12. This was producing issue #2, as 12%1…
jroers Feb 5, 2016
38e4842
why is this still here.
jroers 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
8 changes: 4 additions & 4 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">
<h3 class="sidebar-title"><%= sidebar.title %></h3>
Copy link
Contributor

Choose a reason for hiding this comment

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

How is this html change relevant to issue #2?

<div class="sidebar-body">
<ul>
Copy link
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 ID isn't used by some other code ? (JS, RSpec, etc)

<% 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
6 changes: 3 additions & 3 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
year = entry.year.to_i
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