more work on comments for events

This commit is contained in:
Kyle Drake 2014-05-01 19:20:34 -07:00
parent eba4a6e3f5
commit b96730b83f
17 changed files with 2298 additions and 43 deletions

View file

@ -1,10 +1,36 @@
<script src="/assets/scripts/news/template.js"></script>
<script src="/assets/scripts/news/like.js"></script>
<script src="/assets/scripts/news/comment.js"></script>
<% events.each do |event| %>
<% if event.profile_comment_id %>
<%== erb :'_news_profile_comment', layout: false, locals: {profile_comment: event.profile_comment} %>
<div class="news-item comment for-me">
<%== erb :'_news_profile_comment', layout: false, locals: {profile_comment: event.profile_comment} %>
<% end %>
<%== erb :'_news_actions', layout: false, locals: {event: event} %>
<% if event.comments_dataset.count > 0 %>
<div class="content">
<div class="comments">
<% event.comments.each do |comment| %>
<div class="comment">
<img class="avatar" src="<%= comment.actioning_site.screenshot_url('index.html', '82x62') %>">
<a href="" class="user"><%= comment.actioning_site.username %></a>
<span class="date"><%= comment.created_at.ago %></span>
<p><%= comment.message %></p>
</div>
<div class="actions"><a href="">Like (1)</a></div>
<% end %>
</div>
</div>
<% end %>
</div>
<% end %>
<%== erb :'_news_templates', layout: false %>
<!--
<div class="news-item follow">
<div class="title">

View file

@ -7,5 +7,7 @@
<%= event_like_count %> <%= event_like_count == 1 ? 'like' : 'likes' %>
<% end %>
<% end %>
<a href="">Reply</a>
<% if current_site %>
<a id="reply" href="#" onclick="Template.renderComment(<%= event.id %>); return false">Reply</a>
<% end %>
</div>

View file

@ -1,10 +1,6 @@
<div class="news-item comment for-me">
<div class="title">
<div class="icon" style="background-image:url(<%= profile_comment.actioning_site.screenshot_url('index.html', '82x62') %>);"></div>
<a href="" class="user"><%= profile_comment.actioning_site.username %></a>
<span class="date"><%= profile_comment.created_at.ago %></span>
<div class="comment"><%= profile_comment.message %></div>
</div>
<%== erb :'_news_actions', layout: false, locals: {event: profile_comment.event} %>
<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.username %></a>
<span class="date"><%= profile_comment.created_at.ago %></span>
<div class="comment"><%= profile_comment.message %></div>
</div>

View file

@ -0,0 +1,6 @@
<div id="comment-template" style="display: none">
<form onsubmit="new Comment({{ event_id }}, '<%= csrf_token %>').create(this); location.reload(); return false">
<input name="comment" type="text" autocomplete="off" maxlength="<%= Site::MAX_COMMENT_SIZE %>" style="width: 100%" placeholder="Comment on this...">
<button class="btn-Action">Post</button>
</form>
</div>

View file

@ -51,6 +51,7 @@
</footer>
<script src="/assets/scripts/jquery-1.11.0.min.js"></script>
<script src="/assets/scripts/underscore-min.js"></script>
<script src="/assets/scripts/nav.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
</body>

View file

@ -33,7 +33,7 @@
<div class="post-comment">
<form method="POST" action="/profile/<%= site.username %>/comment">
<input name="csrf_token" type="hidden" value="<%= csrf_token %>">
<input name="message" type="text" placeholder="Post a message..." maxlength="<%= Site::MAX_COMMENT_SIZE %>">
<input name="message" type="text" placeholder="Post a message..." autocomplete="off" maxlength="<%= Site::MAX_COMMENT_SIZE %>">
<button class="btn-Action">Post</button>
</form>
</div>