zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-07-26 04:18:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

remaining username to title changes

Browse source
This commit is contained in:
Kyle Drake 2014-07-03 19:04:01 -05:00
parent c62e8fe12c
commit 7c05c16925
5 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
models/comment.rb
View file

@ -4,8 +4,10 @@ class Comment < Sequel::Model
many_to_one :actioning_site, class: :Site many_to_one :actioning_site, class: :Site
one_to_many :comment_likes one_to_many :comment_likes
def liking_site_names def liking_site_titles
comment_likes_dataset.select(:id, :actioning_site_id).all.collect {|comment_like| comment_like.actioning_site_dataset.select(:username).first.username } comment_likes_dataset.select(:id, :actioning_site_id).all.collect do |comment_like|
comment_like.actioning_site_dataset.select(:username,:domain,:title).first.title
end
end end
def site_likes?(site) def site_likes?(site)

6
models/event.rb
View file

@ -17,8 +17,10 @@ class Event < Sequel::Model
false false
end end
def liking_site_names def liking_site_titles
likes_dataset.select(:actioning_site_id).all.collect {|like| like.actioning_site_dataset.select(:username).first.username } likes_dataset.select(:actioning_site_id).all.collect do |like|
like.actioning_site_dataset.select(:domain,:title,:username).first.title
end
end end
def add_site_comment(site, message) def add_site_comment(site, message)

6
views/_news.erb
View file

@ -60,17 +60,17 @@
<div class="content"> <div class="content">
<div class="comments"> <div class="comments">
<% event.comments.each do |comment| %> <% event.comments.each do |comment| %>
<% comment_actioning_site = comment.actioning_site_dataset.select(:username).first %> <% comment_actioning_site = comment.actioning_site_dataset.select(:title, :domain, :username).first %>
<div class="comment" id="comment_<%= comment.id %>"> <div class="comment" id="comment_<%= comment.id %>">
<img class="avatar" src="<%= comment_actioning_site.screenshot_url('index.html', '82x62') %>"> <img class="avatar" src="<%= comment_actioning_site.screenshot_url('index.html', '82x62') %>">
<a href="/site/<%= comment_actioning_site.username %>" class="user"><%= comment_actioning_site.username %></a> <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"><%= comment.created_at.ago %></span>
<p><%= comment.message %></p> <p><%= comment.message %></p>
</div> </div>
<div class="actions"> <div class="actions">
<% comment_likes_count = comment.comment_likes_dataset.count %> <% comment_likes_count = comment.comment_likes_dataset.count %>
<% if current_site %> <% if current_site %>
<a href="#" class="comment_like" id="comment_<%= comment.id %>_like" data-placement="bottom" data-toggle="tooltip" data-original-title="<%= comment.liking_site_names.join('<br>') %>" onclick="Comment.toggleLike(<%= comment.id %>, '<%= csrf_token %>'); return false"><%= comment.site_likes?(current_site) ? 'Unlike' : 'Like' %><%= comment_likes_count > 0 ? " (#{comment_likes_count})" : '' %></a> <a href="#" class="comment_like" id="comment_<%= comment.id %>_like" data-placement="bottom" data-toggle="tooltip" data-original-title="<%= comment.liking_site_titles.join('<br>') %>" onclick="Comment.toggleLike(<%= comment.id %>, '<%= csrf_token %>'); return false"><%= comment.site_likes?(current_site) ? 'Unlike' : 'Like' %><%= comment_likes_count > 0 ? " (#{comment_likes_count})" : '' %></a>
<% else %> <% else %>
<% if comment_likes_count > 0 %> <% if comment_likes_count > 0 %>
<%= comment_likes_count %>&nbsp;<%= comment_likes_count == 1 ? 'like' : 'likes' %> <%= comment_likes_count %>&nbsp;<%= comment_likes_count == 1 ? 'like' : 'likes' %>

2
views/_news_actions.erb
View file

@ -1,7 +1,7 @@
<div id="event_<%= event.id %>_actions" class="actions"> <div id="event_<%= event.id %>_actions" class="actions">
<% event_likes_count = event.likes_dataset.count %> <% event_likes_count = event.likes_dataset.count %>
<% if current_site %> <% if current_site %>
<a href="#" id="like" data-placement="bottom" data-toggle="tooltip" data-original-title="<%= event.liking_site_names.join('<br>') %>" onclick="new Like(<%= event.id %>, '<%= csrf_token %>').toggleLike(); return false"><%= event.site_likes?(current_site) ? 'Unlike' : 'Like' %><%= event_likes_count > 0 ? " (#{event_likes_count})" : '' %></a> <a href="#" id="like" data-placement="bottom" data-toggle="tooltip" data-original-title="<%= event.liking_site_titles.join('<br>') %>" onclick="new Like(<%= event.id %>, '<%= csrf_token %>').toggleLike(); return false"><%= event.site_likes?(current_site) ? 'Unlike' : 'Like' %><%= event_likes_count > 0 ? " (#{event_likes_count})" : '' %></a>
<% else %> <% else %>
<% if event_likes_count > 0 %> <% if event_likes_count > 0 %>
<%= event_likes_count %>&nbsp;<%= event_likes_count == 1 ? 'like' : 'likes' %> <%= event_likes_count %>&nbsp;<%= event_likes_count == 1 ? 'like' : 'likes' %>

2
views/_news_profile_comment.erb
View file

@ -1,6 +1,6 @@
<div class="title"> <div class="title">
<div class="icon" style="background-image:url(<%= profile_comment.actioning_site.screenshot_url('index.html', '82x62') %>);"></div> <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.username %></a> <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"><%= profile_comment.created_at.ago %></span>
<div class="comment"><%= profile_comment.message %></div> <div class="comment"><%= profile_comment.message %></div>
</div> </div>