Renaming class. Topic show: Added author_info.

This commit is contained in:
Alessandro Cuoghi
2017-08-08 17:01:58 +02:00
committed by taitus
parent 11f6515e84
commit e5fb90f954
5 changed files with 34 additions and 11 deletions

View File

@@ -33,15 +33,25 @@
} }
} }
.communities-participantes{ .communities-participants{
.comment-body{ .comment-body{
display: inline-block; display: inline-block;
float: left; float: left;
margin-right: $line-height; margin-right: $line-height;
margin-bottom: $line-height;
} }
} }
.topic-show{ .topic-show{
p{ p{
margin-bottom: 0; margin-bottom: 0;
} }
ul li {
margin-bottom:0;
}
.comments{
.first-comment{
margin-top: $line-height;
margin-bottom: $line-height;
}
}
} }

View File

@@ -316,7 +316,9 @@
.debate-quiz, .debate-quiz,
.budget-investment-show, .budget-investment-show,
.draft-panels, .draft-panels,
.debate-questions { .debate-questions,
.communities-show,
.topic-show {
p { p {
word-wrap: break-word; word-wrap: break-word;
@@ -350,7 +352,8 @@
.debate-info, .debate-info,
.proposal-info, .proposal-info,
.investment-project-info, .investment-project-info,
.budget-investment-show { .budget-investment-show,
.topic-info {
clear: both; clear: both;
color: $text-medium; color: $text-medium;
font-size: $small-font-size; font-size: $small-font-size;

View File

@@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<div class="row column communities-participantes"> <div class="row column communities-participants">
<ul class="tabs" data-tabs id="communities-show-tabs"> <ul class="tabs" data-tabs id="communities-show-tabs">
<li class="tabs-title is-active"> <li class="tabs-title is-active">
<%= link_to "#tab-participantes" do %> <%= link_to "#tab-participantes" do %>

View File

@@ -1,13 +1,20 @@
<% cache [locale_and_user_status, @current_order, commentable_cache_key(@topic), @comment_tree.comments, @comment_tree.comment_authors, @topic.comments_count, @comment_flags] do %> <% cache [locale_and_user_status, @current_order, commentable_cache_key(@topic), @comment_tree.comments, @comment_tree.comment_authors, @topic.comments_count, @comment_flags] do %>
<div class="row comments"> <div class="row comments">
<div id="comments" class="small-12 column"> <div id="comments" class="small-12 column">
<%= render 'shared/wide_order_selector', i18n_namespace: "comments" %> <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %>
<!-- <p class="first-comment"><%= @topic.description_as_comment %></p> -->
<% @comment_tree.root_comments.each do |comment| %>
<%= render 'comments/comment', comment: comment %>
<% end %>
<%= paginate @comment_tree.root_comments %>
<% if user_signed_in? %> <% if user_signed_in? %>
<%= render 'comments/form', {commentable: @topic, parent_id: nil, toggeable: false} %> <%= render 'comments/form', {commentable: @topic, parent_id: nil, toggeable: false} %>
<% else %> <% else %>
<br> <br>
<div data-alert class="callout primary"> <div data-alert class="callout primary">
<%= t("topics.show.login_to_comment", <%= t("topics.show.login_to_comment",
signin: link_to(t("votes.signin"), new_user_session_path), signin: link_to(t("votes.signin"), new_user_session_path),
@@ -15,10 +22,6 @@
</div> </div>
<% end %> <% end %>
<% @comment_tree.root_comments.each do |comment| %>
<%= render 'comments/comment', comment: comment %>
<% end %>
<%= paginate @comment_tree.root_comments %>
</div> </div>
</div> </div>
<% end %> <% end %>

View File

@@ -2,12 +2,19 @@
<div class="small-12 medium-12 column"> <div class="small-12 medium-12 column">
<%= render "shared/back_link" %> <%= render "shared/back_link" %>
<br> <br>
<p>Comunidad: <strong><%= @community.proposal.title %></strong></p> <p>Comunidad de la propuesta: <strong><%= @community.proposal.title %></strong></p>
<h1><%= @topic.title %></h1> <h1><%= @topic.title %></h1>
<div class="topic-info">
<%= render '/shared/author_info', resource: @topic %>
<span class="bullet">&nbsp;&bull;&nbsp;</span>
<%= l @topic.created_at.to_date %>
<span class="bullet">&nbsp;&bull;&nbsp;</span>
<span class="icon-comments"></span>&nbsp;
</div>
<div class="tabs-content" data-tabs-content="proposals-tabs" role="tablist"> <div class="tabs-content" data-tabs-content="proposals-tabs" role="tablist">
<%= render "topics/filter_subnav" %> <%= render "topics/filter_subnav" %>
<div class="tabs-panel is-active" id="tab-comments"> <div class="tabs-panel is-active" id="tab-comments">
<%= render "topics/comments" %> <%= render "topics/comments" %>
</div> </div>