Fix rebase with master.

app/assets/stylesheets/participation.scss

@@ -249,7 +249,8 @@
 .proposal-form,
 .budget-investment-form,
 .spending-proposal-form,
-.document-form {
+.document-form,
+.topic-form  {
 
   .icon-debates,
   .icon-proposals,
@@ -298,6 +299,7 @@
 }
 
 .proposal-form,
+.topic-form,
 .document-form {
 
   .recommendations li::before {
@@ -630,7 +632,8 @@
 .proposal,
 .investment-project,
 .budget-investment,
-.legislation {
+.legislation,
+.communities-show  {
   margin: $line-height / 4 0;
 
   .panel {
@@ -702,7 +705,8 @@
   .debate-info,
   .proposal-info,
   .investment-project-info,
-  .budget-investment-info {
+  .budget-investment-info,
+  .topic-info {
     color: $text-medium;
     font-size: $small-font-size;
     margin: rem-calc(6) 0 0;

app/controllers/communities_controller.rb

@@ -1,6 +1,6 @@
 class CommunitiesController < ApplicationController
 
-  before_action :set_order, :set_community, :load_topics, only: :show
+  before_action :set_order, :set_community, :load_topics, :load_participants, only: :show
 
   has_orders %w{newest most_commented oldest}, only: :show
 

app/views/topics/_form.html.erb

@@ -2,18 +2,17 @@
 
   <%= render 'shared/errors', resource: @topic %>
 
-    <%= render 'shared/errors', resource: @topic %>
+  <div class="row">
-
+    <div class="small-12 column">
-    <div class="row">
+      <%= f.label :title, t("community.topic.form.topic_title") %>
-      <div class="small-12 column">
+      <%= f.text_field :title, label: false %>
-        <%= f.label :title, t("community.topic.form.topic_title") %>
+      <%= f.label :description, t("community.topic.form.topic_description") %>
-        <%= f.text_field :title, label: false %>
+      <%= f.text_area :description, label: false %>
-        <%= f.label :description, t("community.topic.form.topic_description") %>
+    </div>
-        <%= f.text_area :description, label: false %>
-      </div>
 
     <div class="actions small-12 column">
       <%= f.submit(class: "button", value: t("community.topic.form.#{action_name}.submit_button")) %>
     </div>
   </div>
+  
 <% end %>

app/views/topics/edit.html.erb

@@ -1,7 +1,7 @@
 <div class="topic-form row">
 
   <div class="small-12 medium-9 column">
-    <%= render "shared/back_link" %>
+    <%= back_link_to community_path(@community) %>
     <h1><%= t("community.topic.edit") %></h1>
     <%= render "form" %>
   </div>

app/views/topics/new.html.erb

@@ -1,6 +1,6 @@
 <div class="topic-new row">
   <div class="small-12 medium-9 column">
-    <%= render "shared/back_link" %>
+    <%= back_link_to community_path(@community) %>
     <h1><%= t("community.topic.create") %></h1>
     <%= render 'form' %>
   </div>

app/views/topics/show.html.erb

@@ -1,9 +1,9 @@
 <div class="row topic-show">
   <div class="small-12 medium-12 column">
-    <%= render "shared/back_link" %>
+    <%= back_link_to community_path(@community) %>
     <br>
 
-    <p><%= t("community.topic.show.community_of_the_proposal") %> <strong><%= community_title(@community) %></strong></p>
+    <p><%= community_text(@community) %> <strong><%= community_title(@community) %></strong></p>
     <h1><%= @topic.title %></h1>
     <div class="topic-info">
       <p><%= @topic.description %></p>

config/locales/en/community.yml

@@ -1,8 +1,8 @@
 en:
   community:
     sidebar:
-      title: Comunidad
+      title: Community
-      description: Partecipa a la comunidad de usuarios, da tu opinión.
+      description: Join the community of users, give your opinion.
       button_to_access: Access the community
     show:
       title:
@@ -39,7 +39,6 @@ en:
         update:
           submit_button: Update topic
       show:
-        community_of_the_proposal: Community of the proposal
         tab:
           comments_tab: Comments
       sidebar:

config/locales/es/community.yml

@@ -39,7 +39,6 @@ es:
         update:
           submit_button: Actualizar tema
       show:
-        community_of_the_proposal: Comunidad de la propuesta
         tab:
           comments_tab: Comentarios
       sidebar: