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 ebe051eef..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 @@ -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 e9065f8e4..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 @@ -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/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/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 727ec67b7..b8c361fed 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -2,45 +2,50 @@ <%= render "shared/canonical", href: root_url %> <% end %> -
+
-
+

<%= t("layouts.header.open_city_title") %>

-

- <%= t("layouts.header.open_city_slogan_html") %>  - <%= link_to t("layouts.header.more_info"), more_info_path %> +

+ <%= t("layouts.header.open_city_slogan_html") %>

-
- <%= link_to t("layouts.header.see_all"), proposals_path, class: "button see-more expanded" %> +
+ <%= link_to t("layouts.header.more_info"), more_info_path, class: "button expanded large" %>
- -
- <%= image_tag(image_path_for("icon_home.png"), size: "330x240", alt:"") %> -
<% cache [locale_and_user_status, @featured_debates, @featured_proposals, 'featured'] do %>
-
-
-

<%= t("welcome.debates.title") %>

-

<%= t("welcome.debates.description") %>

+
+
+

+ <%= t("welcome.debates.title") %>
+ <%= t("welcome.debates.description") %> +

-
-

<%= t("welcome.proposal.title") %>

-

<%= t("welcome.proposal.description") %>

+
+

+ <%= t("welcome.proposal.title") %>
+ <%= t("welcome.proposal.description") %> +

+
-
-

<%= t("welcome.decide.title") %>

-

<%= t("welcome.decide.description") %>

+
+
+

+ <%= t("welcome.decide.title") %>
+ <%= t("welcome.decide.description") %> +

-
-

<%= t("welcome.do.title") %>

-

<%= t("welcome.do.description") %>

+
+

+ <%= t("welcome.do.title") %>
+ <%= t("welcome.do.description") %> +

diff --git a/config/application.rb b/config/application.rb index e75bdbc2d..091f85479 100644 --- a/config/application.rb +++ b/config/application.rb @@ -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 diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 69ffa296e..7b77ab8d0 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -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: "Header blocks (top_links) are blocks of links that must have this format:" content_block_footer_html: "Footer blocks can have any format and can be used to insert Javascript, CSS or custom HTML." create: diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index b0067fb7f..24d72cfb8 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -177,10 +177,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. @@ -205,7 +205,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 @@ -220,11 +220,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 discuss the topics they are concerned about, propose ideas to improve their lives and decide 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: diff --git a/config/locales/en/management.yml b/config/locales/en/management.yml index d2524990a..8aabd7994 100644 --- a/config/locales/en/management.yml +++ b/config/locales/en/management.yml @@ -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 'Register' 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:' diff --git a/config/locales/en/pages.yml b/config/locales/en/pages.yml index e1c6bcc29..83db1a8e4 100644 --- a/config/locales/en/pages.yml +++ b/config/locales/en/pages.yml @@ -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 diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 280033353..0e6ae8dfa 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -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 bloques de la cabecera (top_links) son bloques de enlaces que deben crearse con este formato:" content_block_footer_html: "Los bloques del pie (footer) pueden tener cualquier formato y se pueden utilizar para guardar huellas Javascript, contenido CSS o contenido HTML personalizado." create: diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 313e24e8a..ee64c92dc 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -177,10 +177,10 @@ es: footer: accessibility: Accesibilidad conditions: Condiciones de uso - consul: aplicación Consul + consul: aplicación CONSUL consul_url: https://github.com/consul/consul contact_us: Para asistencia técnica entra en - copyright: Consul, %{year} + copyright: CONSUL, %{year} description: Este portal usa la %{consul} que es %{open_source}. faq: Asistencia técnica open_data_text: Todos los datos del Ayuntamiento son tuyos. @@ -205,7 +205,7 @@ es: external_link_transparency: Transparencia external_link_transparency_url: https://transparency.consul locale: 'Idioma:' - logo: Consul logo + logo: CONSUL logo management: Gestión moderation: Moderar valuation: Evaluación @@ -220,11 +220,10 @@ es: no_notifications: No tienes notificaciones nuevas open: abierto open_city_slogan_html: Existen ciudades gobernadas directamente por sus habitantes, que debaten sobre temas que les preocupan, proponen ideas para mejorar sus vidas y deciden entre todas y todos las que se llevan a cabo. - open_city_title: La ciudad que quieres será la ciudad que quieras. + open_city_title: La ciudad que quieres será la ciudad que quieras open_gov: Gobierno %{open} proposals: Propuestas poll_questions: Votaciones - see_all: Ver propuestas budgets: Presupuestos participativos spending_proposals: "Propuestas de inversión" admin: diff --git a/config/locales/es/management.yml b/config/locales/es/management.yml index 5ef4eee19..87358a438 100644 --- a/config/locales/es/management.yml +++ b/config/locales/es/management.yml @@ -23,7 +23,7 @@ es: document_verifications: already_verified: Esta cuenta de usuario ya está verificada. has_no_account_html: Para crear un usuario entre en %{link} y haga clic en la opción 'Registrarse' en la parte superior derecha de la pantalla. - link: Consul + link: CONSUL in_census_has_following_permissions: 'Este usuario puede participar en el Portal de Gobierno Abierto con las siguientes posibilidades:' not_in_census: Este documento no está registrado. not_in_census_info: 'Las personas no empadronadas pueden participar en el Portal de Gobierno Abierto con las siguientes posibilidades:' diff --git a/config/locales/es/pages.yml b/config/locales/es/pages.yml index 0f58588f0..81c916b5a 100644 --- a/config/locales/es/pages.yml +++ b/config/locales/es/pages.yml @@ -63,9 +63,9 @@ es: text: |- Utilízalo en tu municipio libremente o ayúdanos a mejorarlo, es software libre. - Este Portal de Gobierno Abierto usa la [aplicación Consul](https://github.com/ayuntamientomadrid 'github consul') que es software libre, con [licencia AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), esto significa en palabras sencillas, que cualquiera puede libremente usar el código, copiarlo, verlo en detalle, modificarlo, y redistribuirlo al mundo con las modificaciones que quiera (manteniendo el que otros puedan a su vez hacer lo mismo). Porque creemos que la cultura es mejor y más rica cuando se libera. + Este Portal de Gobierno Abierto usa la [aplicación CONSUL](https://github.com/ayuntamientomadrid 'github consul') que es software libre, con [licencia AGPLv3](http://www.gnu.org/licenses/agpl-3.0.html 'AGPLv3 gnu' ), esto significa en palabras sencillas, que cualquiera puede libremente usar el código, copiarlo, verlo en detalle, modificarlo, y redistribuirlo al mundo con las modificaciones que quiera (manteniendo el que otros puedan a su vez hacer lo mismo). Porque creemos que la cultura es mejor y más rica cuando se libera. - Si eres programador, puedes ver el código y ayudarnos a mejorarlo en [aplicación Consul](https://github.com/ayuntamientomadrid 'github consul'). + Si eres programador, puedes ver el código y ayudarnos a mejorarlo en [aplicación CONSUL](https://github.com/ayuntamientomadrid 'github consul'). titles: how_to_use: Utilízalo en tu municipio privacy: Política de Privacidad diff --git a/config/newrelic.yml b/config/newrelic.yml index 804c47140..f2ebf5526 100644 --- a/config/newrelic.yml +++ b/config/newrelic.yml @@ -14,7 +14,7 @@ common: &default_settings # Your application name. Renaming here affects where data displays in New # Relic. For more details, see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/renaming-applications - app_name: Consul + app_name: CONSUL # To disable the agent regardless of other settings, uncomment the following: # agent_enabled: false @@ -28,7 +28,7 @@ common: &default_settings # If your application has other named environments, configure them here. development: <<: *default_settings - app_name: Consul (Development) + app_name: CONSUL (Development) # NOTE: There is substantial overhead when running in developer mode. # Do not use for production or load testing. @@ -41,7 +41,7 @@ test: staging: <<: *default_settings - app_name: Consul (Staging) + app_name: CONSUL (Staging) production: <<: *default_settings diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index ddd70e503..678744bb2 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -18,13 +18,13 @@ Setting.create(key: 'comments_body_max_length', value: '1000') Setting.create(key: 'twitter_handle', value: '@consul_dev') Setting.create(key: 'twitter_hashtag', value: '#consul_dev') -Setting.create(key: 'facebook_handle', value: 'consul') -Setting.create(key: 'youtube_handle', value: 'consul') -Setting.create(key: 'telegram_handle', value: 'consul') -Setting.create(key: 'instagram_handle', value: 'consul') +Setting.create(key: 'facebook_handle', value: 'CONSUL') +Setting.create(key: 'youtube_handle', value: 'CONSUL') +Setting.create(key: 'telegram_handle', value: 'CONSUL') +Setting.create(key: 'instagram_handle', value: 'CONSUL') Setting.create(key: 'blog_url', value: '/blog') Setting.create(key: 'url', value: 'http://localhost:3000') -Setting.create(key: 'org_name', value: 'Consul') +Setting.create(key: 'org_name', value: 'CONSUL') Setting.create(key: 'place_name', value: 'City') Setting.create(key: 'feature.debates', value: "true") Setting.create(key: 'feature.polls', value: "true") @@ -39,7 +39,7 @@ Setting.create(key: 'feature.legislation', value: "true") Setting.create(key: 'per_page_code_head', value: "") Setting.create(key: 'per_page_code_body', value: "") Setting.create(key: 'comments_body_max_length', value: '1000') -Setting.create(key: 'mailer_from_name', value: 'Consul') +Setting.create(key: 'mailer_from_name', value: 'CONSUL') Setting.create(key: 'mailer_from_address', value: 'noreply@consul.dev') Setting.create(key: 'meta_description', value: 'Citizen Participation and Open Government Application') Setting.create(key: 'meta_keywords', value: 'citizen participation, open government') diff --git a/db/seeds.rb b/db/seeds.rb index eebea2461..718583b22 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -58,11 +58,11 @@ Setting["opendata_url"] = "/opendata" # Public-facing URL of the app. Setting["url"] = "http://example.com" -# Consul installation's organization name -Setting["org_name"] = "Consul" +# CONSUL installation's organization name +Setting["org_name"] = "CONSUL" -# Consul installation place name (City, Country...) -Setting["place_name"] = "Consul-land" +# CONSUL installation place name (City, Country...) +Setting["place_name"] = "CONSUL-land" # Meta tags for SEO Setting["meta_description"] = nil @@ -98,7 +98,7 @@ Setting['proposal_notification_minimum_interval_in_days'] = 3 Setting['direct_message_max_per_day'] = 3 # Email settings -Setting['mailer_from_name'] = 'Consul' +Setting['mailer_from_name'] = 'CONSUL' Setting['mailer_from_address'] = 'noreply@consul.dev' # Verification settings diff --git a/doc/README.md b/doc/README.md index 7e14c378a..b7e900d69 100644 --- a/doc/README.md +++ b/doc/README.md @@ -8,7 +8,7 @@ ## Funcionalidades -Actualmente Consul soporta: +Actualmente CONSUL soporta: * Registro y verificación de usuarios tanto en la misma aplicación como con distintos proveedores (Twitter, Facebook, Google). * Distintos perfiles de usuario, tanto ciudadanos individuales como organizaciones y cargos públicos. @@ -54,7 +54,7 @@ Dentro de su perfil ("Mi cuenta" en el menú superior) cada usuario puede config ## Perfiles de administrador, moderador y gestor -Consul cuenta con tres perfiles de usuario para administrar contenidos de la web: administrador, moderador y gestor. Además tiene otros dos perfiles para gestión de procesos participativos: [evaluador y presidente de mesa](#perfiles_de_evaluador,_gestor_y_presidente_de_mesa), que se detallan más abajo. +CONSUL cuenta con tres perfiles de usuario para administrar contenidos de la web: administrador, moderador y gestor. Además tiene otros dos perfiles para gestión de procesos participativos: [evaluador y presidente de mesa](#perfiles_de_evaluador,_gestor_y_presidente_de_mesa), que se detallan más abajo. Los usuarios con perfil de administrador pueden asignar cualquier tipo de perfil a cualquier tipo de usuario. Sin embargo, todos los perfiles tienen que ser usuarios verificados (contrastados con el padrón municipal) para poder realizar ciertas acciones (por ejemplo, los gestores necesitan estar verificados para crear propuestas de inversión). @@ -168,11 +168,11 @@ Las páginas sirven para mostrar cualquier tipo de contenido estático relativo ##### Personalizar imágenes -Desde este panel se definen las imágenes de los elementos corporativos de tu Consul. +Desde este panel se definen las imágenes de los elementos corporativos de tu CONSUL. ##### Personalizar bloques -Puedes crear bloques de HTML que se incrustarán en la cabecera o el pie de tu Cónsul. +Puedes crear bloques de HTML que se incrustarán en la cabecera o el pie de tu CONSUL. Los bloques de la cabecera (top_links) son bloques de enlaces que deben crearse con este formato: diff --git a/doc/api/api_en.md b/doc/api/api_en.md index ddf6b33ea..f7fb1a52e 100644 --- a/doc/api/api_en.md +++ b/doc/api/api_en.md @@ -30,7 +30,7 @@ ## GraphQL -The Consul API uses GraphQL [http://graphql.org](http://graphql.org), the [Ruby implementation](http://graphql-ruby.org/), to be specific. If you're not familiar with this kind of APIs, it's recommended to make some research about GraphQL before. +The CONSUL API uses GraphQL [http://graphql.org](http://graphql.org), the [Ruby implementation](http://graphql-ruby.org/), to be specific. If you're not familiar with this kind of APIs, it's recommended to make some research about GraphQL before. One of the characteristics that differentiates a REST API from a GraphQL one is that with the last one it's possible for the client to build its own *custom queries*, so the server will only return information in which we're interested. @@ -68,7 +68,7 @@ Responses are formatted in JSON: ## Making API requests -Following [the official recommendations](http://graphql.org/learn/serving-over-http/), the Consul API supports the following kind of requests: +Following [the official recommendations](http://graphql.org/learn/serving-over-http/), the CONSUL API supports the following kind of requests: * GET requests, with the query inside the *query string*. * POST requests @@ -115,7 +115,7 @@ The query must be located inside a valid JSON document, as the value of the `"qu Sure you can use any HTTP library available for most programming languages. -**IMPORTANT**: Due to security protocols from the Madrid City Council servers, it's necessary to include a *User Agent* header from a web browser so the request is not rejected. For example: +**IMPORTANT**: Due to security protocols from the Madrid City Council servers, it's necessary to include a *User Agent* header from a web browser so the request is not rejected. For example: `User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36` diff --git a/doc/api/api_es.md b/doc/api/api_es.md index 0791647a0..3292809c4 100644 --- a/doc/api/api_es.md +++ b/doc/api/api_es.md @@ -30,7 +30,7 @@ ## GraphQL -La API de Consul utiliza GraphQL [http://graphql.org](https://graphql.org), en concreto la [implementación en Ruby](http://graphql-ruby.org/). Si no estás familiarizado con este tipo de APIs, es recomendable investigar un poco sobre GraphQL previamente. +La API de CONSUL utiliza GraphQL [http://graphql.org](https://graphql.org), en concreto la [implementación en Ruby](http://graphql-ruby.org/). Si no estás familiarizado con este tipo de APIs, es recomendable investigar un poco sobre GraphQL previamente. Una de las caracteríticas que diferencian una API REST de una GraphQL es que con esta última es posible construir *consultas personalizadas*, de forma que el servidor nos devuelva únicamente la información en la que estamos interesados. @@ -68,7 +68,7 @@ Las respuestas son en formato JSON: ## Haciendo peticiones a la API -Siguiendo las [directrices oficiales](http://graphql.org/learn/serving-over-http/), la API de Consul soporta los siguientes tipos de peticiones: +Siguiendo las [directrices oficiales](http://graphql.org/learn/serving-over-http/), la API de CONSUL soporta los siguientes tipos de peticiones: * Peticiones GET, con la consulta dentro del *query string*. * Peticiones POST @@ -115,7 +115,7 @@ La consulta debe estar ubicada en un documento JSON válido, como valor de la cl Por supuesto es posible utilizar cualquier librería HTTP de lenguajes de programación. -**IMPORTANTE**: Debido a los protocolos de seguridad de los servidores del Ayuntamiento de Madrid, es necesario incluir un *User Agent* perteneciente a un navegador para que la petición no sea descartada. Por ejemplo: +**IMPORTANTE**: Debido a los protocolos de seguridad de los servidores del Ayuntamiento de Madrid, es necesario incluir un *User Agent* perteneciente a un navegador para que la petición no sea descartada. Por ejemplo: `User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36` diff --git a/doc/en/dev_test_setup_linux.md b/doc/en/dev_test_setup_linux.md index aeeb21fcb..5cb89d166 100644 --- a/doc/en/dev_test_setup_linux.md +++ b/doc/en/dev_test_setup_linux.md @@ -88,7 +88,7 @@ apt-get install postgresql-9.4 ## Cloning the repository -Now, with all the dependencies installed, clone the Consul repository: +Now, with all the dependencies installed, clone the CONSUL repository: ``` git clone https://github.com/consul/consul.git diff --git a/public/consul_brand.zip b/public/consul_brand.zip new file mode 100644 index 000000000..6664d406f Binary files /dev/null and b/public/consul_brand.zip differ diff --git a/public/consul_logo.png b/public/consul_logo.png index a314a724a..3e4e7bed1 100644 Binary files a/public/consul_logo.png and b/public/consul_logo.png differ diff --git a/public/favicon.ico b/public/favicon.ico index a68af1ef8..187043296 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/social_media_icon.png b/public/social_media_icon.png index 8a5503078..80706d800 100644 Binary files a/public/social_media_icon.png and b/public/social_media_icon.png differ diff --git a/public/social_media_icon_twitter.png b/public/social_media_icon_twitter.png index 02c934e95..7225b71fc 100644 Binary files a/public/social_media_icon_twitter.png and b/public/social_media_icon_twitter.png differ diff --git a/spec/features/emails_spec.rb b/spec/features/emails_spec.rb index dd0d71f2c..af7674101 100644 --- a/spec/features/emails_spec.rb +++ b/spec/features/emails_spec.rb @@ -210,7 +210,7 @@ feature 'Emails' do email_digest.mark_as_emailed email = open_last_email - expect(email).to have_subject("Proposal notifications in Consul") + expect(email).to have_subject("Proposal notifications in CONSUL") expect(email).to deliver_to(user.email) expect(email).to have_body_text(proposal1.title) @@ -257,7 +257,7 @@ feature 'Emails' do expect(unread_emails_for("isable@example.com").count).to eq 1 email = open_last_email - expect(email).to have_subject("Invitation to Consul") + expect(email).to have_subject("Invitation to CONSUL") expect(email).to have_body_text(/#{new_user_registration_path}/) end diff --git a/spec/features/localization_spec.rb b/spec/features/localization_spec.rb index 810d07503..2296aeb6c 100644 --- a/spec/features/localization_spec.rb +++ b/spec/features/localization_spec.rb @@ -6,7 +6,7 @@ feature 'Localization' do visit root_path(locale: :es) visit root_path(locale: :klingon) - expect(page).to have_text('La ciudad que quieres será la ciudad que quieras.') + expect(page).to have_text('La ciudad que quieres será la ciudad que quieras') end scenario 'Available locales appear in the locale switcher' do diff --git a/spec/lib/email_digests_spec.rb b/spec/lib/email_digests_spec.rb index 6f15a92d4..8e0a16177 100644 --- a/spec/lib/email_digests_spec.rb +++ b/spec/lib/email_digests_spec.rb @@ -78,7 +78,7 @@ describe EmailDigest do email_digest.deliver email = open_last_email - expect(email).to have_subject("Proposal notifications in Consul") + expect(email).to have_subject("Proposal notifications in CONSUL") end it "does not deliver email if no notifications pending" do