diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 84c223170..075abed8c 100644 --- a/app/assets/stylesheets/participation.scss +++ b/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; diff --git a/app/controllers/communities_controller.rb b/app/controllers/communities_controller.rb index 5efa48f9a..72c368eb1 100644 --- a/app/controllers/communities_controller.rb +++ b/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 diff --git a/app/views/topics/_form.html.erb b/app/views/topics/_form.html.erb index 0257ab926..3feba50c4 100644 --- a/app/views/topics/_form.html.erb +++ b/app/views/topics/_form.html.erb @@ -2,18 +2,17 @@ <%= render 'shared/errors', resource: @topic %> - <%= render 'shared/errors', resource: @topic %> - -
<%= t("community.topic.show.community_of_the_proposal") %> <%= community_title(@community) %>
+<%= community_text(@community) %> <%= community_title(@community) %>
<%= @topic.description %>
diff --git a/config/locales/en/community.yml b/config/locales/en/community.yml index 1aa78574a..27b4dee11 100644 --- a/config/locales/en/community.yml +++ b/config/locales/en/community.yml @@ -1,8 +1,8 @@ en: community: sidebar: - title: Comunidad - description: Partecipa a la comunidad de usuarios, da tu opinión. + title: Community + 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: diff --git a/config/locales/es/community.yml b/config/locales/es/community.yml index 9d8eaac59..ae89a4abb 100644 --- a/config/locales/es/community.yml +++ b/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: