diff --git a/CODE_OF_CONDUCT_ES.md b/CODE_OF_CONDUCT_ES.md index dd3835dcd..7e8586adf 100644 --- a/CODE_OF_CONDUCT_ES.md +++ b/CODE_OF_CONDUCT_ES.md @@ -1,22 +1,46 @@ -# Código de conducta +# Código de Conducta convenido para Contribuyentes -Como las personas encargadas de contribuir código y responsables de mantener este proyecto, y con la intención de crear una comunidad abierta en la que sentirse bienvenido acordamos respetar a toda persona que contribuya al proyecto reportando incidencias, creando peticiones de funcionalidades, actualizando la documentación, enviando parches de código o de alguna otra manera. +## Nuestro compromiso -Estamos comprometidos a hacer de la participación en este proyecto una experiencia libre de acoso para todo el mundo, independientemente del nivel de experiencia, género, identidad y expresión de género, orientación sexual, discapacidad, apariencia personal, raza, etnia, edad, religión o nacionalidad. +En el interés de fomentar una comunidad abierta y acogedora, nosotros como contribuyentes y administradores nos comprometemos a hacer de la participación en nuestro proyecto y nuestra comunidad una experiencia libre de acoso para todos, independientemente de la edad, dimensión corporal, discapacidad, etnia, identidad y expresión de género, nivel de experiencia, nacionalidad, apariencia física, raza, religión, identidad u orientación sexual. -Ejemplos de comportamiento inaceptable por parte de los participantes incluyen: +## Nuestros estándares -* El uso de imágenes o lenguaje sexual -* Ataques personales -* Comentarios insultantes/despectivos +Ejemplos de comportamiento que contribuyen a crear un ambiente positivo: + +* Uso de lenguaje amable e inclusivo +* Respeto a diferentes puntos de vista y experiencias +* Aceptación de críticas constructivas +* Enfocarse en lo que es mejor para la comunidad +* Mostrar empatía a otros miembros de la comunidad + +Ejemplos de comportamiento inaceptable por participantes: + +* Uso de lenguaje o imágenes sexuales y atención sexual no deseada +* Comentarios insultantes o despectivos (*trolling*) y ataques personales o políticos * Acoso público o privado -* Publicación de información privada de terceros, como la dirección física o electrónica, sin permiso explícito -* Otras conductas poco éticas o no profesionales +* Publicación de información privada de terceros sin su consentimiento, como direcciones físicas o electrónicas +* Otros tipos de conducta que pudieran considerarse inapropiadas en un entorno profesional. -Los administradores del proyecto tienen el derecho y la responsabilidad de eliminar, editar o rechazar comentarios, commits, código, ediciones de wikis, incidencias y otro tipo de aportaciones que no estén en línea con este Código de Conducta. Por el hecho de adoptar este Código de Conducta, los responsables del proyecto se comprometen a aplicar sus principios de manera justa y consistente en todos los aspectos relacionados con el desarrollo del proyecto. Los responsables del proyecto que no sigan ni obliguen a cumplir este código de conducta pueden ser apartados del equipo del proyecto. +## Nuestras responsabilidades -Este código de conducta tiene validez tanto en el proyecto como en espacios públicos en los que un individuo esté representando al proyecto o a su comunidad. +Los administradores del proyecto son responsables de clarificar los estándares de comportamiento aceptable y se espera que tomen medidas correctivas y apropiadas en respuesta a situaciones de conducta inaceptable. -Las ocurrencias de abuso, acoso u otro comportamiento inaceptable se puede reportar abriendo una incidencia o contactando a uno o más de los miembros del equipo responsable del proyecto. +Los administradores del proyecto tienen el derecho y la responsabilidad de eliminar, editar o rechazar comentarios, *commits*, código, ediciones de documentación, *issues*, y otras contribuciones que no estén alineadas con este Código de Conducta, o de prohibir temporal o permanentemente a cualquier colaborador cuyo comportamiento sea inapropiado, amenazante, ofensivo o perjudicial. -Este Código de Conducta es una adaptación del [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, disponible en [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) +## Alcance + +Este código de conducta aplica tanto a espacios del proyecto como a espacios públicos donde un individuo esté en representación del proyecto o comunidad. Ejemplos de esto incluye el uso de la cuenta oficial de correo electrónico, publicaciones a través de las redes sociales oficiales, o presentaciones con personas designadas en eventos *online* u *offline*. La representación del proyecto puede ser clarificada explicitamente por los administradores del proyecto. + +## Aplicación + +Ejemplos de abuso, acoso u otro tipo de comportamiento inaceptable puede ser reportado al equipo del proyecto en consul@madrid.es. Todas las quejas serán revisadas e investigadas, generando un resultado apropiado a las circunstancias. El equipo del proyecto está obligado a mantener confidencialidad de la persona que reportó el incidente. Detalles específicos acerca de las políticas de aplicación pueden ser publicadas por separado. + +Administradores que no sigan o que no hagan cumplir este Código de Conducta pueden ser eliminados de forma temporal o permanente del equipo administrador. + +## Atribución + +Este Código de Conducta es una adaptación del [Contributor Covenant][homepage], versión 1.4, disponible en [http://contributor-covenant.org/version/1/4/es/][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/es/ diff --git a/CUSTOMIZE_EN.md b/CUSTOMIZE_EN.md index 542d11ee7..3a97b96de 100644 --- a/CUSTOMIZE_EN.md +++ b/CUSTOMIZE_EN.md @@ -1,12 +1,12 @@ # Customization -You can modify your own Consul to have your custom visual style, but first you'll have to create a fork from [https://github.com/consul/consul](https://github.com/consul/consul) using Github's "fork" button on top right corner. You can use any other service like Gitlab, but don't forget to put a reference link back to Consul on the footer to comply with project's license (GPL Affero 3). +You can modify your own CONSUL to have your custom visual style, but first you'll have to create a fork from [https://github.com/consul/consul](https://github.com/consul/consul) using Github's "fork" button on top right corner. You can use any other service like Gitlab, but don't forget to put a reference link back to CONSUL on the footer to comply with project's license (GPL Affero 3). -We've created an specific structure where you can overwrite and customize the application in a way that will let you keep updating it from Consul's main repository, without having conflicts on code merging or risking loosing your customization changes. We try to make Consul as vanilla as possible to help other developers onboard the codebase. +We've created an specific structure where you can overwrite and customize the application in a way that will let you keep updating it from CONSUL's main repository, without having conflicts on code merging or risking loosing your customization changes. We try to make CONSUL as vanilla as possible to help other developers onboard the codebase. ## Special Folders and Files -In order to customize your Consul fork, you'll make use of some `custom` folders on the following paths: +In order to customize your CONSUL fork, you'll make use of some `custom` folders on the following paths: * `config/locales/custom/` * `app/assets/images/custom/` @@ -207,7 +207,7 @@ TODO ## Updating -We recommend you to add consul as remote: +We recommend you to add CONSUL as remote: ``` git remote add consul https://github.com/consul/consul diff --git a/CUSTOMIZE_ES.md b/CUSTOMIZE_ES.md index e5bea19ad..26204c4e4 100644 --- a/CUSTOMIZE_ES.md +++ b/CUSTOMIZE_ES.md @@ -1,12 +1,12 @@ # Personalización -Puedes modificar consul y ponerle tu propia imagen, para esto debes primero hacer un fork de [https://github.com/consul/consul](https://github.com/consul/consul) creando un repositorio nuevo en Github. Puedes usar otro servicio como Gitlab, pero no te olvides de poner el enlace en el footer a tu repositorio en cumplimiento con la licencia de este proyecto (GPL Affero 3). +Puedes modificar CONSUL y ponerle tu propia imagen, para esto debes primero hacer un fork de [https://github.com/consul/consul](https://github.com/consul/consul) creando un repositorio nuevo en Github. Puedes usar otro servicio como Gitlab, pero no te olvides de poner el enlace en el footer a tu repositorio en cumplimiento con la licencia de este proyecto (GPL Affero 3). -Hemos creado una estructura específica donde puedes sobreescribir y personalizar la aplicación para que puedas actualizar sin que tengas problemas al hacer merge y se sobreescriban por error tus cambios. Intentamos que Consul sea una aplicación Ruby on Rails lo más plain vanilla posible para facilitar el acceso de nuevas desarrolladoras. +Hemos creado una estructura específica donde puedes sobreescribir y personalizar la aplicación para que puedas actualizar sin que tengas problemas al hacer merge y se sobreescriban por error tus cambios. Intentamos que CONSUL sea una aplicación Ruby on Rails lo más plain vanilla posible para facilitar el acceso de nuevas desarrolladoras. ## Ficheros y directorios especiales -Para adaptarlo puedes hacerlo a través de los directorios que están en custom dentro de: +Para adaptar tu fork de CONSUL puedes utilizar alguno de los directorios `custom` que están en las rutas: * `config/locales/custom/` * `app/assets/images/custom/` @@ -207,7 +207,7 @@ TODO ## Actualizar -Te recomendamos que agregues el remote de consul para facilitar este proceso de merge: +Te recomendamos que agregues el remote de CONSUL para facilitar este proceso de merge: ``` git remote add consul https://github.com/consul/consul diff --git a/README.md b/README.md index 8dbfcd281..6b8eed086 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -![Logo of Consul](https://raw.githubusercontent.com/consul/consul/master/public/consul_logo.png) +![Logo of CONSUL](https://raw.githubusercontent.com/consul/consul/master/public/consul_logo.png) -# Consul +# CONSUL Citizen Participation and Open Government Application @@ -17,7 +17,7 @@ Citizen Participation and Open Government Application [![Join the chat at https://gitter.im/consul/consul](https://badges.gitter.im/consul/consul.svg)](https://gitter.im/consul/consul?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://github.com/consul/consul/issues?q=is%3Aissue+is%3Aopen+label%3APRs-welcome) -This is the opensource code repository of the eParticipation website originally developed for the Madrid City government eParticipation website +This is the opensource code repository of the eParticipation website CONSUL, originally developed for the Madrid City government eParticipation website ## Current state @@ -33,7 +33,7 @@ Frontend tools used include [SCSS](http://sass-lang.com/) over [Foundation](http **NOTE**: For more detailed instructions check the [docs](https://github.com/consul/consul/tree/master/doc/en/dev_test_setup.md) -Prerequisites: install git, Ruby 2.3.2, bundler gem, ghostscript and PostgreSQL (>=9.4). +Prerequisites: install git, Ruby 2.3.2, bundler gem, and PostgreSQL (>=9.4). ``` git clone https://github.com/consul/consul.git @@ -104,3 +104,7 @@ Code published under AFFERO GPL v3 (see [LICENSE-AGPLv3.txt](LICENSE-AGPLv3.txt) ## Contributions See [CONTRIBUTING.md](CONTRIBUTING.md) + +## Brand guidelines + +If you want to use CONSUL logo you can [download the guidelines](https://raw.githubusercontent.com/consul/consul/master/public/consul_brand.zip) which contains a use guide and different versions and sizes of the logo. \ No newline at end of file diff --git a/README_ES.md b/README_ES.md index 7b9267351..155ab957f 100644 --- a/README_ES.md +++ b/README_ES.md @@ -1,6 +1,6 @@ -![Logotipo de Consul](https://raw.githubusercontent.com/consul/consul/master/public/consul_logo.png) +![Logotipo de CONSUL](https://raw.githubusercontent.com/consul/consul/master/public/consul_logo.png) -# Consul +# CONSUL Aplicación de Participación Ciudadana y Gobierno Abierto @@ -17,7 +17,7 @@ Aplicación de Participación Ciudadana y Gobierno Abierto [![Join the chat at https://gitter.im/consul/consul](https://badges.gitter.im/consul/consul.svg)](https://gitter.im/consul/consul?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://github.com/consul/consul/issues?q=is%3Aissue+is%3Aopen+label%3APRs-welcome) -Este es el repositorio de código abierto de la Aplicación de Participación Ciudadana Consul, creada originariamente por el Ayuntamiento de Madrid. +Este es el repositorio de código abierto de la Aplicación de Participación Ciudadana CONSUL, creada originariamente por el Ayuntamiento de Madrid. ## Estado del proyecto @@ -32,7 +32,7 @@ Las herramientas utilizadas para el frontend no están cerradas aún. Los estilo **NOTA**: para unas instrucciones más detalladas consulta la [documentación](https://github.com/consul/consul/tree/master/doc/es/dev_test_setup.md) -Prerequisitos: tener instalado git, Ruby 2.3.2, la gema `bundler`, ghostscript y PostgreSQL (9.4 o superior). +Prerequisitos: tener instalado git, Ruby 2.3.2, la gema `bundler` y PostgreSQL (9.4 o superior). ``` @@ -101,3 +101,7 @@ El código de este proyecto está publicado bajo la licencia AFFERO GPL v3 (ver ## Contribuciones Ver fichero [CONTRIBUTING_ES.md](CONTRIBUTING_ES.md) + +## Guía de estilo + +Si quieres usar el logo de CONSUL puedes [descargar la guía de estilo](https://raw.githubusercontent.com/consul/consul/master/public/consul_brand.zip) que contiene una guía de uso y diferentes versiones y tamaños del logo. \ No newline at end of file diff --git a/app/assets/images/apple-touch-icon-200.png b/app/assets/images/apple-touch-icon-200.png index 512569d48..61216ad39 100644 Binary files a/app/assets/images/apple-touch-icon-200.png and b/app/assets/images/apple-touch-icon-200.png differ diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico index a68af1ef8..187043296 100644 Binary files a/app/assets/images/favicon.ico and b/app/assets/images/favicon.ico differ diff --git a/app/assets/images/help/help_icon_budgets.png b/app/assets/images/help/help_icon_budgets.png new file mode 100644 index 000000000..f8a909d7e Binary files /dev/null and b/app/assets/images/help/help_icon_budgets.png differ diff --git a/app/assets/images/help/help_icon_debates.png b/app/assets/images/help/help_icon_debates.png new file mode 100644 index 000000000..c8d59e4c1 Binary files /dev/null and b/app/assets/images/help/help_icon_debates.png differ diff --git a/app/assets/images/help/help_icon_legislation_processes.png b/app/assets/images/help/help_icon_legislation_processes.png new file mode 100644 index 000000000..9dd93ad8c Binary files /dev/null and b/app/assets/images/help/help_icon_legislation_processes.png differ diff --git a/app/assets/images/help/help_icon_polls.png b/app/assets/images/help/help_icon_polls.png new file mode 100644 index 000000000..503f8642d Binary files /dev/null and b/app/assets/images/help/help_icon_polls.png differ diff --git a/app/assets/images/help/help_icon_proposals.png b/app/assets/images/help/help_icon_proposals.png new file mode 100644 index 000000000..05861d042 Binary files /dev/null and b/app/assets/images/help/help_icon_proposals.png differ diff --git a/app/assets/images/icon_home.png b/app/assets/images/icon_home.png deleted file mode 100644 index 2284856eb..000000000 Binary files a/app/assets/images/icon_home.png and /dev/null differ diff --git a/app/assets/images/logo_email.png b/app/assets/images/logo_email.png index ca2d6d54d..09bc18d63 100644 Binary files a/app/assets/images/logo_email.png and b/app/assets/images/logo_email.png differ diff --git a/app/assets/images/logo_header.png b/app/assets/images/logo_header.png index ef5c4f6ff..9bce3cef8 100644 Binary files a/app/assets/images/logo_header.png and b/app/assets/images/logo_header.png differ diff --git a/app/assets/images/social-media-icon.png b/app/assets/images/social-media-icon.png index 512569d48..61216ad39 100644 Binary files a/app/assets/images/social-media-icon.png and b/app/assets/images/social-media-icon.png differ diff --git a/app/assets/stylesheets/_consul_settings.scss b/app/assets/stylesheets/_consul_settings.scss index 6d0f37559..0844f861f 100644 --- a/app/assets/stylesheets/_consul_settings.scss +++ b/app/assets/stylesheets/_consul_settings.scss @@ -43,6 +43,7 @@ $budget: #7e328a; $budget-hover: #7571bf; $highlight: #e7f2fc; +$highlight-soft: #f3f8fd; $light: #f5f7fa; $featured: #ffdc5c; diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index c2bf61463..501b0af6d 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -217,9 +217,8 @@ a { } .menu.vertical { - background: #fff; margin: $line-height 0; - padding: $line-height; + padding: $line-height 0; li { margin-bottom: $line-height; @@ -328,6 +327,10 @@ a { -ms-text-overflow: ellipsis; } +.align-top { + vertical-align: top; +} + // 02. Header // ---------- @@ -425,6 +428,7 @@ header { .menu { &.is-dropdown-submenu { + background: #fff; margin: 0; margin-top: rem-calc(-24); padding: 0; @@ -1830,6 +1834,7 @@ table { .divider { color: $text-light; + display: inline-block; } form { diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 8af8071ea..38a9fb2f8 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -311,7 +311,8 @@ .polls-show, .debate-quiz, .budget-investment-show, -.draft-panels { +.draft-panels, +.debate-questions { p { word-wrap: break-word; @@ -328,10 +329,13 @@ .whatsapp::before { background-color: #43d854; color: #fff; - font-size: 1.7em; - margin-left: rem-calc(0.5); - padding: rem-calc(9.5) rem-calc(9.8); - vertical-align: rem-calc(10); + display: inline-block; + font-size: rem-calc(30); + height: rem-calc(48); + padding-top: rem-calc(9); + text-align: center; + vertical-align: top; + width: rem-calc(48); } .edit-debate, @@ -424,33 +428,30 @@ .document-link, .video-link { - border: 1px solid $border; + background: $highlight-soft; + border: 1px solid $highlight; display: block; margin: $line-height / 2 0; padding: $line-height / 2; position: relative; a { - padding-left: rem-calc(24); + word-wrap: break-word; } - ::before { - color: #007bb7; - content: 'G'; - font-family: "icons" !important; + [class^="icon-"] { + display: inline-block; font-size: rem-calc(24); - left: rem-calc(6); - padding-top: rem-calc(3); - position: absolute; - top: 0; + line-height: $line-height; + vertical-align: middle; } - } - .video-link { + .icon-document { + color: #007bb7; + } - ::before { + .icon-video { color: #cc181e; - content: 'D'; } } @@ -874,6 +875,20 @@ } } +.help-link { + margin-left: $line-height; + position: relative; + + &::before { + color: $link; + content: '\4e'; + font-family: 'icons'; + position: absolute; + left: -24px; + top: -2px; + } +} + // 05. Featured // ------------ @@ -1480,13 +1495,9 @@ .poll, .poll-question { - background: #fff; - border-radius: rem-calc(6); + border: 1px solid $border; margin-bottom: $line-height / 2; -} - -.poll { - padding: $line-height; + padding: $line-height / 2; position: relative; .icon-poll-answer { diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3cd7580ee..369cabe84 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -43,10 +43,9 @@ module ApplicationHelper authorable.author_id == user.id end - def back_link_to(destination_path) - destination = destination_path || :back + def back_link_to(destination = :back, text = t("shared.back")) link_to destination, class: "back" do - "".html_safe + t("shared.back") + content_tag(:span, nil, class: "icon-angle-left") + text end end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index d185aa7f1..111a80267 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -16,9 +16,8 @@ module UsersHelper if commentable.nil? deleted_commentable_text(comment) elsif commentable.hidden? - "".html_safe + - commentable.title + - "".html_safe + content_tag(:del, commentable.title) + ' ' + + content_tag(:span, '(' + deleted_commentable_text(comment) + ')', class: 'small') else link_to(commentable.title, comment) end @@ -41,6 +40,26 @@ module UsersHelper current_user && current_user.administrator? end + def current_moderator? + current_user && current_user.moderator? + end + + def current_valuator? + current_user && current_user.valuator? + end + + def current_manager? + current_user && current_user.manager? + end + + def current_poll_officer? + current_user && current_user.poll_officer? + end + + def show_admin_menu? + current_administrator? || current_moderator? || current_valuator? || current_manager? || current_poll_officer? + end + def interests_title_text(user) if current_user == user t('account.show.public_interests_my_title_list') diff --git a/app/views/admin/geozones/edit.html.erb b/app/views/admin/geozones/edit.html.erb index b6b8c3fd9..554d82e98 100644 --- a/app/views/admin/geozones/edit.html.erb +++ b/app/views/admin/geozones/edit.html.erb @@ -1,10 +1,6 @@
-
- <%= link_to admin_geozones_path, class: "back" do %> - - <%= t("admin.geozones.edit.back") %> - <% end %> + <%= back_link_to admin_geozones_path, t("admin.geozones.edit.back") %>

<%= t("admin.geozones.edit.editing") %>

diff --git a/app/views/admin/geozones/new.html.erb b/app/views/admin/geozones/new.html.erb index 0d5080337..14e43e34e 100644 --- a/app/views/admin/geozones/new.html.erb +++ b/app/views/admin/geozones/new.html.erb @@ -1,10 +1,6 @@
-
- <%= link_to admin_geozones_path, class: "back" do %> - - <%= t("admin.geozones.new.back") %> - <% end %> + <%= back_link_to admin_geozones_path, t("admin.geozones.new.back") %>

<%= t("admin.geozones.new.creating") %>

diff --git a/app/views/admin/hidden_users/show.html.erb b/app/views/admin/hidden_users/show.html.erb index 9fe69ef44..9eae29589 100644 --- a/app/views/admin/hidden_users/show.html.erb +++ b/app/views/admin/hidden_users/show.html.erb @@ -1,4 +1,4 @@ -<%= render 'shared/back_link' %> +<%= back_link_to %>

<%= t("admin.hidden_users.show.title", user: @user.name) %>

diff --git a/app/views/admin/legislation/draft_versions/edit.html.erb b/app/views/admin/legislation/draft_versions/edit.html.erb index c041f02c2..9a1d959f1 100644 --- a/app/views/admin/legislation/draft_versions/edit.html.erb +++ b/app/views/admin/legislation/draft_versions/edit.html.erb @@ -4,10 +4,8 @@
- <%= link_to admin_legislation_process_draft_versions_path(@process), class: "back" do %> - - <%= t("admin.legislation.draft_versions.edit.back") %> - <% end %> + <%= back_link_to admin_legislation_process_draft_versions_path(@process), + t("admin.legislation.draft_versions.edit.back") %>

<%= @process.title %>

diff --git a/app/views/admin/legislation/draft_versions/index.html.erb b/app/views/admin/legislation/draft_versions/index.html.erb index a4d8fea24..26310b19e 100644 --- a/app/views/admin/legislation/draft_versions/index.html.erb +++ b/app/views/admin/legislation/draft_versions/index.html.erb @@ -4,10 +4,7 @@
- <%= link_to admin_legislation_processes_path, class: "back" do %> - - <%= t("admin.legislation.processes.edit.back") %> - <% end %> + <%= back_link_to admin_legislation_processes_path, t("admin.legislation.processes.edit.back") %>

<%= @process.title %>

diff --git a/app/views/admin/legislation/draft_versions/new.html.erb b/app/views/admin/legislation/draft_versions/new.html.erb index 81509531c..63ab6f8e7 100644 --- a/app/views/admin/legislation/draft_versions/new.html.erb +++ b/app/views/admin/legislation/draft_versions/new.html.erb @@ -4,10 +4,8 @@
- <%= link_to admin_legislation_process_draft_versions_path(@process), class: "back" do %> - - <%= t("admin.legislation.draft_versions.new.back") %> - <% end %> + <%= back_link_to admin_legislation_process_draft_versions_path(@process), + t("admin.legislation.draft_versions.new.back") %>

<%= @process.title %>

diff --git a/app/views/admin/legislation/processes/edit.html.erb b/app/views/admin/legislation/processes/edit.html.erb index 38bb01147..5d2c1aa8a 100644 --- a/app/views/admin/legislation/processes/edit.html.erb +++ b/app/views/admin/legislation/processes/edit.html.erb @@ -5,10 +5,7 @@
- <%= link_to admin_legislation_processes_path, class: "back" do %> - - <%= t("admin.legislation.processes.edit.back") %> - <% end %> + <%= back_link_to admin_legislation_processes_path, t("admin.legislation.processes.edit.back") %>

<%= @process.title %>

diff --git a/app/views/admin/legislation/processes/new.html.erb b/app/views/admin/legislation/processes/new.html.erb index 026697faa..8acb724db 100644 --- a/app/views/admin/legislation/processes/new.html.erb +++ b/app/views/admin/legislation/processes/new.html.erb @@ -5,10 +5,7 @@
- <%= link_to admin_legislation_processes_path, class: "back" do %> - - <%= t("admin.legislation.processes.new.back") %> - <% end %> + <%= back_link_to admin_legislation_processes_path, t("admin.legislation.processes.new.back") %>

<%= t("admin.legislation.processes.new.title") %>

diff --git a/app/views/admin/legislation/questions/edit.html.erb b/app/views/admin/legislation/questions/edit.html.erb index b87f7daeb..f2293b6c3 100644 --- a/app/views/admin/legislation/questions/edit.html.erb +++ b/app/views/admin/legislation/questions/edit.html.erb @@ -4,10 +4,7 @@
- <%= link_to admin_legislation_process_questions_path(@process), class: "back" do %> - - <%= t("admin.legislation.questions.edit.back") %> - <% end %> + <%= back_link_to admin_legislation_process_questions_path(@process), t("admin.legislation.questions.edit.back") %>

<%= @process.title %>

diff --git a/app/views/admin/legislation/questions/index.html.erb b/app/views/admin/legislation/questions/index.html.erb index d630fa659..fbbb7c93b 100644 --- a/app/views/admin/legislation/questions/index.html.erb +++ b/app/views/admin/legislation/questions/index.html.erb @@ -4,10 +4,7 @@
- <%= link_to admin_legislation_processes_path, class: "back" do %> - - <%= t("admin.legislation.questions.index.back") %> - <% end %> + <%= back_link_to admin_legislation_processes_path, t("admin.legislation.questions.index.back") %>

<%= @process.title %>

diff --git a/app/views/admin/legislation/questions/new.html.erb b/app/views/admin/legislation/questions/new.html.erb index eb3aa7ec1..877c70eb5 100644 --- a/app/views/admin/legislation/questions/new.html.erb +++ b/app/views/admin/legislation/questions/new.html.erb @@ -4,10 +4,7 @@
- <%= link_to admin_legislation_process_questions_path(@process), class: "back" do %> - - <%= t("admin.legislation.questions.new.back") %> - <% end %> + <%= back_link_to admin_legislation_process_questions_path(@process), t("admin.legislation.questions.new.back") %>

<%= @process.title %>

diff --git a/app/views/admin/officials/edit.html.erb b/app/views/admin/officials/edit.html.erb index 10ec9b23f..4696ea4de 100644 --- a/app/views/admin/officials/edit.html.erb +++ b/app/views/admin/officials/edit.html.erb @@ -1,4 +1,4 @@ -<%= render 'shared/back_link' %> +<%= back_link_to %>
diff --git a/app/views/admin/poll/polls/edit.html.erb b/app/views/admin/poll/polls/edit.html.erb index cf131203f..1ba88359e 100644 --- a/app/views/admin/poll/polls/edit.html.erb +++ b/app/views/admin/poll/polls/edit.html.erb @@ -1,4 +1,4 @@ -<%= render 'shared/back_link' %> +<%= back_link_to %>

<%= t("admin.polls.edit.title") %>

diff --git a/app/views/admin/poll/polls/new.html.erb b/app/views/admin/poll/polls/new.html.erb index ba1ae7260..1203688d5 100644 --- a/app/views/admin/poll/polls/new.html.erb +++ b/app/views/admin/poll/polls/new.html.erb @@ -1,4 +1,4 @@ -<%= render 'shared/back_link' %> +<%= back_link_to %>

<%= t("admin.polls.new.title") %>

diff --git a/app/views/admin/poll/questions/edit.html.erb b/app/views/admin/poll/questions/edit.html.erb index 6c4d24adf..48998081a 100644 --- a/app/views/admin/poll/questions/edit.html.erb +++ b/app/views/admin/poll/questions/edit.html.erb @@ -1,4 +1,4 @@ -<%= render "shared/back_link" %> +<%= back_link_to %>

<%= t("admin.questions.edit.title") %>

diff --git a/app/views/admin/poll/questions/new.html.erb b/app/views/admin/poll/questions/new.html.erb index 830492d6d..844195920 100644 --- a/app/views/admin/poll/questions/new.html.erb +++ b/app/views/admin/poll/questions/new.html.erb @@ -1,4 +1,4 @@ -<%= render "shared/back_link" %> +<%= back_link_to %>

<%= t("admin.questions.new.title") %>

diff --git a/app/views/admin/poll/questions/show.html.erb b/app/views/admin/poll/questions/show.html.erb index a8f25f2bd..3be660f79 100644 --- a/app/views/admin/poll/questions/show.html.erb +++ b/app/views/admin/poll/questions/show.html.erb @@ -1,4 +1,4 @@ -<%= render "shared/back_link" %> +<%= back_link_to %> <%= link_to t('shared.edit'), edit_admin_question_path(@question), class: "button hollow float-right" %> diff --git a/app/views/admin/signature_sheets/new.html.erb b/app/views/admin/signature_sheets/new.html.erb index a1f2436bb..bec2f359d 100644 --- a/app/views/admin/signature_sheets/new.html.erb +++ b/app/views/admin/signature_sheets/new.html.erb @@ -1,4 +1,4 @@ -<%= render 'shared/back_link' %> +<%= back_link_to %>

<%= t("admin.signature_sheets.new.title") %>

diff --git a/app/views/admin/stats/direct_messages.html.erb b/app/views/admin/stats/direct_messages.html.erb index b87e2b3e3..4a8a55829 100644 --- a/app/views/admin/stats/direct_messages.html.erb +++ b/app/views/admin/stats/direct_messages.html.erb @@ -1,4 +1,4 @@ -<%= render 'shared/back_link' %> +<%= back_link_to %>

<%= t("admin.stats.direct_messages.title")%>

diff --git a/app/views/admin/stats/proposal_notifications.html.erb b/app/views/admin/stats/proposal_notifications.html.erb index 51130424d..102eb0c60 100644 --- a/app/views/admin/stats/proposal_notifications.html.erb +++ b/app/views/admin/stats/proposal_notifications.html.erb @@ -1,4 +1,4 @@ -<%= render 'shared/back_link' %> +<%= back_link_to %>

<%= t("admin.stats.proposal_notifications.title")%>

diff --git a/app/views/admin/valuators/summary.html.erb b/app/views/admin/valuators/summary.html.erb index 81cbc54d4..19d1dde20 100644 --- a/app/views/admin/valuators/summary.html.erb +++ b/app/views/admin/valuators/summary.html.erb @@ -1,4 +1,4 @@ -<%= render 'shared/back_link' %> +<%= back_link_to %>

<%= t("admin.valuators.summary.title") %>

diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb index 9f5ab0ab2..494568706 100644 --- a/app/views/budgets/index.html.erb +++ b/app/views/budgets/index.html.erb @@ -1,14 +1,9 @@ +<% provide :title do %><%= t('budgets.index.title') %><% end %> <% content_for :canonical do %> <%= render "shared/canonical", href: budgets_url %> <% end %> -
-
-
-

<%= t('budgets.index.title') %>

-
-
-
+<%= render "shared/section_header", i18n_namespace: "budgets.index.section_header", image: "budgets" %>
@@ -32,5 +27,16 @@ <% end %> + +
+

+ <%= t("budgets.index.section_footer.title") %> +

+

<%= t("budgets.index.section_footer.help_text_1") %>

+

<%= t("budgets.index.section_footer.help_text_2") %>

+

<%= t("budgets.index.section_footer.help_text_3", + org: link_to(setting['org_name'], new_user_registration_path)).html_safe %>

+

<%= t("budgets.index.section_footer.help_text_4") %>

+
diff --git a/app/views/budgets/results/_results_table.html.erb b/app/views/budgets/results/_results_table.html.erb index e7cfadaff..7cc7a7d1a 100644 --- a/app/views/budgets/results/_results_table.html.erb +++ b/app/views/budgets/results/_results_table.html.erb @@ -2,9 +2,9 @@ style="<%= results_type != :compatible ? 'display: none' : '' %>" id="<%= results_type %>-container"> -

+

<%= title %> -

+ diff --git a/app/views/budgets/results/show.html.erb b/app/views/budgets/results/show.html.erb index a566b32d4..c276a4c6f 100644 --- a/app/views/budgets/results/show.html.erb +++ b/app/views/budgets/results/show.html.erb @@ -37,21 +37,20 @@
-
-
    -

    - <%= t("budgets.results.heading_selection_title") %> -

    +

    + <%= t("budgets.results.heading_selection_title") %> +

    +
      - <% @budget.headings.order('id ASC').each do |heading| %> -
    • - <%= link_to heading.name, - budget_results_path(@budget, heading_id: heading.to_param), - class: heading.to_param == @heading.to_param ? 'active' : '' %> -
      • - <% end %> -
    -
+ + <% @budget.headings.order('id ASC').each do |heading| %> +
  • + <%= link_to heading.name, + budget_results_path(@budget, heading_id: heading.to_param), + class: heading.to_param == @heading.to_param ? 'active' : '' %> +
    • + <% end %> +
    <%= link_to t("budgets.results.show_all_link"), "#", class: "js-toggle-link button hollow margin-bottom", data: {'toggle-selector' => '.js-discarded', 'toggle-text' => t("budgets.results.hide_discarded_link")} %> diff --git a/app/views/comments/_flag_actions.html.erb b/app/views/comments/_flag_actions.html.erb index 87698af06..1925ced08 100644 --- a/app/views/comments/_flag_actions.html.erb +++ b/app/views/comments/_flag_actions.html.erb @@ -6,13 +6,13 @@ title="<%= t('shared.flag') %>"> - + <% end %> <% if show_unflag_action? comment %> @@ -22,9 +22,9 @@ title="<%= t('shared.unflag') %>"> - + <% end %> diff --git a/app/views/comments/show.html.erb b/app/views/comments/show.html.erb index 90e49a7d3..37d379d4f 100644 --- a/app/views/comments/show.html.erb +++ b/app/views/comments/show.html.erb @@ -1,9 +1,7 @@
    - <%= link_to commentable_path(@comment), class: "back" do %> - - <%= t("comments.show.return_to_commentable") + @comment.commentable.title %> - <% end %> + <%= back_link_to commentable_path(@comment), + t("comments.show.return_to_commentable") + @comment.commentable.title %>
    diff --git a/app/views/debates/_flag_actions.html.erb b/app/views/debates/_flag_actions.html.erb index 1e0879142..3d57e031b 100644 --- a/app/views/debates/_flag_actions.html.erb +++ b/app/views/debates/_flag_actions.html.erb @@ -3,17 +3,17 @@ - + <% end %> <% if show_unflag_action? debate %> - + <% end %> diff --git a/app/views/debates/edit.html.erb b/app/views/debates/edit.html.erb index 13a2aa625..8645be255 100644 --- a/app/views/debates/edit.html.erb +++ b/app/views/debates/edit.html.erb @@ -1,7 +1,7 @@
    - <%= render "shared/back_link" %> + <%= back_link_to %>
    <%= link_to t("debates.edit.show_link"), @debate %> diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb index eddcccd21..231131eac 100644 --- a/app/views/debates/index.html.erb +++ b/app/views/debates/index.html.erb @@ -9,8 +9,6 @@ <% end %>
    -

    <%= t("shared.outline.debates") %>

    - <% if @search_terms || @advanced_search_terms || @tag_filter %>
    @@ -33,6 +31,8 @@
    + <% else %> + <%= render "shared/section_header", i18n_namespace: "debates.index.section_header", image: "debates" %> <% end %>
    @@ -60,6 +60,21 @@ <%= empty_recommended_debates_message_text(current_user) %> <% end %> <%= paginate @debates %> + + <% unless @search_terms || @advanced_search_terms || @tag_filter %> +
    +

    + <%= t("debates.index.section_footer.title") %> +

    +

    <%= t("debates.index.section_footer.help_text_1") %>

    +

    <%= t("debates.index.section_footer.help_text_2", + org: link_to(setting['org_name'], new_user_registration_path)).html_safe %>

    +

    <%= t("debates.index.section_footer.help_text_3", + proposal: link_to(t("debates.index.section_footer.proposals_link"), proposals_path), + budget: link_to(t("debates.index.section_footer.budget_link"), budgets_path)).html_safe %> +

    +
    + <% end %>
    diff --git a/app/views/debates/new.html.erb b/app/views/debates/new.html.erb index ccd11bec2..5085ca17a 100644 --- a/app/views/debates/new.html.erb +++ b/app/views/debates/new.html.erb @@ -1,7 +1,7 @@
    - <%= render "shared/back_link" %> + <%= back_link_to %>

    <%= t("debates.new.start_new") %>

    diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 0a57b2997..44fa08a06 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -7,7 +7,7 @@
    - <%= render "shared/back_link" %> + <%= back_link_to %> <% if current_user && @debate.editable_by?(current_user) %> <%= link_to edit_debate_path(@debate), class: 'edit-debate button success small float-right' do %> diff --git a/app/views/direct_messages/new.html.erb b/app/views/direct_messages/new.html.erb index 3413f26f0..fd0081337 100644 --- a/app/views/direct_messages/new.html.erb +++ b/app/views/direct_messages/new.html.erb @@ -1,6 +1,6 @@
    - <%= render 'shared/back_link' %> + <%= back_link_to %>

    <%= t("users.direct_messages.new.title", receiver: @receiver.name) %> diff --git a/app/views/direct_messages/show.html.erb b/app/views/direct_messages/show.html.erb index 8d0f62d84..cc98c8a89 100644 --- a/app/views/direct_messages/show.html.erb +++ b/app/views/direct_messages/show.html.erb @@ -1,9 +1,6 @@
    - <%= link_to user_path(@direct_message.receiver), class: "back" do %> - - <%= t("shared.back") %> - <% end %> + <%= back_link_to user_path(@direct_message.receiver) %>
    diff --git a/app/views/legislation/annotations/_slim_version_chooser.html.erb b/app/views/legislation/annotations/_slim_version_chooser.html.erb index 32c689501..438c46c09 100644 --- a/app/views/legislation/annotations/_slim_version_chooser.html.erb +++ b/app/views/legislation/annotations/_slim_version_chooser.html.erb @@ -18,7 +18,7 @@
    diff --git a/app/views/legislation/shared/_share_buttons.html.erb b/app/views/legislation/shared/_share_buttons.html.erb deleted file mode 100644 index 971402628..000000000 --- a/app/views/legislation/shared/_share_buttons.html.erb +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/app/views/management/user_invites/create.html.erb b/app/views/management/user_invites/create.html.erb index 3d573532f..3e346e4f2 100644 --- a/app/views/management/user_invites/create.html.erb +++ b/app/views/management/user_invites/create.html.erb @@ -1,5 +1,5 @@
    - <%= render 'shared/back_link' %> + <%= back_link_to %>

    <%= t('management.user_invites.create.title') %>

    diff --git a/app/views/pages/more_info/faq/index.html.erb b/app/views/pages/more_info/faq/index.html.erb index 0a1158f60..db8bfaf6e 100644 --- a/app/views/pages/more_info/faq/index.html.erb +++ b/app/views/pages/more_info/faq/index.html.erb @@ -4,7 +4,7 @@
    - <%= render "shared/back_link" %> + <%= back_link_to %>
    • <%= t("pages.more_info.faq.page.faq_1_title") %>
      • diff --git a/app/views/pages/more_info/how_to_use/index.html.erb b/app/views/pages/more_info/how_to_use/index.html.erb index 515631352..f396b69a1 100644 --- a/app/views/pages/more_info/how_to_use/index.html.erb +++ b/app/views/pages/more_info/how_to_use/index.html.erb @@ -4,7 +4,7 @@
      - <%= render "shared/back_link" %> + <%= back_link_to %>

      <%= t('pages.more_info.titles.how_to_use') %>

      diff --git a/app/views/polls/index.html.erb b/app/views/polls/index.html.erb index 71cd2492a..55cdae8e2 100644 --- a/app/views/polls/index.html.erb +++ b/app/views/polls/index.html.erb @@ -1,23 +1,14 @@ <% provide :title do %><%= t("polls.index.title") %><% end %> -<% content_for :wrapper_class, "light" %> <% content_for :canonical do %> <%= render "shared/canonical", href: polls_url %> <% end %> -
      -
      -
      -

      <%= t("polls.index.title") %>

      -
      -
      -
      +<%= render "shared/section_header", i18n_namespace: "polls.index.section_header", image: "polls" %>
      -
      - <%= render 'shared/filter_subnav_vertical', i18n_namespace: "polls.index" %> -
      +
      + <%= render 'shared/filter_subnav', i18n_namespace: "polls.index" %> -
      <% polls_by_geozone_restriction = @polls.group_by(&:geozone_restricted) %> <% if polls_by_geozone_restriction[false].present? %> @@ -31,5 +22,15 @@ <% end %> <%= paginate @polls %> + +
      +

      + <%= t("polls.index.section_footer.title") %> +

      +

      <%= t("polls.index.section_footer.help_text_1") %>

      +

      <%= t("polls.index.section_footer.help_text_2", + org: link_to(setting['org_name'], new_user_registration_path)).html_safe %>

      +

      +
      diff --git a/app/views/polls/questions/show.html.erb b/app/views/polls/questions/show.html.erb index 2b7225f9f..da46ebbcc 100644 --- a/app/views/polls/questions/show.html.erb +++ b/app/views/polls/questions/show.html.erb @@ -3,7 +3,7 @@
      - <%= render "shared/back_link" %> + <%= back_link_to %>

      <%= @question.title %>

      diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 27c241d6f..02ab70525 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -1,5 +1,4 @@ <% provide :title do %><%= @poll.name %><% end %> -<% content_for :wrapper_class, "light" %>
      diff --git a/app/views/proposal_notifications/new.html.erb b/app/views/proposal_notifications/new.html.erb index 55341eb58..cee18f1d8 100644 --- a/app/views/proposal_notifications/new.html.erb +++ b/app/views/proposal_notifications/new.html.erb @@ -1,13 +1,13 @@
      - <%= render 'shared/back_link' %> + <%= back_link_to %>

      <%= t("proposal_notifications.new.title") %>

      <%= t("proposal_notifications.new.info_about_receivers_html", - count: @proposal.users_to_notify.count, + count: @proposal.users_to_notify.count, proposal_page: link_to(t("proposal_notifications.new.proposal_page"), proposal_path(@proposal, anchor: "comments"))).html_safe %>

      diff --git a/app/views/proposal_notifications/show.html.erb b/app/views/proposal_notifications/show.html.erb index 379b361fb..74f360583 100644 --- a/app/views/proposal_notifications/show.html.erb +++ b/app/views/proposal_notifications/show.html.erb @@ -1,9 +1,6 @@
      - <%= link_to user_path(current_user), class: "back" do %> - - <%= t("proposal_notifications.show.back") %> - <% end %> + <%= back_link_to user_path(current_user), t("proposal_notifications.show.back") %>

      <%= @notification.title %>

      <%= @notification.body %>

      diff --git a/app/views/proposals/_flag_actions.html.erb b/app/views/proposals/_flag_actions.html.erb index 875a23f07..3e776de66 100644 --- a/app/views/proposals/_flag_actions.html.erb +++ b/app/views/proposals/_flag_actions.html.erb @@ -4,18 +4,18 @@ - + <% end %> <% if show_unflag_action? proposal %> - + <% end %> diff --git a/app/views/proposals/edit.html.erb b/app/views/proposals/edit.html.erb index f0429a855..6e5b14a08 100644 --- a/app/views/proposals/edit.html.erb +++ b/app/views/proposals/edit.html.erb @@ -1,7 +1,7 @@
      - <%= render "shared/back_link" %> + <%= back_link_to %>
      <%= link_to t("proposals.edit.show_link"), @proposal %> diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index 10b2ee382..ef3df0faa 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -9,8 +9,6 @@ <% end %>
      -

      <%= t("shared.outline.proposals") %>

      - <% if @search_terms || @advanced_search_terms || @tag_filter || params[:retired].present? %>
      @@ -35,6 +33,8 @@
      + <% else %> + <%= render "shared/section_header", i18n_namespace: "proposals.index.section_header", image: "proposals" %> <% end %>
      @@ -61,9 +61,11 @@ <%= render 'shared/order_links', i18n_namespace: "proposals.index" %> -
      - <%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button expanded' %> -
      + <% if @proposals.any? %> +
      + <%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button expanded' %> +
      + <% end %>
      <% if @proposals.any? || current_user.blank? %> @@ -72,6 +74,18 @@ <%= empty_recommended_proposals_message_text(current_user) %> <% end %> <%= paginate @proposals %> + + <% unless @search_terms || @advanced_search_terms || @tag_filter %> +
      +

      + <%= t("proposals.index.section_footer.title") %> +

      +

      <%= t("proposals.index.section_footer.help_text_1") %>

      +

      <%= t("proposals.index.section_footer.help_text_2", + org: link_to(setting['org_name'], new_user_registration_path)).html_safe %>

      +

      <%= t("proposals.index.section_footer.help_text_3") %>

      +
      + <% end %>
      diff --git a/app/views/proposals/new.html.erb b/app/views/proposals/new.html.erb index 9f1b69e94..95249e36e 100644 --- a/app/views/proposals/new.html.erb +++ b/app/views/proposals/new.html.erb @@ -1,7 +1,7 @@
      - <%= render "shared/back_link" %> + <%= back_link_to %>

      <%= t("proposals.new.start_new") %>

      diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 6a8a56738..75c07873a 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -14,7 +14,7 @@
      - <%= render "shared/back_link" %> + <%= back_link_to %> <% if author_of?(@proposal, current_user) %> <%= link_to t("proposals.show.send_notification"), new_proposal_notification_path(proposal_id: @proposal.id), @@ -77,14 +77,23 @@ <% if @proposal.external_url.present? %>
      - <%= text_with_links @proposal.external_url %> +

      +   + <%= t('proposals.show.title_external_url') %> +

      + <%= text_with_links @proposal.external_url %>
      <% end %> <% if @proposal.video_url.present? %>
      +

      +   + <%= t('proposals.show.title_video_url') %> +

      <%= text_with_links @proposal.video_url %>
      + <% end %>

      <%= @proposal.question %>

      diff --git a/app/views/proposals/summary.html.erb b/app/views/proposals/summary.html.erb index d5bc22196..a28cf8750 100644 --- a/app/views/proposals/summary.html.erb +++ b/app/views/proposals/summary.html.erb @@ -1,7 +1,7 @@
      - <%= render "shared/back_link" %> + <%= back_link_to %> <% @proposals.each do |group_name, proposals| %>
      diff --git a/app/views/shared/_admin_login_items.html.erb b/app/views/shared/_admin_login_items.html.erb index 7bd673a30..85a367e97 100644 --- a/app/views/shared/_admin_login_items.html.erb +++ b/app/views/shared/_admin_login_items.html.erb @@ -1,4 +1,4 @@ -<% if current_user %> +<% if show_admin_menu? %>
    • <%= link_to t("layouts.header.administration_menu"), "#", rel: "nofollow" %>

    <% elsif author?(proposal) %> - - + <% else %> + + + <% end %> diff --git a/app/views/users/registrations/delete_form.html.erb b/app/views/users/registrations/delete_form.html.erb index 17d241a88..c52b85638 100644 --- a/app/views/users/registrations/delete_form.html.erb +++ b/app/views/users/registrations/delete_form.html.erb @@ -1,4 +1,4 @@ -<%= render "shared/back_link" %> +<%= back_link_to %>

    <%= t("devise_views.users.registrations.delete_form.title") %>

    diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb index 7d80efda3..4dcc388b2 100644 --- a/app/views/users/registrations/edit.html.erb +++ b/app/views/users/registrations/edit.html.erb @@ -1,4 +1,4 @@ -<%= render "shared/back_link" %> +<%= back_link_to %>

    <%= t("devise_views.users.registrations.edit.edit") %>

    diff --git a/app/views/valuation/spending_proposals/show.html.erb b/app/views/valuation/spending_proposals/show.html.erb index 555660cbe..ac1bfedb4 100644 --- a/app/views/valuation/spending_proposals/show.html.erb +++ b/app/views/valuation/spending_proposals/show.html.erb @@ -1,4 +1,4 @@ -<%= render "shared/back_link" %> +<%= back_link_to %>

    <%= t("valuation.spending_proposals.show.heading") %> <%= @spending_proposal.id %>

    <%= @spending_proposal.title %>

    diff --git a/app/views/verification/letter/new.html.erb b/app/views/verification/letter/new.html.erb index 648de7478..e0f696171 100644 --- a/app/views/verification/letter/new.html.erb +++ b/app/views/verification/letter/new.html.erb @@ -20,10 +20,7 @@
    - <%= link_to account_path, class: "back" do %> - - <%= t("verification.back") %> - <% end %> + <%= back_link_to account_path, t("verification.back") %>

    <%= t("verification.letter.new.title") %>

    diff --git a/app/views/verification/letter/show.html.erb b/app/views/verification/letter/show.html.erb index 372e1a8d1..acc764646 100644 --- a/app/views/verification/letter/show.html.erb +++ b/app/views/verification/letter/show.html.erb @@ -2,10 +2,7 @@ <%track_event(category: "verification", action: "start_letter" )%>
    - <%= link_to account_path, class: "back" do %> - - <%= t("verification.back") %> - <% end %> + <%= back_link_to account_path, t("verification.back") %>

    <%= t("verification.letter.edit.title") %>

    diff --git a/app/views/verification/residence/new.html.erb b/app/views/verification/residence/new.html.erb index 2159d1a01..95497b87b 100644 --- a/app/views/verification/residence/new.html.erb +++ b/app/views/verification/residence/new.html.erb @@ -18,10 +18,7 @@
    - <%= link_to account_path, class: "back" do %> - - <%= t("verification.back") %> - <% end %> + <%= back_link_to account_path, t("verification.back") %>

    <%= t("verification.residence.new.title") %>

    diff --git a/app/views/verification/sms/edit.html.erb b/app/views/verification/sms/edit.html.erb index d1856e88c..c94b5c9d0 100644 --- a/app/views/verification/sms/edit.html.erb +++ b/app/views/verification/sms/edit.html.erb @@ -18,10 +18,7 @@
    - <%= link_to account_path, class: "back" do %> - - <%= t("verification.back") %> - <% end %> + <%= back_link_to account_path, t("verification.back") %>

    <%= t("verification.sms.edit.title") %>

    diff --git a/app/views/verification/sms/new.html.erb b/app/views/verification/sms/new.html.erb index 820ed01fa..19a8a2e3b 100644 --- a/app/views/verification/sms/new.html.erb +++ b/app/views/verification/sms/new.html.erb @@ -18,10 +18,7 @@ - <%= link_to account_path, class: "back" do %> - - <%= t("verification.back") %> - <% end %> + <%= back_link_to account_path, t("verification.back") %>

    <%= t("verification.sms.new.title") %>

    diff --git a/app/views/verification/verified_user/show.html.erb b/app/views/verification/verified_user/show.html.erb index 69e98eeb6..13dc2924d 100644 --- a/app/views/verification/verified_user/show.html.erb +++ b/app/views/verification/verified_user/show.html.erb @@ -1,10 +1,7 @@
    + <%= t('users.proposals.retired') %> + <%= link_to t("users.proposals.send_notification"), new_proposal_notification_path(proposal_id: proposal.id), - class: 'button hollow' %> + class: 'button hollow expanded' %> + <% if proposal.retired? %> <%= t('users.proposals.retired') %> <% else %> <%= link_to t('users.proposals.retire'), retire_form_proposal_path(proposal), - class: 'button hollow alert' %> + class: 'button hollow alert expanded' %> <% end %> + <%= link_to t('users.proposals.see'), proposal, class: 'button hollow' %> +