diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 6db475365..19c73de32 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -9,6 +9,7 @@ @import 'pages'; @import 'legislation'; @import 'legislation_process'; +@import 'community'; @import 'custom'; @import 'c3'; @import 'annotator.min'; diff --git a/app/assets/stylesheets/community.scss b/app/assets/stylesheets/community.scss new file mode 100644 index 000000000..643f7b994 --- /dev/null +++ b/app/assets/stylesheets/community.scss @@ -0,0 +1,50 @@ +.communities-show{ + + .wide-order-selector{ + margin-top: 0; + } + + .panel{ + background: #fff; + border: 1px solid; + border-color: #e5e6e9 #dfe0e4 #d0d1d5; + border-radius: 0; + box-shadow: 0 1px 3px 0 #dee0e3; + margin-bottom: 0.75rem; + min-height:7rem; + padding: 0.75rem 0.75rem 0; + } + + .panel { + h3{ + font-weight: bold; + margin-top: $line-height / 2; + } + + a { + color: $text; + } + .nopadding{ + padding: 0; + } + .button{ + margin-top: $line-height; + } + + .topic-info{ + + color: #515151; + font-size: 0.875rem; + margin: 0.375rem 0 0; + + .icon-comments { + font-size: rem-calc(16); + vertical-align: top; + } + + a { + color: $text-medium; + } + } + } +} diff --git a/app/views/topics/_form.html.erb b/app/views/topics/_form.html.erb index 192e11fff..a5cc1532f 100644 --- a/app/views/topics/_form.html.erb +++ b/app/views/topics/_form.html.erb @@ -4,14 +4,13 @@
- <%= f.label :title, t("topic.form.topic_title") %> - <%= f.text_field :title %> - <%= f.label :description_as_comment, t("topic.form.topic_description_as_comment") %> - <%= f.text_area :description_as_comment, maxlength: Comment.body_max_length %> + <%= f.label :title, t("community.topic.form.topic_title") %> + <%= f.text_field :title, label: false %>
- <%= f.submit(class: "button", value: t("topic.#{action_name}.form.submit_button")) %> + <%= f.submit(class: "button", value: t("community.topic.form.submit_button")) %> + <%#= f.submit(class: "button", value: t("community.topic.#{action_name}.form.submit_button")) %>
<% end %> diff --git a/app/views/topics/_topics.html.erb b/app/views/topics/_topics.html.erb index 7c28e0d9a..0e6709daf 100644 --- a/app/views/topics/_topics.html.erb +++ b/app/views/topics/_topics.html.erb @@ -1,20 +1,43 @@ -
- Ordenar por: +
+
+
+
+
+ +
+ +
+ +
+
+
+
<% if topics.any? %> <% topics.each do |topic| %> -
- <%= link_to topic.title, community_topic_path(@community, topic) %> -

- <%= link_to t("proposals.proposal.comments", count: topic.comments_count), community_topic_path(@community, topic, anchor: "comments") %> - <%= topic.author.name %> - <%= I18n.l topic.created_at %> -

- - <% if topic.author == current_user %> - <%= link_to t("topic.edit"), edit_community_topic_path(@community.id, topic), class: 'button expanded' %> - <% end %> +
+
+

<%= link_to topic.title, community_topic_path(@community, topic) %>

+

+   + <%= link_to t("proposals.proposal.comments", count: topic.comments_count), community_topic_path(@community, topic, anchor: "comments") %> +  •  + <%= I18n.l topic.created_at.to_date %> +  •  + <%= topic.author.name %> +

+
+
+ <% if topic.author == current_user %> + <%= link_to t("community.topic.edit_button"), edit_community_topic_path(@community.id, topic), class: 'button small hollow' %> + <% end %> +
<% end %> <% else %> diff --git a/app/views/topics/edit.html.erb b/app/views/topics/edit.html.erb index 7d6254258..9f443b5d9 100644 --- a/app/views/topics/edit.html.erb +++ b/app/views/topics/edit.html.erb @@ -1,10 +1,18 @@
-
+
<%= render "shared/back_link" %> -

<%= t("topic.edit.editing") %>

- <%= render "form" %>
+ +
+ +

<%= t("community.sidebar.topic.recommendations_title") %>

+
    +
  • <%= t("community.sidebar.topic.recommendation_one") %>
  • +
  • <%= t("community.sidebar.topic.recommendation_two") %>
  • +
  • <%= t("community.sidebar.topic..recommendation_three") %>
  • +
+
diff --git a/app/views/topics/new.html.erb b/app/views/topics/new.html.erb index d420e730f..475ad4872 100644 --- a/app/views/topics/new.html.erb +++ b/app/views/topics/new.html.erb @@ -1,13 +1,20 @@
<%= render "shared/back_link" %> -

<%= t("topic.create") %>

+

<%= t("community.topic.create") %>

<%= render '/topics/form' %> <%#= render '/topics/form', form_url: budget_investments_path(@budget) %>
-
- Recomendaciones para crear un tema + +
+ +

<%= t("community.sidebar.topic.recommendations_title") %>

+
    +
  • <%= t("community.sidebar.topic.recommendation_one") %>
  • +
  • <%= t("community.sidebar.topic.recommendation_two") %>
  • +
  • <%= t("community.sidebar.topic..recommendation_three") %>
  • +
diff --git a/config/locales/es/community.yml b/config/locales/es/community.yml index fd5ce9e44..958a9ce37 100644 --- a/config/locales/es/community.yml +++ b/config/locales/es/community.yml @@ -4,7 +4,21 @@ es: title: Comunidad description: Partecipa a la comunidad de usuarios, da tu opinión. button_to_access: Acceder a la comunidad + topic: + title: Participa + new_topic: Crea un tema + recommendations_title: Recomendaciones para crear un tema + recommendation_one: No escribas el título del tema o frases enteras en mayúsculas. En internet eso se considera gritar. Y a nadie le gusta que le griten. + recommendation_two: Cualquier tema o comentario que implique una acción ilegal será eliminada, también las que tengan la intención de sabotear los espacios del tema, todo lo demás está permitido. + recommendation_three: Disfruta de este espacio, de las voces que lo llenan, también es tuyo show: title: Comunidad de usuarios description: Participa en la comunidad de esta propuesta + + topic: + create: Crear un tema + edit_button: Editar + form: + topic_title: Titulo del tema + submit_button: Crear tema