diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index 5b8bc029f..043cfe4f6 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -240,6 +240,14 @@ a { color: $text; } + + ul, ol { + + li { + font-size: rem-calc(13); + margin-bottom: rem-calc(12); + } + } } .truncate { @@ -433,6 +441,14 @@ } } + ul, ol { + + li { + font-size: rem-calc(13); + margin-bottom: rem-calc(12); + } + } + .author-photo { line-height: $line-height*2; margin-right: rem-calc(6); diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index 8325df00f..43d040ecb 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -280,7 +280,7 @@ header { min-height: rem-calc(48); @media (min-width: $small-breakpoint) { - min-height: rem-calc(189); + min-height: 189px; } } @@ -901,12 +901,6 @@ form { } } -.alert-layout { - position: absolute; - top: 0; - width: 100%; -} - span.error, small.error { background: $alert-bg; color: $alert-color; @@ -923,6 +917,11 @@ label.error, label.error a { color: $alert-color; } +.alert-messages { + background-color: white; + padding-top: rem-calc(24); +} + // 10. User account // - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1351,7 +1350,7 @@ table { // - - - - - - - - - - - - - - - - - - - - - - - - - .verification { - min-height: 60%; + min-height: rem-calc(600); @media (min-width: $small-breakpoint) { .left + .left { diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb index 1d7ecaf7e..5fe455a6f 100644 --- a/app/views/account/show.html.erb +++ b/app/views/account/show.html.erb @@ -2,7 +2,7 @@
<%= link_to t("account.show.change_credentials_link"), edit_user_registration_path, class: "button radius small secondary right" %> -
+
<% if @debate.new_record? %> <%= f.label :terms_of_service do %> <%= f.check_box :terms_of_service, label: false %> - <%= t("form.accept_terms", - policy: link_to(t("form.policy"), "/privacy", target: "blank"), conditions: link_to(t("form.conditions"), "/conditions", target: "blank")).html_safe - %> + + <%= t("form.accept_terms", + policy: link_to(t("form.policy"), "/privacy", target: "blank"), + conditions: link_to(t("form.conditions"), "/conditions", target: "blank")).html_safe %> + <% end %> <% end %>
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 2dc643303..d1e05d702 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -13,6 +13,11 @@ <% end %>

<%= @debate.title %>

+ +
+ <%= t("debates.show.flag") %> +
+
<%= avatar_image(@debate.author, seed: @debate.author_id, size: 32, class: 'author-photo') %> diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 5ed84bc65..f341f4bd0 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -21,17 +21,23 @@
-

<%= t("layouts.footer.participation_title") %>

+

+ <%= link_to t("layouts.footer.participation_title"), root_path %> +

<%= t("layouts.footer.participation_text") %>

-

<%= t("layouts.footer.transparency_title") %>

+

+ <%= link_to t("layouts.footer.transparency_title"), "/transparency" %> +

<%= t("layouts.footer.transparency_text") %>

-

<%= t("layouts.footer.open_data_title") %>

+

+ <%= link_to t("layouts.footer.open_data_title"), "/opendata" %> +

<%= t("layouts.footer.open_data_text") %>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b9e33e7b3..c9fa49ee0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -16,21 +16,25 @@ <%= render 'layouts/header' %> <% if notice %> -
- × -
+
+
+
+ × <%= notice %>
+
<% end %> <% if alert %> -
- × -
+
+
+
+ × <%= alert %>
+
<% end %> <%= yield %> diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb index 1c6c7f5f2..2e330b752 100644 --- a/app/views/users/registrations/edit.html.erb +++ b/app/views/users/registrations/edit.html.erb @@ -1,45 +1,40 @@ -
- +<% end %> diff --git a/app/views/verification/residence/new.html.erb b/app/views/verification/residence/new.html.erb index b66e5b179..30d86f4b5 100644 --- a/app/views/verification/residence/new.html.erb +++ b/app/views/verification/residence/new.html.erb @@ -54,10 +54,12 @@
<%= f.label :terms_of_service do %> <%= f.check_box :terms_of_service, label: false %> - <%= t("verification.residence.new.accept_terms_text", - terms_url: link_to(t("verification.residence.new.terms"), "/census_terms", - target: "_blank")).html_safe - %> + + <%= t("verification.residence.new.accept_terms_text", + terms_url: link_to(t("verification.residence.new.terms"), "/census_terms", + target: "_blank")).html_safe + %> + <% end %>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index 48072ab3b..023be82fe 100644 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -14,7 +14,7 @@ en: debate_topics: Debate topics hidden_debates: Hidden debates hidden_comments: Hidden comments - hidden_users: Hidden users + hidden_users: Blocked users organizations: Organizations officials: Officials moderators: Moderators diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 1bd9364a5..ab894241a 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -14,7 +14,7 @@ es: debate_topics: Temas de debate hidden_debates: Debates ocultos hidden_comments: Comentarios ocultos - hidden_users: Usuarios ocultos + hidden_users: Usuarios bloqueados organizations: Organizaciones officials: Cargos públicos moderators: Moderadores diff --git a/config/locales/en.yml b/config/locales/en.yml index a37835813..af4a29659 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -34,7 +34,7 @@ en: footer: description: "The city you want, it will be the city you want. %{more_info} here on this page. - This Open Government Portal is %{open_source}, and code is in %{github}. + This Open Government Portal use Consul v.0.9 application, is %{open_source}, and code is in %{github}. Madrid, for the whole world." more_info: Get more information more_info_url: "/more_information" @@ -111,9 +111,8 @@ en: debate_text: Initial text for debate tags_label: Topics tags_instructions: > - Tag this debate. You can choose among our proposals on the list or add any other topic you want by - writing them separated by ",". - Some suggestions: + Tag this debate. You can choose among our proposals on the list or add any other topic you want. + tags_placeholder: "Add topics writing them separated by ','" show: back_link: Back author_deleted: Deleted user @@ -125,6 +124,7 @@ en: login_to_comment: "You need to %{signin} or %{signup} to comment." edit_debate_link: Edit share: Share + flag: "This debate has been flag as innapropiate for some users." edit: editing: Edit debate show_link: Show debate diff --git a/config/locales/es.yml b/config/locales/es.yml index d08edd1cc..f86723631 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -34,7 +34,7 @@ es: footer: description: "La ciudad que quieres, será la ciudad que quieras. %{more_info} sobre esta página. - Este Portal de Gobierno Abierto es %{open_source}, y su código se encuentra en %{github}. + Este Portal de Gobierno Abierto usa la aplicación Consul v.0.9 que es %{open_source}, y su código se encuentra en %{github}. De Madrid, para el mundo entero." more_info: Obtén más información more_info_url: "/more_information" @@ -112,8 +112,7 @@ es: tags_label: Temas tags_instructions: > Etiqueta este debate. Puedes elegir entre nuestras propuestas o introducir las que desees. - Para ello solo tienes que escribir las etiquetas que desees separadas por ",". - Algunas recomendaciones: + tags_placeholder: "Escribe las etiquetas que desees separadas por ','" show: back_link: Volver author_deleted: Usuario eliminado @@ -125,6 +124,7 @@ es: login_to_comment: "Necesitas %{signin} o %{signup} para comentar." edit_debate_link: Editar share: Compartir + flag: "Este debate ha sido marcado como inapropiado por varios usuarios." edit: editing: Editar debate show_link: Ver debate