Display individual events by clicking on date

This commit is contained in:
Kyle Drake 2014-07-31 19:44:32 -07:00
parent afa3a312c9
commit 201e63865a
3 changed files with 26 additions and 7 deletions

16
app.rb
View file

@ -94,10 +94,16 @@ get '/site/:username' do |username|
@current_page = @current_page.to_i
@current_page = 1 if @current_page == 0
latest_events_dataset = site.latest_events(@current_page, 10)
if params[:event_id]
event = Event.select(:id).where(id: params[:event_id]).first
not_found if event.nil?
events_dataset = Event.where(id: params[:event_id]).paginate(1, 1)
else
events_dataset = site.latest_events(@current_page, 10)
end
@page_count = latest_events_dataset.page_count || 1
@latest_events = latest_events_dataset.all
@page_count = events_dataset.page_count || 1
@latest_events = events_dataset.all
erb :'site', locals: {site: site, is_current_site: site == current_site}
end
@ -146,6 +152,10 @@ get '/?' do
if params[:activity] == 'mine'
events_dataset = current_site.latest_events(@current_page, 10)
elsif params[:event_id]
event = Event.select(:id).where(id: params[:event_id]).first
not_found if event.nil?
events_dataset = Event.where(id: params[:event_id]).paginate(1, 1)
else
events_dataset = current_site.news_feed(@current_page, 10)
end

View file

@ -23,14 +23,19 @@
<a href="/site/<%= actioning_site.username %>" class="user" title="<%= actioning_site.title %>"><%= actioning_site.title.shorten(40) %></a>
is following
<a href="/site/<%= event_site.username %>" class="user" title="<%= event_site.title %>"><%= event_site.title.shorten(40) %></a>
<span class="date"><%= event.created_at.ago %></span>
<span class="date">
<a href="?event_id=<%= event.id %>"><%= event.created_at.ago %></a>
</span>
</div>
<% elsif event.site_change_id %>
<div class="news-item update">
<div class="title">
<div class="icon"></div>
<% event_site = event.site_dataset.select(:username, :title, :domain).first %>
<a href="/site/<%= event_site.username %>" class="user"><%= event_site.title %></a> has been updated. <span class="date"><%= event.created_at.ago %></span>
<a href="/site/<%= event_site.username %>" class="user"><%= event_site.title %></a> has been updated.
<span class="date">
<a href="?event_id=<%= event.id %>"><%= event.created_at.ago %></a>
</span>
</div>
<% site_change_filenames = event.site_change.site_change_filenames %>
<% unless site_change_filenames.empty? %>
@ -69,7 +74,9 @@
<div class="comment" id="comment_<%= comment.id %>">
<img class="avatar" src="<%= comment_actioning_site.screenshot_url('index.html', '82x62') %>">
<a href="/site/<%= comment_actioning_site.username %>" class="user"><%= comment_actioning_site.title %></a>
<span class="date"><%= comment.created_at.ago %></span>
<span class="date">
<a href="?event_id=<%= event.id %>"><%= comment.created_at.ago %></a>
</span>
<p><%= comment.message %></p>
</div>
<div class="actions">

View file

@ -1,6 +1,8 @@
<div class="title">
<div class="icon" style="background-image:url(<%= profile_comment.actioning_site.screenshot_url('index.html', '82x62') %>);"></div>
<a href="/site/<%= profile_comment.actioning_site.username %>" class="user"><%= profile_comment.actioning_site.title %></a>
<span class="date"><%= profile_comment.created_at.ago %></span>
<span class="date">
<a href="?event_id=<%= profile_comment.event.id %>"><%= profile_comment.created_at.ago %></a>
</span>
<div class="comment"><%= profile_comment.message %></div>
</div>