event permalink now points to site actioned on

This commit is contained in:
Kyle Drake 2015-04-02 22:28:43 -07:00
parent 7c4b332acf
commit cd94d2ce36
2 changed files with 7 additions and 6 deletions

View file

@ -37,7 +37,7 @@
<% end %>
<span class="date">
<a href="?event_id=<%= event.id %>"><%= event.created_at.ago %></a>
<a href="/site/<%= event_site.username %>?event_id=<%= event.id %>"><%= event.created_at.ago %></a>
</span>
</div>
<% elsif event.site_change_id %>
@ -51,7 +51,7 @@
<a href="/site/<%= event_site.username %>" class="user" title="<%= event_site.title %>"><%= event_site.title.shorten(45) %></a> has been updated.
<% end %>
<span class="date">
<a href="?event_id=<%= event.id %>"><%= event.created_at.ago %></a>
<a href="/site/<%= event_site.username %>?event_id=<%= event.id %>"><%= event.created_at.ago %></a>
</span>
</div>
<% site_change_filenames = event.site_change.site_change_filenames %>
@ -90,11 +90,12 @@
<div class="comments">
<% event.comments.each do |comment| %>
<% comment_actioning_site = comment.actioning_site_dataset.select(:id, :title, :domain, :username, :stripe_customer_id).first %>
<% comment_event_site = comment.event.site_dataset.select(:id, :title, :domain, :username, :stripe_customer_id).first %>
<div class="comment" id="comment_<%= comment.id %>">
<a href="/site/<%= comment_actioning_site.username %>"><img class="avatar" src="<%= comment_actioning_site.screenshot_url('index.html', '50x50') %>"></a>
<a href="/site/<%= comment_actioning_site.username %>" class="user" title="<%= comment_actioning_site.title %>"><i class="fa fa-user"><% if comment_actioning_site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= comment_actioning_site.username %></a>
<span class="date">
<a href="?event_id=<%= event.id %>"><%= comment.created_at.ago %></a>
<a href="/site/<%= comment_event_site.username %>?event_id=<%= event.id %>"><%= comment.created_at.ago %></a>
</span>
<p><%= comment.message %></p>
</div>

View file

@ -11,14 +11,14 @@
<% end %>
<i class="fa fa-chevron-right comment-symbol" title="commented on"></i>
<% if current_site && current_site.id == profile_comment.site_id %>
<a href="/site/<%= current_site.username %>" class="you">You</a>
<% else %>
<a href="/site/<%= profile_comment.site.username %>" class="user"><i class="fa fa-user"><% if profile_comment.site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= profile_comment.site.username %></a>
<% end %>
<span class="date">
<a href="?event_id=<%= profile_comment.event.id %>"><%= profile_comment.created_at.ago %></a>
<a href="/site/<%= site.username %>?event_id=<%= profile_comment.event.id %>"><%= profile_comment.created_at.ago %></a>
</span>
<div class="comment"><%= profile_comment.message %></div>
</div>
</div>