Merge branch 'master' into user-recomendations
This commit is contained in:
Alberto
@@ -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/
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
12
README.md
12
README.md
@@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
|
||||
# Consul
|
||||
# CONSUL
|
||||
|
||||
Citizen Participation and Open Government Application
|
||||
|
||||
@@ -17,7 +17,7 @@ Citizen Participation and Open Government Application
|
||||
[](https://gitter.im/consul/consul?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||
[](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.
|
||||
12
README_ES.md
12
README_ES.md
@@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
|
||||
# Consul
|
||||
# CONSUL
|
||||
|
||||
Aplicación de Participación Ciudadana y Gobierno Abierto
|
||||
|
||||
@@ -17,7 +17,7 @@ Aplicación de Participación Ciudadana y Gobierno Abierto
|
||||
[](https://gitter.im/consul/consul?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||
[](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.
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
BIN
app/assets/images/help/help_icon_budgets.png
Normal file
BIN
app/assets/images/help/help_icon_budgets.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
BIN
app/assets/images/help/help_icon_debates.png
Normal file
BIN
app/assets/images/help/help_icon_debates.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
BIN
app/assets/images/help/help_icon_legislation_processes.png
Normal file
BIN
app/assets/images/help/help_icon_legislation_processes.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
BIN
app/assets/images/help/help_icon_polls.png
Normal file
BIN
app/assets/images/help/help_icon_polls.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
BIN
app/assets/images/help/help_icon_proposals.png
Normal file
BIN
app/assets/images/help/help_icon_proposals.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
@@ -43,6 +43,7 @@ $budget: #7e328a;
|
||||
$budget-hover: #7571bf;
|
||||
|
||||
$highlight: #e7f2fc;
|
||||
$highlight-soft: #f3f8fd;
|
||||
$light: #f5f7fa;
|
||||
$featured: #ffdc5c;
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
"<span class='icon-angle-left'></span>".html_safe + t("shared.back")
|
||||
content_tag(:span, nil, class: "icon-angle-left") + text
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -16,9 +16,8 @@ module UsersHelper
|
||||
if commentable.nil?
|
||||
deleted_commentable_text(comment)
|
||||
elsif commentable.hidden?
|
||||
"<abbr title='#{deleted_commentable_text(comment)}'>".html_safe +
|
||||
commentable.title +
|
||||
"</abbr>".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')
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
<div class="row">
|
||||
|
||||
<div class="small-12 column">
|
||||
<%= link_to admin_geozones_path, class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("admin.geozones.edit.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to admin_geozones_path, t("admin.geozones.edit.back") %>
|
||||
|
||||
<h1><%= t("admin.geozones.edit.editing") %></h1>
|
||||
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
<div class="geozone-new row">
|
||||
|
||||
<div class="small-12 column">
|
||||
<%= link_to admin_geozones_path, class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("admin.geozones.new.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to admin_geozones_path, t("admin.geozones.new.back") %>
|
||||
|
||||
<h1><%= t("admin.geozones.new.creating") %></h1>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= render 'shared/back_link' %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h2><%= t("admin.hidden_users.show.title", user: @user.name) %></h2>
|
||||
|
||||
|
||||
@@ -4,10 +4,8 @@
|
||||
|
||||
<div class="legislation-admin legislation-draft-versions-edit legislation-draft-versions-form row">
|
||||
<div class="small-12 column">
|
||||
<%= link_to admin_legislation_process_draft_versions_path(@process), class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= 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") %>
|
||||
|
||||
<h2><%= @process.title %></h2>
|
||||
|
||||
|
||||
@@ -4,10 +4,7 @@
|
||||
|
||||
<div class="legislation-admin legislation-draft-versions-index row">
|
||||
<div class="small-12 column">
|
||||
<%= link_to admin_legislation_processes_path, class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("admin.legislation.processes.edit.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to admin_legislation_processes_path, t("admin.legislation.processes.edit.back") %>
|
||||
|
||||
<h2><%= @process.title %></h2>
|
||||
|
||||
|
||||
@@ -4,10 +4,8 @@
|
||||
|
||||
<div class="legislation-admin legislation-draft-versions-new legislation-draft-versions-form row">
|
||||
<div class="small-12 column">
|
||||
<%= link_to admin_legislation_process_draft_versions_path(@process), class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= 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") %>
|
||||
|
||||
<h2><%= @process.title %></h2>
|
||||
|
||||
|
||||
@@ -5,10 +5,7 @@
|
||||
<div class="legislation-admin legislation-process-edit row">
|
||||
|
||||
<div class="small-12 column">
|
||||
<%= link_to admin_legislation_processes_path, class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("admin.legislation.processes.edit.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to admin_legislation_processes_path, t("admin.legislation.processes.edit.back") %>
|
||||
|
||||
<h2><%= @process.title %></h2>
|
||||
|
||||
|
||||
@@ -5,10 +5,7 @@
|
||||
<div class="legislation-admin legislation-process-new row">
|
||||
|
||||
<div class="small-12 column">
|
||||
<%= link_to admin_legislation_processes_path, class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("admin.legislation.processes.new.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to admin_legislation_processes_path, t("admin.legislation.processes.new.back") %>
|
||||
|
||||
<h2><%= t("admin.legislation.processes.new.title") %></h2>
|
||||
|
||||
|
||||
@@ -4,10 +4,7 @@
|
||||
|
||||
<div class="legislation-admin legislation-questions-edit legislation-questions-form row">
|
||||
<div class="small-12 column">
|
||||
<%= link_to admin_legislation_process_questions_path(@process), class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("admin.legislation.questions.edit.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to admin_legislation_process_questions_path(@process), t("admin.legislation.questions.edit.back") %>
|
||||
|
||||
<h2><%= @process.title %></h2>
|
||||
|
||||
|
||||
@@ -4,10 +4,7 @@
|
||||
|
||||
<div class="legislation-admin legislation-draft-versions-index row">
|
||||
<div class="small-12 column">
|
||||
<%= link_to admin_legislation_processes_path, class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("admin.legislation.questions.index.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to admin_legislation_processes_path, t("admin.legislation.questions.index.back") %>
|
||||
|
||||
<h2><%= @process.title %></h2>
|
||||
|
||||
|
||||
@@ -4,10 +4,7 @@
|
||||
|
||||
<div class="legislation-admin legislation-questions-new legislation-questions-form row">
|
||||
<div class="small-12 column">
|
||||
<%= link_to admin_legislation_process_questions_path(@process), class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("admin.legislation.questions.new.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to admin_legislation_process_questions_path(@process), t("admin.legislation.questions.new.back") %>
|
||||
|
||||
<h2><%= @process.title %></h2>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= render 'shared/back_link' %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<div class="clear"></div>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= render 'shared/back_link' %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h2><%= t("admin.polls.edit.title") %></h2>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= render 'shared/back_link' %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h2><%= t("admin.polls.new.title") %></h2>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= render "shared/back_link" %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h2><%= t("admin.questions.edit.title") %></h2>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= render "shared/back_link" %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h2><%= t("admin.questions.new.title") %></h2>
|
||||
|
||||
|
||||
@@ -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" %>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= render 'shared/back_link' %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h2><%= t("admin.signature_sheets.new.title") %></h2>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= render 'shared/back_link' %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h2><%= t("admin.stats.direct_messages.title")%></h2>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= render 'shared/back_link' %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h2><%= t("admin.stats.proposal_notifications.title")%></h2>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= render 'shared/back_link' %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h2><%= t("admin.valuators.summary.title") %></h2>
|
||||
|
||||
|
||||
@@ -1,14 +1,9 @@
|
||||
<% provide :title do %><%= t('budgets.index.title') %><% end %>
|
||||
<% content_for :canonical do %>
|
||||
<%= render "shared/canonical", href: budgets_url %>
|
||||
<% end %>
|
||||
|
||||
<div class="expanded budget no-margin-top padding">
|
||||
<div class="row">
|
||||
<div class="small-12 column">
|
||||
<h1><%= t('budgets.index.title') %></h1>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<%= render "shared/section_header", i18n_namespace: "budgets.index.section_header", image: "budgets" %>
|
||||
|
||||
<div class="row margin-top">
|
||||
<div class="small-12 medium-9 column">
|
||||
@@ -32,5 +27,16 @@
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div id="section_help" class="margin" data-magellan-target="section_help">
|
||||
<p class="lead">
|
||||
<strong><%= t("budgets.index.section_footer.title") %></strong>
|
||||
</p>
|
||||
<p><%= t("budgets.index.section_footer.help_text_1") %></p>
|
||||
<p><%= t("budgets.index.section_footer.help_text_2") %></p>
|
||||
<p><%= t("budgets.index.section_footer.help_text_3",
|
||||
org: link_to(setting['org_name'], new_user_registration_path)).html_safe %></p>
|
||||
<p><%= t("budgets.index.section_footer.help_text_4") %></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
style="<%= results_type != :compatible ? 'display: none' : '' %>"
|
||||
id="<%= results_type %>-container">
|
||||
|
||||
<h3 class="inline-block">
|
||||
<h4 class="inline-block">
|
||||
<%= title %>
|
||||
</h3>
|
||||
</h4>
|
||||
|
||||
<table id="budget-investments-<%= results_type %>" class="table-for-mobile">
|
||||
<thead>
|
||||
|
||||
@@ -37,21 +37,20 @@
|
||||
|
||||
<div class="row">
|
||||
<div class="small-12 medium-3 large-2 column">
|
||||
<div class="row">
|
||||
<ul class="menu vertical no-margin-top no-padding-top">
|
||||
<h3>
|
||||
<%= t("budgets.results.heading_selection_title") %>
|
||||
</h3>
|
||||
<h3 class="margin-bottom">
|
||||
<%= t("budgets.results.heading_selection_title") %>
|
||||
</h3>
|
||||
<ul class="menu vertical no-margin-top no-padding-top">
|
||||
|
||||
<% @budget.headings.order('id ASC').each do |heading| %>
|
||||
<li>
|
||||
<%= link_to heading.name,
|
||||
budget_results_path(@budget, heading_id: heading.to_param),
|
||||
class: heading.to_param == @heading.to_param ? 'active' : '' %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<% @budget.headings.order('id ASC').each do |heading| %>
|
||||
<li>
|
||||
<%= link_to heading.name,
|
||||
budget_results_path(@budget, heading_id: heading.to_param),
|
||||
class: heading.to_param == @heading.to_param ? 'active' : '' %>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<span class="float-right"><%= 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")} %></span>
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
title="<%= t('shared.flag') %>">
|
||||
<span class="icon-flag flag-disable"></span>
|
||||
</a>
|
||||
<div id="flag-drop-comment-<%= comment.id %>"
|
||||
<span id="flag-drop-comment-<%= comment.id %>"
|
||||
class="dropdown-pane"
|
||||
data-dropdown
|
||||
data-auto-focus="true">
|
||||
<%= link_to t("shared.flag"), flag_comment_path(comment), method: :put,
|
||||
remote: true, id: "flag-comment-#{comment.id}" %>
|
||||
</div>
|
||||
</span>
|
||||
<% end %>
|
||||
|
||||
<% if show_unflag_action? comment %>
|
||||
@@ -22,9 +22,9 @@
|
||||
title="<%= t('shared.unflag') %>">
|
||||
<span class="icon-flag flag-active"></span>
|
||||
</a>
|
||||
<div class="dropdown-pane" id="unflag-drop-comment-<%= comment.id %>" data-dropdown data-auto-focus="true">
|
||||
<span class="dropdown-pane" id="unflag-drop-comment-<%= comment.id %>" data-dropdown data-auto-focus="true">
|
||||
<%= link_to t("shared.unflag"), unflag_comment_path(comment), method: :put,
|
||||
remote: true, id: "unflag-comment-#{comment.id}" %>
|
||||
</div>
|
||||
</span>
|
||||
<% end %>
|
||||
</span>
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
<div class="row">
|
||||
<div class="small-12 column margin-top">
|
||||
<%= link_to commentable_path(@comment), class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= 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 %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -3,17 +3,17 @@
|
||||
<a id="flag-expand-debate-<%= debate.id %>" data-toggle="flag-drop-debate-<%= debate.id %>" title="<%= t('shared.flag') %>">
|
||||
<span class="icon-flag flag-disable"></span>
|
||||
</a>
|
||||
<div class="dropdown-pane" id="flag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true">
|
||||
<span class="dropdown-pane" id="flag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true">
|
||||
<%= link_to t('shared.flag'), flag_debate_path(debate), method: :put, remote: true, id: "flag-debate-#{ debate.id }" %>
|
||||
</div>
|
||||
</span>
|
||||
<% end %>
|
||||
|
||||
<% if show_unflag_action? debate %>
|
||||
<a id="unflag-expand-debate-<%= debate.id %>" data-toggle="unflag-drop-debate-<%= debate.id %>" title="<%= t('shared.unflag') %>">
|
||||
<span class="icon-flag flag-active"></span>
|
||||
</a>
|
||||
<div class="dropdown-pane" id="unflag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true">
|
||||
<span class="dropdown-pane" id="unflag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true">
|
||||
<%= link_to t('shared.unflag'), unflag_debate_path(debate), method: :put, remote: true, id: "unflag-debate-#{ debate.id }" %>
|
||||
</div>
|
||||
</span>
|
||||
<% end %>
|
||||
</span>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="debate-form row">
|
||||
|
||||
<div class="small-12 column">
|
||||
<%= render "shared/back_link" %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<div class="float-right">
|
||||
<%= link_to t("debates.edit.show_link"), @debate %>
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
<% end %>
|
||||
|
||||
<main>
|
||||
<h1 class="show-for-sr"><%= t("shared.outline.debates") %></h1>
|
||||
|
||||
<% if @search_terms || @advanced_search_terms || @tag_filter %>
|
||||
<div class="highlight no-margin-top padding margin-bottom">
|
||||
<div class="row">
|
||||
@@ -33,6 +31,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% else %>
|
||||
<%= render "shared/section_header", i18n_namespace: "debates.index.section_header", image: "debates" %>
|
||||
<% end %>
|
||||
|
||||
<div class="row">
|
||||
@@ -60,6 +60,21 @@
|
||||
<%= empty_recommended_debates_message_text(current_user) %>
|
||||
<% end %>
|
||||
<%= paginate @debates %>
|
||||
|
||||
<% unless @search_terms || @advanced_search_terms || @tag_filter %>
|
||||
<div id="section_help" class="margin" data-magellan-target="section_help">
|
||||
<p class="lead">
|
||||
<strong><%= t("debates.index.section_footer.title") %></strong>
|
||||
</p>
|
||||
<p><%= t("debates.index.section_footer.help_text_1") %></p>
|
||||
<p><%= t("debates.index.section_footer.help_text_2",
|
||||
org: link_to(setting['org_name'], new_user_registration_path)).html_safe %></p>
|
||||
<p><%= 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 %>
|
||||
</p>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<div class="small-12 medium-3 column">
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="debate-form row">
|
||||
|
||||
<div class="small-12 medium-9 column">
|
||||
<%= render "shared/back_link" %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h1><%= t("debates.new.start_new") %></h1>
|
||||
<div data-alert class="callout primary">
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<div class="debate-show">
|
||||
<div id="<%= dom_id(@debate) %>" class="row">
|
||||
<div class="small-12 medium-9 column">
|
||||
<%= 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 %>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<div class="row">
|
||||
<div class="small-12 medium-9 column">
|
||||
<%= render 'shared/back_link' %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h1>
|
||||
<%= t("users.direct_messages.new.title", receiver: @receiver.name) %>
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
<div class="row">
|
||||
<div class="small-12 medium-9 column">
|
||||
<%= link_to user_path(@direct_message.receiver), class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("shared.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to user_path(@direct_message.receiver) %>
|
||||
|
||||
<div class="clear"></div>
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
<aside class="small-12 medium-3 column">
|
||||
<div class="sidebar-divider"></div>
|
||||
<h2><%= t('legislation.shared.share') %></h2>
|
||||
<%= render '/legislation/shared/share_buttons',
|
||||
<%= render '/shared/social_share',
|
||||
title: t('legislation.shared.share_comment', version_name: @draft_version.title.downcase, process_name: @process.title),
|
||||
url: legislation_process_draft_version_path(process, draft_version)
|
||||
%>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
<aside class="small-12 medium-3 column">
|
||||
<div class="sidebar-divider"></div>
|
||||
<h2><%= t('legislation.shared.share') %></h2>
|
||||
<%= render '/legislation/shared/share_buttons',
|
||||
<%= render '/shared/social_share',
|
||||
title: t('legislation.shared.share_comment', version_name: @draft_version.title.downcase, process_name: @process.title),
|
||||
url: legislation_process_draft_version_annotations_path(@process, @draft_version)
|
||||
%>
|
||||
|
||||
@@ -2,12 +2,13 @@
|
||||
<%= t("layouts.header.collaborative_legislation") %> - <%= t("legislation.processes.index.filters.#{@current_filter}") %>
|
||||
<% end %>
|
||||
|
||||
<div class="row">
|
||||
<div class="legislation-categories small-12 medium-3 column">
|
||||
<%= render 'shared/filter_subnav', i18n_namespace: "legislation.processes.index" %>
|
||||
</div>
|
||||
<%= render "shared/section_header", i18n_namespace: "legislation.processes.index.section_header", image: "legislation_processes" %>
|
||||
|
||||
<div class="row">
|
||||
<div id="legislation" class="legislation-list small-12 medium-9 column">
|
||||
|
||||
<%= render 'shared/filter_subnav', i18n_namespace: "legislation.processes.index" %>
|
||||
|
||||
<div id="legislation-list">
|
||||
<% if @processes.any? %>
|
||||
<%= render @processes %>
|
||||
@@ -17,6 +18,16 @@
|
||||
<%= t(".no_#{@current_filter}_processes") %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div id="section_help" class="margin" data-magellan-target="section_help">
|
||||
<p class="lead">
|
||||
<strong><%= t("legislation.processes.index.section_footer.title") %></strong>
|
||||
</p>
|
||||
<p><%= t("legislation.processes.index.section_footer.help_text_1") %></p>
|
||||
<p><%= t("legislation.processes.index.section_footer.help_text_2",
|
||||
org: setting['org_name']) %></p>
|
||||
<p><%= t("legislation.processes.index.section_footer.help_text_3") %></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
<aside class="small-12 medium-3 column">
|
||||
<div id="social-share" class="sidebar-divider"></div>
|
||||
<h3><%= t('.share') %></h3>
|
||||
<%= render '/legislation/shared/share_buttons', title: @question.title, url: legislation_process_question_url(@question.process, @question) %>
|
||||
<%= render '/shared/social_share', title: @question.title, url: legislation_process_question_url(@question.process, @question) %>
|
||||
</aside>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
<div class="social-share-full">
|
||||
<%= social_share_button_tag("#{title} #{setting['twitter_hashtag']}") %>
|
||||
<% if browser.device.mobile? %>
|
||||
<a href="whatsapp://send?text=<%= title %> <%= url %>" data-action="share/whatsapp/share">
|
||||
<span class="icon-whatsapp whatsapp"></span>
|
||||
<span class="show-for-sr"><%= t("social.whatsapp") %></span>
|
||||
</a>
|
||||
<% end %>
|
||||
</div>
|
||||
@@ -1,5 +1,5 @@
|
||||
<div class="small-12 medium-8 column">
|
||||
<%= render 'shared/back_link' %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h1><%= t('management.user_invites.create.title') %></h1>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
<div class="row margin-top">
|
||||
<div class="menu small-12 medium-3 column">
|
||||
<%= render "shared/back_link" %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<ul class="menu vertical margin-top">
|
||||
<li><a href="#1"><strong><%= t("pages.more_info.faq.page.faq_1_title") %></strong></a></li>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
<div class="row margin-top">
|
||||
<div class="text small-12 column">
|
||||
<%= render "shared/back_link" %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h1><%= t('pages.more_info.titles.how_to_use') %></h1>
|
||||
|
||||
|
||||
@@ -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 %>
|
||||
|
||||
<div class="expanded no-margin-top dark-heading">
|
||||
<div class="row">
|
||||
<div class="small-12 medium-6 column padding">
|
||||
<h1><%= t("polls.index.title") %></h1>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<%= render "shared/section_header", i18n_namespace: "polls.index.section_header", image: "polls" %>
|
||||
|
||||
<div class="row">
|
||||
<div class="small-12 medium-3 column">
|
||||
<%= render 'shared/filter_subnav_vertical', i18n_namespace: "polls.index" %>
|
||||
</div>
|
||||
<div class="small-12 medium-9 column">
|
||||
<%= render 'shared/filter_subnav', i18n_namespace: "polls.index" %>
|
||||
|
||||
<div class="small-12 medium-9 column margin-top">
|
||||
<% polls_by_geozone_restriction = @polls.group_by(&:geozone_restricted) %>
|
||||
|
||||
<% if polls_by_geozone_restriction[false].present? %>
|
||||
@@ -31,5 +22,15 @@
|
||||
<% end %>
|
||||
|
||||
<%= paginate @polls %>
|
||||
|
||||
<div id="section_help" class="margin" data-magellan-target="section_help">
|
||||
<p class="lead">
|
||||
<strong><%= t("polls.index.section_footer.title") %></strong>
|
||||
</p>
|
||||
<p><%= t("polls.index.section_footer.help_text_1") %></p>
|
||||
<p><%= t("polls.index.section_footer.help_text_2",
|
||||
org: link_to(setting['org_name'], new_user_registration_path)).html_safe %></p>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<div class="expanded no-margin-top dark-heading">
|
||||
<div class="row">
|
||||
<div class="small-12 medium-9 column padding">
|
||||
<%= render "shared/back_link" %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h1><%= @question.title %></h1>
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<% provide :title do %><%= @poll.name %><% end %>
|
||||
<% content_for :wrapper_class, "light" %>
|
||||
|
||||
<div class="polls-show">
|
||||
<div class="expanded no-margin-top dark-heading polls-show-header">
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
<div class="row">
|
||||
<div class="small-12 column">
|
||||
<%= render 'shared/back_link' %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h1><%= t("proposal_notifications.new.title") %></h1>
|
||||
|
||||
<div class="callout primary">
|
||||
<p>
|
||||
<%= 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 %>
|
||||
</p>
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
<div class="row">
|
||||
<div class="small-12 medium-9">
|
||||
<%= link_to user_path(current_user), class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("proposal_notifications.show.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to user_path(current_user), t("proposal_notifications.show.back") %>
|
||||
|
||||
<h2><%= @notification.title %></h2>
|
||||
<p><%= @notification.body %></p>
|
||||
|
||||
@@ -4,18 +4,18 @@
|
||||
<a id="flag-expand-proposal-<%= proposal.id %>" data-toggle="flag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.flag') %>">
|
||||
<span class="icon-flag flag-disable"></span>
|
||||
</a>
|
||||
<div class="dropdown-pane" id="flag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
|
||||
<span class="dropdown-pane" id="flag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
|
||||
<%= link_to t('shared.flag'), flag_proposal_path(proposal), method: :put, remote: true, id: "flag-proposal-#{ proposal.id }" %>
|
||||
</div>
|
||||
</span>
|
||||
<% end %>
|
||||
|
||||
<% if show_unflag_action? proposal %>
|
||||
<a id="unflag-expand-proposal-<%= proposal.id %>" data-toggle="unflag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.unflag') %>">
|
||||
<span class="icon-flag flag-active"></span>
|
||||
</a>
|
||||
<div class="dropdown-pane" id="unflag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
|
||||
<span class="dropdown-pane" id="unflag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
|
||||
<%= link_to t('shared.unflag'), unflag_proposal_path(proposal), method: :put, remote: true, id: "unflag-proposal-#{ proposal.id }" %>
|
||||
</div>
|
||||
</span>
|
||||
<% end %>
|
||||
</span>
|
||||
</span>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="proposal-edit row">
|
||||
|
||||
<div class="small-12 column">
|
||||
<%= render "shared/back_link" %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<div class="float-right">
|
||||
<%= link_to t("proposals.edit.show_link"), @proposal %>
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
<% end %>
|
||||
|
||||
<main>
|
||||
<h1 class="show-for-sr"><%= t("shared.outline.proposals") %></h1>
|
||||
|
||||
<% if @search_terms || @advanced_search_terms || @tag_filter || params[:retired].present? %>
|
||||
<div class="highlight no-margin-top padding margin-bottom">
|
||||
<div class="row">
|
||||
@@ -35,6 +33,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% else %>
|
||||
<%= render "shared/section_header", i18n_namespace: "proposals.index.section_header", image: "proposals" %>
|
||||
<% end %>
|
||||
|
||||
<div class="row">
|
||||
@@ -61,9 +61,11 @@
|
||||
|
||||
<%= render 'shared/order_links', i18n_namespace: "proposals.index" %>
|
||||
|
||||
<div class="show-for-small-only">
|
||||
<%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button expanded' %>
|
||||
</div>
|
||||
<% if @proposals.any? %>
|
||||
<div class="show-for-small-only">
|
||||
<%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button expanded' %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div id="proposals-list">
|
||||
<% 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 %>
|
||||
<div id="section_help" class="margin" data-magellan-target="section_help">
|
||||
<p class="lead">
|
||||
<strong><%= t("proposals.index.section_footer.title") %></strong>
|
||||
</p>
|
||||
<p><%= t("proposals.index.section_footer.help_text_1") %></p>
|
||||
<p><%= t("proposals.index.section_footer.help_text_2",
|
||||
org: link_to(setting['org_name'], new_user_registration_path)).html_safe %></p>
|
||||
<p><%= t("proposals.index.section_footer.help_text_3") %></p>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="proposal-form row">
|
||||
|
||||
<div class="small-12 medium-9 column">
|
||||
<%= render "shared/back_link" %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h1><%= t("proposals.new.start_new") %></h1>
|
||||
<div data-alert class="callout primary">
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<div class="proposal-show">
|
||||
<div id="<%= dom_id(@proposal) %>" class="row">
|
||||
<div class="small-12 medium-9 column">
|
||||
<%= 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? %>
|
||||
<div class="document-link">
|
||||
<%= text_with_links @proposal.external_url %>
|
||||
<p>
|
||||
<span class="icon-document"></span>
|
||||
<strong><%= t('proposals.show.title_external_url') %></strong>
|
||||
</p>
|
||||
<%= text_with_links @proposal.external_url %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<% if @proposal.video_url.present? %>
|
||||
<div class="video-link">
|
||||
<p>
|
||||
<span class="icon-video"></span>
|
||||
<strong><%= t('proposals.show.title_video_url') %></strong>
|
||||
</p>
|
||||
<%= text_with_links @proposal.video_url %>
|
||||
</div>
|
||||
|
||||
<% end %>
|
||||
|
||||
<h4><%= @proposal.question %></h4>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<main>
|
||||
<div class="row proposals-summary">
|
||||
<div id="proposals" class="proposals-list small-12 medium-9 column">
|
||||
<%= render "shared/back_link" %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<% @proposals.each do |group_name, proposals| %>
|
||||
<div id="<%= group_name.parameterize %>">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<% if current_user %>
|
||||
<% if show_admin_menu? %>
|
||||
<li>
|
||||
<%= link_to t("layouts.header.administration_menu"), "#", rel: "nofollow" %>
|
||||
<ul class="menu">
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
<%= link_to :back, class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("shared.back") %>
|
||||
<% end %>
|
||||
10
app/views/shared/_section_header.html.erb
Normal file
10
app/views/shared/_section_header.html.erb
Normal file
@@ -0,0 +1,10 @@
|
||||
<div class="highlight jumbo">
|
||||
<div class="row">
|
||||
<div class="small-12 medium-9 column" data-magellan>
|
||||
<%= image_tag "help/help_icon_#{image}.png", alt: t("#{i18n_namespace}.icon_alt"), class: "align-top" %>
|
||||
<h1 class="inline-block"><%= t("#{i18n_namespace}.title") %></h1>
|
||||
<p class="lead"><%= t("#{i18n_namespace}.description") %></p>
|
||||
<%= link_to t("#{i18n_namespace}.help"), "#section_help", class: "help-link" %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -4,7 +4,7 @@
|
||||
<% end %>
|
||||
<div class="social-share-full">
|
||||
<%= social_share_button_tag("#{title} #{setting['twitter_hashtag']}") %>
|
||||
<a href="whatsapp://send?text=<%= title.gsub(/\s/, '%20') %> <%= url %>"
|
||||
<a href="whatsapp://send?text=<%= CGI.escape(title) %> <%= url %>"
|
||||
class="show-for-small-only" data-action="share/whatsapp/share">
|
||||
<span class="icon-whatsapp whatsapp"></span>
|
||||
<span class="show-for-sr"><%= t("social.whatsapp") %></span>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="spending-proposal-form row margin-top">
|
||||
|
||||
<div class="small-12 medium-9 column">
|
||||
<%= render "shared/back_link" %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h1><%= t("spending_proposals.new.start_new") %></h1>
|
||||
<div data-alert class="callout primary">
|
||||
|
||||
@@ -7,28 +7,34 @@
|
||||
|
||||
<% if proposal.retired? %>
|
||||
|
||||
<td class="text-center">
|
||||
<td class="text-center" colspan="2">
|
||||
<span class="label alert"><%= t('users.proposals.retired') %></span>
|
||||
</td>
|
||||
|
||||
<% elsif author?(proposal) %>
|
||||
|
||||
<td class="text-center">
|
||||
<td>
|
||||
<%= link_to t("users.proposals.send_notification"),
|
||||
new_proposal_notification_path(proposal_id: proposal.id),
|
||||
class: 'button hollow' %>
|
||||
class: 'button hollow expanded' %>
|
||||
</td>
|
||||
|
||||
<td class="text-center">
|
||||
<td>
|
||||
<% if proposal.retired? %>
|
||||
<span class="label alert"><%= t('users.proposals.retired') %></span>
|
||||
<% else %>
|
||||
<%= link_to t('users.proposals.retire'),
|
||||
retire_form_proposal_path(proposal),
|
||||
class: 'button hollow alert' %>
|
||||
class: 'button hollow alert expanded' %>
|
||||
<% end %>
|
||||
</td>
|
||||
|
||||
<% else %>
|
||||
|
||||
<td class="text-center" colspan="2">
|
||||
<%= link_to t('users.proposals.see'), proposal, class: 'button hollow' %>
|
||||
</td>
|
||||
|
||||
<% end %>
|
||||
|
||||
</tr>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= render "shared/back_link" %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h2><%= t("devise_views.users.registrations.delete_form.title") %></h2>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= render "shared/back_link" %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h2><%= t("devise_views.users.registrations.edit.edit") %></h2>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= render "shared/back_link" %>
|
||||
<%= back_link_to %>
|
||||
|
||||
<h2><%= t("valuation.spending_proposals.show.heading") %> <%= @spending_proposal.id %> </h2>
|
||||
<h1><%= @spending_proposal.title %></h1>
|
||||
|
||||
@@ -20,10 +20,7 @@
|
||||
|
||||
<div class="small-12 medium-4 column">
|
||||
|
||||
<%= link_to account_path, class: "back" do %>
|
||||
<span class="icon-angle-left float-left"></span>
|
||||
<%= t("verification.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to account_path, t("verification.back") %>
|
||||
|
||||
<h1><%= t("verification.letter.new.title") %></h1>
|
||||
|
||||
|
||||
@@ -2,10 +2,7 @@
|
||||
<%track_event(category: "verification", action: "start_letter" )%>
|
||||
<div class="small-12 column">
|
||||
|
||||
<%= link_to account_path, class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("verification.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to account_path, t("verification.back") %>
|
||||
|
||||
<h1><%= t("verification.letter.edit.title") %></h1>
|
||||
|
||||
|
||||
@@ -18,10 +18,7 @@
|
||||
<span class="meter" style="width: 33%"></span>
|
||||
</div>
|
||||
|
||||
<%= link_to account_path, class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("verification.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to account_path, t("verification.back") %>
|
||||
|
||||
<h1><%= t("verification.residence.new.title") %></h1>
|
||||
|
||||
|
||||
@@ -18,10 +18,7 @@
|
||||
<span class="meter" style="width: 66%"></span>
|
||||
</div>
|
||||
|
||||
<%= link_to account_path, class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("verification.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to account_path, t("verification.back") %>
|
||||
|
||||
<h1><%= t("verification.sms.edit.title") %></h1>
|
||||
|
||||
|
||||
@@ -18,10 +18,7 @@
|
||||
<span class="meter" style="width: 66%"></span>
|
||||
</div>
|
||||
|
||||
<%= link_to account_path, class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("verification.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to account_path, t("verification.back") %>
|
||||
|
||||
<h1><%= t("verification.sms.new.title") %></h1>
|
||||
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
<div class="verification account row">
|
||||
<div class="small-12 column">
|
||||
|
||||
<%= link_to account_path, class: "back" do %>
|
||||
<span class="icon-angle-left"></span>
|
||||
<%= t("verification.back") %>
|
||||
<% end %>
|
||||
<%= back_link_to account_path, t("verification.back") %>
|
||||
|
||||
<h1><%= t("verification.verified_user.show.title") %></h1>
|
||||
|
||||
|
||||
@@ -4,22 +4,17 @@
|
||||
<%= render "shared/canonical", href: root_url %>
|
||||
<% end %>
|
||||
|
||||
<div class="expanded highlight padding no-margin-top">
|
||||
<div class="jumbo highlight">
|
||||
<div class="row">
|
||||
<div class="small-12 medium-6 column">
|
||||
<div class="small-12 medium-9 small-centered column text-center">
|
||||
<h1><%= t("layouts.header.open_city_title") %></h1>
|
||||
<p>
|
||||
<%= t("layouts.header.open_city_slogan_html") %>
|
||||
<%= link_to t("layouts.header.more_info"), more_info_path %>
|
||||
<p class="lead">
|
||||
<%= t("layouts.header.open_city_slogan_html") %>
|
||||
</p>
|
||||
<div class="small-12 medium-6">
|
||||
<%= link_to t("layouts.header.see_all"), proposals_path, class: "button see-more expanded" %>
|
||||
<div class="small-12 medium-6 large-4 small-centered">
|
||||
<%= link_to t("layouts.header.more_info"), more_info_path, class: "button expanded large" %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="hide-for-small-only small-12 medium-5 column text-center">
|
||||
<%= image_tag(image_path_for("icon_home.png"), size: "330x240", alt:"") %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -31,24 +26,53 @@
|
||||
|
||||
<% cache [locale_and_user_status, @featured_debates, @featured_proposals, 'featured'] do %>
|
||||
<main>
|
||||
<div class="highlight small-12 column text-center">
|
||||
<div class="row margin padding">
|
||||
<div class="small-12 medium-3 column">
|
||||
<h2><%= t("welcome.debates.title") %></h2>
|
||||
<p><%= t("welcome.debates.description") %></p>
|
||||
</div>
|
||||
<div class="small-12 medium-3 column">
|
||||
<h2><%= t("welcome.proposal.title") %></h2>
|
||||
<p><%= t("welcome.proposal.description") %></p>
|
||||
</div>
|
||||
<div class="small-12 medium-3 column">
|
||||
<h2><%= t("welcome.decide.title") %></h2>
|
||||
<p><%= t("welcome.decide.description") %></p>
|
||||
</div>
|
||||
<div class="small-12 medium-3 column">
|
||||
<h2><%= t("welcome.do.title") %></h2>
|
||||
<p><%= t("welcome.do.description") %></p>
|
||||
</div>
|
||||
|
||||
<div class="row margin padding">
|
||||
<div class="small-12 medium-3 column">
|
||||
<h2><%= t("welcome.debates.title") %></h2>
|
||||
<p><%= t("welcome.debates.description") %></p>
|
||||
</div>
|
||||
<div class="small-12 medium-3 column">
|
||||
<h2><%= t("welcome.proposal.title") %></h2>
|
||||
<p><%= t("welcome.proposal.description") %></p>
|
||||
</div>
|
||||
<div class="small-12 medium-3 column">
|
||||
<h2><%= t("welcome.decide.title") %></h2>
|
||||
<p><%= t("welcome.decide.description") %></p>
|
||||
</div>
|
||||
<div class="small-12 medium-3 column">
|
||||
<h2><%= t("welcome.do.title") %></h2>
|
||||
<p><%= t("welcome.do.description") %></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="small-12 medium-6 column">
|
||||
<p>
|
||||
<span class="lead"><strong><%= t("welcome.debates.title") %></strong></span><br>
|
||||
<%= t("welcome.debates.description") %>
|
||||
</p>
|
||||
</div>
|
||||
<div class="small-12 medium-6 column">
|
||||
<p>
|
||||
<span class="lead"><strong><%= t("welcome.proposal.title") %></strong></span><br>
|
||||
<%= t("welcome.proposal.description") %>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row margin-top">
|
||||
<div class="small-12 medium-6 column">
|
||||
<p>
|
||||
<span class="lead"><strong><%= t("welcome.decide.title") %></strong></span><br>
|
||||
<%= t("welcome.decide.description") %>
|
||||
</p>
|
||||
</div>
|
||||
<div class="small-12 medium-6 column">
|
||||
<p>
|
||||
<span class="lead"><strong><%= t("welcome.do.title") %></strong></span><br>
|
||||
<%= t("welcome.do.description") %>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
@@ -35,7 +35,7 @@ module Consul
|
||||
config.time_zone = 'Madrid'
|
||||
config.active_job.queue_adapter = :delayed_job
|
||||
|
||||
# Consul specific custom overrides
|
||||
# CONSUL specific custom overrides
|
||||
# Read more on documentation:
|
||||
# * English: https://github.com/consul/consul/blob/master/CUSTOMIZE_EN.md
|
||||
# * Spanish: https://github.com/consul/consul/blob/master/CUSTOMIZE_ES.md
|
||||
|
||||
@@ -46,7 +46,7 @@ Rails.application.configure do
|
||||
|
||||
# Use the lowest log level to ensure availability of diagnostic information
|
||||
# when problems arise.
|
||||
config.log_level = :debug
|
||||
config.log_level = :warn
|
||||
|
||||
# Prepend all log lines with the following tags.
|
||||
# config.log_tags = [ :subdomain, :uuid ]
|
||||
|
||||
@@ -114,6 +114,7 @@ ignore_missing:
|
||||
ignore_unused:
|
||||
- 'budgets.phase.*'
|
||||
- 'budgets.investments.index.orders.*'
|
||||
- 'budgets.index.section_header.*'
|
||||
- 'activerecord.*'
|
||||
- 'activemodel.*'
|
||||
- 'unauthorized.*'
|
||||
@@ -148,16 +149,20 @@ ignore_unused:
|
||||
- 'valuation.budget_investments.index.filter*'
|
||||
- 'users.show.filters.*'
|
||||
- 'polls.index.filters.*'
|
||||
- 'polls.index.section_header.*'
|
||||
- 'debates.index.select_order'
|
||||
- 'debates.index.orders.*'
|
||||
- 'debates.index.section_header.*'
|
||||
- 'proposals.index.select_order'
|
||||
- 'proposals.index.orders.*'
|
||||
- 'proposals.index.section_header.*'
|
||||
- 'spending_proposals.index.search_form.*'
|
||||
- '*.index.search_form.*'
|
||||
- 'notifications.index.comments_on*'
|
||||
- 'notifications.index.replies_to*'
|
||||
- 'notifications.index.proposal_notification*'
|
||||
- 'legislation.processes.index.filter*'
|
||||
- 'legislation.processes.index.section_header.*'
|
||||
- 'helpers.page_entries_info.*' # kaminari
|
||||
- 'views.pagination.*' # kaminari
|
||||
- 'shared.suggest.*'
|
||||
|
||||
@@ -872,7 +872,7 @@ en:
|
||||
content_blocks:
|
||||
form:
|
||||
content_blocks_information: Information about content blocks
|
||||
content_block_about: You can create HTML content blocks to be inserted in the header or the footer of your Consul.
|
||||
content_block_about: You can create HTML content blocks to be inserted in the header or the footer of your CONSUL.
|
||||
content_block_top_links_html: "<strong>Header blocks (top_links)</strong> are blocks of links that must have this format:"
|
||||
content_block_footer_html: "<strong>Footer blocks</strong> can have any format and can be used to insert Javascript, CSS or custom HTML."
|
||||
create:
|
||||
|
||||
@@ -38,6 +38,17 @@ en:
|
||||
finished: Finished budget
|
||||
index:
|
||||
title: Participatory budgets
|
||||
section_header:
|
||||
icon_alt: Participatory budgets icon
|
||||
title: Participatory budgets
|
||||
description: With the participatory budgets the citizens decide to which projects presented by the neighbors is destined a part of the municipal budget.
|
||||
help: Help about participatory budgets
|
||||
section_footer:
|
||||
title: Help about participatory budgets
|
||||
help_text_1: "Participatory budgets are processes in which citizens decide directly on what is spent part of the municipal budget. Any registered person over 16 years old can propose an investment project that is preselected in a phase of citizen supports."
|
||||
help_text_2: "The most voted projects are evaluated and passed to a final vote in which they decide the actions to be carried out by the City Council once the municipal budgets of the next year are approved."
|
||||
help_text_3: "The presentation of participatory budgeting projects takes place from January and over a period of one and a half months. To participate and propose proposals for the entire city and / or districts, you must sign up on %{org} and verify your account."
|
||||
help_text_4: "To get as many supports and votes as possible, choose a descriptive and understandable headline for your project. Then you have a space to develop the approach of your proposal. Provide all the data and explanations, and even documents and images, to help other participants to better understand what you are proposing."
|
||||
investments:
|
||||
form:
|
||||
tag_category_label: "Categories"
|
||||
|
||||
@@ -122,6 +122,18 @@ en:
|
||||
select_order: Order by
|
||||
start_debate: Start a debate
|
||||
title: Debates
|
||||
section_header:
|
||||
icon_alt: Debates icon
|
||||
title: Debates
|
||||
description: Start a debate to share opinions with others about the topics you are concerned about.
|
||||
help: Help about debates
|
||||
section_footer:
|
||||
title: Help about debates
|
||||
help_text_1: "The space for citizen debates is aimed at anyone who can expose issues of their concern and those who want to share opinions with other people."
|
||||
help_text_2: 'To open a debate you need to sign up on %{org}. Users can also comment on open debates and rate them with the "I agree" or "I disagree" buttons found in each of them.'
|
||||
help_text_3: "Keep in mind that a debate does not start any specific action. If you want to make a %{proposal} for the city or raise a investment project of %{budget} when the phase is open, go to the corresponding section."
|
||||
proposals_link: proposal
|
||||
budget_link: participatory budgeting
|
||||
new:
|
||||
form:
|
||||
submit_button: Start a debate
|
||||
@@ -181,10 +193,10 @@ en:
|
||||
footer:
|
||||
accessibility: Accessibility
|
||||
conditions: Terms and conditions of use
|
||||
consul: Consul application
|
||||
consul: CONSUL application
|
||||
consul_url: https://github.com/consul/consul
|
||||
contact_us: For technical assistance enters
|
||||
copyright: Consul, %{year}
|
||||
copyright: CONSUL, %{year}
|
||||
description: This portal uses the %{consul} which is %{open_source}.
|
||||
faq: technical assistance
|
||||
open_data_text: Every detail about the City Council is yours to access.
|
||||
@@ -209,7 +221,7 @@ en:
|
||||
external_link_transparency: Transparency
|
||||
external_link_transparency_url: https://transparency.consul
|
||||
locale: 'Language:'
|
||||
logo: Consul logo
|
||||
logo: CONSUL logo
|
||||
management: Management
|
||||
moderation: Moderation
|
||||
valuation: Valuation
|
||||
@@ -224,11 +236,10 @@ en:
|
||||
no_notifications: "You don't have new notifications"
|
||||
open: open
|
||||
open_city_slogan_html: There are cities that are governed directly by their inhabitants, who <b>discuss</b> the topics they are concerned about, <b>propose</b> ideas to improve their lives and <b>decide</b> among themselves which ones will be carried out.
|
||||
open_city_title: Love the city, and it will become a city you love.
|
||||
open_city_title: Love the city, and it will become a city you love
|
||||
open_gov: Open government
|
||||
proposals: Proposals
|
||||
poll_questions: Voting
|
||||
see_all: See proposals
|
||||
budgets: Participatory budgeting
|
||||
spending_proposals: Spending Proposals
|
||||
admin:
|
||||
@@ -359,6 +370,16 @@ en:
|
||||
title: Proposals
|
||||
top: Top weekly
|
||||
top_link_proposals: The most supported proposals by category
|
||||
section_header:
|
||||
icon_alt: Proposals icon
|
||||
title: Proposals
|
||||
description: Make a citizen proposal. If it gets enough supports it will go to voting phase, so you can get all the citizens to decide how they want their city to be.
|
||||
help: Help about proposals
|
||||
section_footer:
|
||||
title: Help about proposals
|
||||
help_text_1: "The citizen proposals are an opportunity for neighbours and collectives to decide directly how they want to shape their city. Any person can make a proposal about a topic or concern of their interest, for the City Council to make it, after it gets enough supports to be put to a citizens vote."
|
||||
help_text_2: "To create a proposal, you must sign up on %{org}. The proposals that get the support of 1% of the users in the web, goes to voting phase. To support proposals it is necessary to have a verified account."
|
||||
help_text_3: "A citizen vote is celebrated when the proposals get the necessary supports. Once celebrated, if there are more people in favor than against, the City Council assumes the proposal and carries it out."
|
||||
new:
|
||||
form:
|
||||
submit_button: Create proposal
|
||||
@@ -414,6 +435,8 @@ en:
|
||||
send_notification: Send notification
|
||||
no_notifications: "This proposal has any notifications."
|
||||
embed_video_title: "Video on %{proposal}"
|
||||
title_external_url: "Additional documentation"
|
||||
title_video_url: "External video"
|
||||
update:
|
||||
form:
|
||||
submit_button: Save changes
|
||||
@@ -439,6 +462,15 @@ en:
|
||||
cant_answer_not_logged_in: "You must sign in or sign up to participate"
|
||||
cant_answer_verify: "You must verify your account in order to answer"
|
||||
already_answer: "You already have participated in this poll"
|
||||
section_header:
|
||||
icon_alt: Voting icon
|
||||
title: Voting
|
||||
description: Sign up to vote on citizen proposals and questions the City Council ask to the neighbors. Make municipal decisions directly.
|
||||
help: Help about voting
|
||||
section_footer:
|
||||
title: Help about voting
|
||||
help_text_1: "Voting takes place when a citizen proposal supports reaches 1% of the census with voting rights. Voting can also include questions that the City Council ask to the citizens decision."
|
||||
help_text_2: "To participate in the next vote you have to sign up on %{org} and verify your account. All registered voters in the city over 16 years old can vote. The results of all votes are binding on the government."
|
||||
show:
|
||||
dates_title: "Participation dates"
|
||||
cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate."
|
||||
@@ -562,8 +594,6 @@ en:
|
||||
unfollow: "Unfollow"
|
||||
unfollow_entity: "Unfollow %{entity}"
|
||||
outline:
|
||||
debates: Debates
|
||||
proposals: Proposals
|
||||
budget: Participatory budget
|
||||
searcher: Searcher
|
||||
go_to_page: "Go to page of "
|
||||
@@ -682,7 +712,8 @@ en:
|
||||
proposals:
|
||||
send_notification: "Send notification"
|
||||
retire: "Retire"
|
||||
retired: "Retired"
|
||||
retired: "Retired proposal"
|
||||
see: "See proposal"
|
||||
votes:
|
||||
agree: I agree
|
||||
anonymous: Too many anonymous votes to admit vote %{verify_account}.
|
||||
|
||||
@@ -64,6 +64,16 @@ en:
|
||||
no_open_processes: There aren't open processes
|
||||
no_next_processes: There aren't planned processes
|
||||
no_past_processes: There aren't past processes
|
||||
section_header:
|
||||
icon_alt: Legislation processes icon
|
||||
title: Legislation processes
|
||||
description: Participate in the debates and processes prior to the approval of a ordinance or a municipal action. Your opinion will be consider by the City Council.
|
||||
help: Help about legislation processes
|
||||
section_footer:
|
||||
title: Help about legislation processes
|
||||
help_text_1: "In participatory processes, the City Council offers to its citizens the opportunity to participate in the drafting and modification of regulations, affecting the city and to be able to give their opinion on certain actions that it plans to carry out."
|
||||
help_text_2: "People registered in %{org} can participate with contributions in the public consultation of new ordinances, regulations and guidelines, among others. Your comments are analyzed by the corresponding area and considered for the final drafting of the ordinances."
|
||||
help_text_3: "The City Council also opens processes to receive contributions and opinions on municipal actions."
|
||||
phase_not_open:
|
||||
not_open: This phase is not open yet
|
||||
phase_empty:
|
||||
|
||||
@@ -23,7 +23,7 @@ en:
|
||||
document_verifications:
|
||||
already_verified: This user account is already verified.
|
||||
has_no_account_html: In order to create an account, go to %{link} and click in <b>'Register'</b> in the upper-left part of the screen.
|
||||
link: Consul
|
||||
link: CONSUL
|
||||
in_census_has_following_permissions: 'This user can participate in the website with the following permissions:'
|
||||
not_in_census: This document is not registered.
|
||||
not_in_census_info: 'Citizens not in the Census can participate in the website with the following permissions:'
|
||||
|
||||
@@ -63,9 +63,9 @@ en:
|
||||
text: |-
|
||||
Use it in your local government or help us to improve it, it is free software.
|
||||
|
||||
This Open Government Portal use the [Consul app](https://github.com/ayuntamientomadrid 'consul github') that is free software, with [licence AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), that means in simple words that anyone can use the code freely, copy it, see it in detail, modify it and redistribute it to the word with the modifications he wants (allowing others to do the same). Because we think culture is better and richer when it is released.
|
||||
This Open Government Portal use the [CONSUL app](https://github.com/ayuntamientomadrid 'consul github') that is free software, with [licence AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), that means in simple words that anyone can use the code freely, copy it, see it in detail, modify it and redistribute it to the word with the modifications he wants (allowing others to do the same). Because we think culture is better and richer when it is released.
|
||||
|
||||
If you are a programmer, you can see the code and help us to improve it at [Consul app](https://github.com/ayuntamientomadrid 'consul github').
|
||||
If you are a programmer, you can see the code and help us to improve it at [CONSUL app](https://github.com/ayuntamientomadrid 'consul github').
|
||||
titles:
|
||||
how_to_use: Use it in your local government
|
||||
privacy: Privacy Policy
|
||||
|
||||
@@ -221,7 +221,8 @@ en:
|
||||
time:
|
||||
am: am
|
||||
formats:
|
||||
datetime: "%Y-%m-%d %H:%M:%S"
|
||||
default: "%a, %d %b %Y %H:%M:%S %z"
|
||||
long: "%B %d, %Y %H:%M"
|
||||
short: "%d %b %H:%M"
|
||||
pm: pm
|
||||
pm: pm
|
||||
|
||||
@@ -872,7 +872,7 @@ es:
|
||||
content_blocks:
|
||||
form:
|
||||
content_blocks_information: Información sobre los bloques de texto
|
||||
content_block_about: Puedes crear bloques de HTML que se incrustarán en la cabecera o el pie de tu Cónsul.
|
||||
content_block_about: Puedes crear bloques de HTML que se incrustarán en la cabecera o el pie de tu CONSUL.
|
||||
content_block_top_links_html: "Los <strong>bloques de la cabecera (top_links)</strong> son bloques de enlaces que deben crearse con este formato:"
|
||||
content_block_footer_html: "Los <strong>bloques del pie (footer)</strong> pueden tener cualquier formato y se pueden utilizar para guardar huellas Javascript, contenido CSS o contenido HTML personalizado."
|
||||
create:
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user