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

Jump to bottom

Poll comments #1961

Merged
merged 10 commits into from
Oct 10, 2017
Merged

Poll comments #1961

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
63cbe2f
20171003 - [WIP] Functionality and tests for polls comments
zamuro Oct 3, 2017
c3d7d47
20171004 - Refactored specs for polls comments
zamuro Oct 4, 2017
8277e3c
removed obsolete polls questions view
zamuro Oct 5, 2017
2b58875
Merge branch 'master' into mlucena-poll-comments
voodoorai2000 Oct 9, 2017
faa2f31
Adds comment's tab
voodoorai2000 Oct 10, 2017
23397ee
increases consistency by moving comment's view to poll's folder
voodoorai2000 Oct 10, 2017
d405d70
add translations
voodoorai2000 Oct 10, 2017
37cae41
adds specs
voodoorai2000 Oct 10, 2017
843048a
cleans up
voodoorai2000 Oct 10, 2017
ffdbdac
fixes specs
voodoorai2000 Oct 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Adds comment's tab
  • Loading branch information
@voodoorai2000
voodoorai2000 committed Oct 10, 2017
commit faa2f31b3a4c698fa134d2d5df0db82ccbcbb5d8
14 changes: 14 additions & 0 deletions app/views/polls/_filter_subnav.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<div class="row">
<div class="small-12 column">
<ul class="tabs" data-tabs id="polls-tabs">
<li class="tabs-title is-active">
<%= link_to "#tab-comments" do %>
<h3>
<%= t("polls.show.comments_tab") %>
<span class="js-comments-count">(<%= @poll.comments_count %>)</span>
</h3>
<% end %>
</li>
</ul>
</div>
</div>
12 changes: 8 additions & 4 deletions app/views/polls/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,14 @@
</div>
<% end %>
</div>

<div class="tabs-panel is-active" id="tab-comments">
<%= render "shared/comments" %>
</div>

</div>
</div>

<div class="tabs-content" data-tabs-content="proposals-tabs" role="tablist">
Copy link
Collaborator

@decabeza decabeza Oct 10, 2017 •
edited

Choose a reason for hiding this comment

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

This should be data-tabs-content="polls-tabs" and adds to class="tabs-content"a margin-top class 😉

<%= render "filter_subnav" %>

<div class="tabs-panel is-active" id="tab-comments">
<%= render "comments" %>
</div>
</div>