diff --git a/.gitignore b/.gitignore index a6f2826c3..7bb7a3090 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,6 @@ public/sitemap.xml public/system/ + +#Netbeans projects files +/nbproject diff --git a/CUSTOMIZE_EN.md b/CUSTOMIZE_EN.md deleted file mode 100644 index 3a97b96de..000000000 --- a/CUSTOMIZE_EN.md +++ /dev/null @@ -1,221 +0,0 @@ -# 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). - -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: - -* `config/locales/custom/` -* `app/assets/images/custom/` -* `app/views/custom/` -* `app/controllers/custom/` -* `app/models/custom/` - -Also these are the files where you can apply some customization: - -* `app/assets/stylesheets/custom.css` -* `app/assets/stylesheets/_custom_settings.css` -* `app/assets/javascripts/custom.js` -* `Gemfile_custom` -* `config/application.custom.rb` - -### Internationalization - -If you want to add a new language translation of the user-facing texts you can find them organized in YML files under `config/locales/` folder. Take a look at the official Ruby on Rails [internationalization guide](http://guides.rubyonrails.org/i18n.html) to better understand the translations system. - -If you just want to change some of the existing texts, you can just drop your changes at the `config/locales/custom/` folder, we strongly recommend to include only those text that you want to change instead of a whole copy of the original file. For example if you want to customize the text "Ayuntamiento de Madrid, 2016" that appears on every page's footer, firstly you want to locate where it's used (`app/views/layouts/_footer.html.erb`), we can see code is: - -```ruby -<%= t("layouts.footer.copyright", year: Time.current.year) %> -``` - -And that the text its located at the file `config/locales/es/general.yml` following this structure (we're only displaying in the following snippet the relevant parts): - -```yml -es: - layouts: - footer: - copyright: Ayuntamiento de Madrid, %{year} - -``` - -So in order to customize it, we would create a new file `config/locales/custom/es/general.yml` with just that content, and change "Ayuntamiento de Madrid" for our organization name. We strongly recommend to make copies from `config/locales/` and modify or delete the lines as needed to keep the indentation structure and avoid issues. - -### Images - -If you want to overwrite any image, firstly you need to findout the filename, and by defaul it will be located under `app/assets/images`. For example if you want to change the header logo (`app/assets/images/logo_header.png`) you must create another file with the exact same file name under `app/assets/images/custom` folder. The images and icons that you will most likely want to change are: - -* apple-touch-icon-200.png -* icon_home.png -* logo_email.png -* logo_header.png -* map.jpg -* social_media_icon.png -* social_media_icon_twitter.png - -### Views (HTML) - -If you want to change any page HTML you can just find the correct file under the `app/views` folder and put a copy at `app/views/custom` keeping as well any sub-folder structure, and then apply your customizations. For example if you want to customize `app/views/pages/conditions.html` you'll have to make a copy at `app/views/custom/pages/conditions.html.erb` (note the `pages` subdirectory). - -### CSS - -In order to make changes to any CSS selector (custom style sheets), you can add them directly at `app/assets/stylesheets/custom.scss`. For example to change the header color (`.top-links`) you can just add: - -```css -.top-links { - background: red; -} -``` - -If you want to change any [foundation](http://foundation.zurb.com/) variable, you can do it at the `app/assets/stylesheets/_custom_settings.scss` file. For example to change the main application color just add: - -```css -$brand: #446336; -``` - -We use [SASS, with SCSS syntax](http://sass-lang.com/guide) as CSS preprocessor. - -### Javascript - -If you want to add some custom Javascript code, `app/assets/javascripts/custom.js` is the file to do it. For example to create a new alert just add: - -```js -$(function(){ - alert('foobar'); -}); -``` - -### Models - -If you need to create new models or customize existent ones, you can do it so at the `app/models/custom` folder. Keep in mind that for old models you'll need to firstly require the dependency. - -For example for Madrid's City Hall fork its required to check the zip code's format (it always starts with 280 followed by 2 digits). That check is at `app/models/custom/verification/residence.rb`: - -```ruby -require_dependency Rails.root.join('app', 'models', 'verification', 'residence').to_s - -class Verification::Residence - - validate :postal_code_in_madrid - validate :residence_in_madrid - - def postal_code_in_madrid - errors.add(:postal_code, I18n.t('verification.residence.new.error_not_allowed_postal_code')) unless valid_postal_code? - end - - def residence_in_madrid - return if errors.any? - - unless residency_valid? - errors.add(:residence_in_madrid, false) - store_failed_attempt - Lock.increase_tries(user) - end - end - - private - - def valid_postal_code? - postal_code =~ /^280/ - end - -end -``` - -Do not forget to cover your changes with a test at the `spec/models/custom` folder. Following the example we could create `spec/models/custom/residence_spec.rb`: - -```ruby -require 'rails_helper' - -describe Verification::Residence do - - let(:residence) { build(:verification_residence, document_number: "12345678Z") } - - describe "verification" do - - describe "postal code" do - it "should be valid with postal codes starting with 280" do - residence.postal_code = "28012" - residence.valid? - expect(residence.errors[:postal_code].size).to eq(0) - - residence.postal_code = "28023" - residence.valid? - expect(residence.errors[:postal_code].size).to eq(0) - end - - it "should not be valid with postal codes not starting with 280" do - residence.postal_code = "12345" - residence.valid? - expect(residence.errors[:postal_code].size).to eq(1) - - residence.postal_code = "13280" - residence.valid? - expect(residence.errors[:postal_code].size).to eq(1) - expect(residence.errors[:postal_code]).to include("In order to be verified, you must be registered in the municipality of Madrid.") - end - end - - end - -end -``` - -### Controllers - -TODO! - -### Gemfile - -To add new gems (libraries) you can edit the `Gemfile_custom` file. For example to add [rails-footnotes](https://github.com/josevalim/rails-footnotes) gem you would just add: - -```ruby -gem 'rails-footnotes', '~> 4.0' -``` - -And then just do the classic Ruby on Rails flow `bundle install` and following any gem specific install steps from it's own documentation. - -### application.rb - -If you need to extend or modify the `config/application.rb` just do it at the `config/application_custom.rb` file. For example if you want to change de default language to English, just add: - -```ruby -module Consul - class Application < Rails::Application - config.i18n.default_locale = :en - config.i18n.available_locales = [:en, :es] - end -end -``` - -Remeber that in order to see this changes live you'll need to restart the server. - -### lib/ - -TODO - -### public/ - -TODO - -### Seeds - -TODO - -## Updating - -We recommend you to add CONSUL as remote: - -``` -git remote add consul https://github.com/consul/consul -``` - -And then just grab lastest changes on to a branch of your own repo with: - -``` -git checkout -b consul_update -git pull consul master -``` diff --git a/CUSTOMIZE_ES.md b/CUSTOMIZE_ES.md deleted file mode 100644 index 26204c4e4..000000000 --- a/CUSTOMIZE_ES.md +++ /dev/null @@ -1,221 +0,0 @@ -# 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). - -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 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/` -* `app/views/custom/` -* `app/controllers/custom/` -* `app/models/custom/` - -Aparte de estos directorios también cuentas con ciertos ficheros para: - -* `app/assets/stylesheets/custom.css` -* `app/assets/stylesheets/_custom_settings.css` -* `app/assets/javascripts/custom.js` -* `Gemfile_custom` -* `config/application.custom.rb` - -### Internacionalización - -Si quieres modificar algún texto de la web deberías encontrarlos en los ficheros formato YML disponibles en `config/locales/`. Puedes leer la [guía de internacionalización](http://guides.rubyonrails.org/i18n.html) de Ruby on Rails sobre como funciona este sistema. - -Las adaptaciones los debes poner en el directorio `config/locales/custom/`, recomendamos poner solo los textos que quieras personalizar. Por ejemplo si quieres personalizar el texto de "Ayuntamiento de Madrid, 2016" que se encuentra en el footer en todas las páginas, primero debemos ubicar en que plantilla se encuentra (`app/views/layouts/_footer.html.erb`), vemos que en el código pone lo siguiente: - -```ruby -<%= t("layouts.footer.copyright", year: Time.current.year) %> -``` - -Y que en el fichero `config/locales/es/general.yml` sigue esta estructura (solo ponemos lo relevante para este caso): - -```yml -es: - layouts: - footer: - copyright: Ayuntamiento de Madrid, %{year} - -``` - -Si creamos el fichero `config/locales/custom/es/general.yml` y modificamos "Ayuntamiento de Madrid" por el nombre de la organización que se este haciendo la modificación. Recomendamos directamente copiar los ficheros `config/locales/` e ir revisando y corrigiendo las que querramos, borrando las líneas que no querramos traducir. - -### Imágenes - -Si quieres sobreescribir alguna imagen debes primero fijarte el nombre que tiene, por defecto se encuentran en `app/assets/images`. Por ejemplo si quieres modificar `app/assets/images/logo_header.png` debes poner otra con ese mismo nombre en el directorio `app/assets/images/custom`. Los iconos que seguramente quieras modificar son: - -* apple-touch-icon-200.png -* icon_home.png -* logo_email.png -* logo_header.png -* map.jpg -* social_media_icon.png -* social_media_icon_twitter.png - -### Vistas (HTML) - -Si quieres modificar el HTML de alguna página puedes hacerlo copiando el HTML de `app/views` y poniendolo en `app/views/custom` respetando los subdirectorios que encuentres ahí. Por ejemplo si quieres modificar `app/views/pages/conditions.html` debes copiarlo y modificarla en `app/views/custom/pages/conditions.html.erb` - -### CSS - -Si quieres cambiar algun selector CSS (de las hojas de estilo) puedes hacerlo en el fichero `app/assets/stylesheets/custom.scss`. Por ejemplo si quieres cambiar el color del header (`.top-links`) puedes hacerlo agregando: - -```css -.top-links { - background: red; -} -``` - -Si quieres cambiar alguna variable de [foundation](http://foundation.zurb.com/) puedes hacerlo en el fichero `app/assets/stylesheets/_custom_settings.scss`. Por ejemplo para cambiar el color general de la aplicación puedes hacerlo agregando: - -```css -$brand: #446336; -``` - -Usamos un preprocesador de CSS, [SASS, con la sintaxis SCSS](http://sass-lang.com/guide). - -### Javascript - -Si quieres agregar código Javascript puedes hacerlo en el fichero `app/assets/javascripts/custom.js`. Por ejemplo si quieres que salga una alerta puedes poner lo siguiente: - -```js -$(function(){ - alert('foobar'); -}); -``` - -### Modelos - -Si quieres agregar modelos nuevos, o modificar o agregar métodos a uno ya existente puedes hacerlo en `app/models/custom`. En el caso de los modelos antiguos debes primero hacer un require de la dependencia. - -Por ejemplo en el caso del Ayuntamiento de Madrid se requiere comprobar que el código postal durante la verificación sigue un cierto formato (empieza con 280). Esto se realiza creando este fichero en `app/models/custom/verification/residence.rb`: - -```ruby -require_dependency Rails.root.join('app', 'models', 'verification', 'residence').to_s - -class Verification::Residence - - validate :postal_code_in_madrid - validate :residence_in_madrid - - def postal_code_in_madrid - errors.add(:postal_code, I18n.t('verification.residence.new.error_not_allowed_postal_code')) unless valid_postal_code? - end - - def residence_in_madrid - return if errors.any? - - unless residency_valid? - errors.add(:residence_in_madrid, false) - store_failed_attempt - Lock.increase_tries(user) - end - end - - private - - def valid_postal_code? - postal_code =~ /^280/ - end - -end -``` - -No olvides poner los tests relevantes en `spec/models/custom`, siguiendo con el ejemplo pondriamos lo siguiente en `spec/models/custom/residence_spec.rb`: - -```ruby -require 'rails_helper' - -describe Verification::Residence do - - let(:residence) { build(:verification_residence, document_number: "12345678Z") } - - describe "verification" do - - describe "postal code" do - it "should be valid with postal codes starting with 280" do - residence.postal_code = "28012" - residence.valid? - expect(residence.errors[:postal_code].size).to eq(0) - - residence.postal_code = "28023" - residence.valid? - expect(residence.errors[:postal_code].size).to eq(0) - end - - it "should not be valid with postal codes not starting with 280" do - residence.postal_code = "12345" - residence.valid? - expect(residence.errors[:postal_code].size).to eq(1) - - residence.postal_code = "13280" - residence.valid? - expect(residence.errors[:postal_code].size).to eq(1) - expect(residence.errors[:postal_code]).to include("In order to be verified, you must be registered in the municipality of Madrid.") - end - end - - end - -end -``` - -### Controladores - -TODO - -### Gemfile - -Para agregar librerías (gems) nuevas puedes hacerlo en el fichero `Gemfile_custom`. Por ejemplo si quieres agregar la gema [rails-footnotes](https://github.com/josevalim/rails-footnotes) debes hacerlo agregandole - -```ruby -gem 'rails-footnotes', '~> 4.0' -``` - -Y siguiendo el flujo clásico en Ruby on Rails (`bundle install` y seguir con los pasos específicos de la gema en la documentación) - -### application.rb - -Cuando necesites extender o modificar el `config/application.rb` puedes hacerlo a través del fichero `config/application_custom.rb`. Por ejemplo si quieres modificar el idioma por defecto al inglés pondrías lo siguiente: - -```ruby -module Consul - class Application < Rails::Application - config.i18n.default_locale = :en - config.i18n.available_locales = [:en, :es] - end -end -``` - -Recuerda que para ver reflejado estos cambios debes reiniciar el servidor de desarrollo. - -### lib/ - -TODO - -### public/ - -TODO - -### Seeds - -TODO - -## Actualizar - -Te recomendamos que agregues el remote de CONSUL para facilitar este proceso de merge: - -``` -git remote add consul https://github.com/consul/consul -``` - -Con esto puedes actualizarte con - -``` -git checkout -b consul_update -git pull consul master -``` diff --git a/README.md b/README.md index 6b8eed086..48f6bfcb8 100644 --- a/README.md +++ b/README.md @@ -23,25 +23,20 @@ This is the opensource code repository of the eParticipation website CONSUL, ori Development started on [2015 July 15th](https://github.com/consul/consul/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6). Code was deployed to production on 2015 september 7th to [decide.madrid.es](https://decide.madrid.es). Since then new features are added often. You can take a look at the current features in [features]( http://www.decide.es/en/) or [docs](https://github.com/consul/consul/tree/master/doc) and future features in the [open issues list](https://github.com/consul/consul/issues). For current status on upcoming features go to [Roadmap](https://github.com/consul/consul/projects/6) -## Tech stack - -The application backend is written in the [Ruby language](https://www.ruby-lang.org/) using the [Ruby on Rails](http://rubyonrails.org/) framework. - -Frontend tools used include [SCSS](http://sass-lang.com/) over [Foundation](http://foundation.zurb.com/) for the styles. - ## Configuration for development and test environments -**NOTE**: For more detailed instructions check the [docs](https://github.com/consul/consul/tree/master/doc/en/dev_test_setup.md) +**NOTE**: For more detailed instructions check the [docs](https://github.com/consul/docs/tree/master/en/getting_started/prerequisites) Prerequisites: install git, Ruby 2.3.2, bundler gem, and PostgreSQL (>=9.4). -``` +```bash git clone https://github.com/consul/consul.git cd consul bundle install cp config/database.yml.example config/database.yml cp config/secrets.yml.example config/secrets.yml -bin/rake db:setup +bin/rake db:create +bin/rake db:migrate bin/rake db:dev_seed RAILS_ENV=test rake db:setup ``` @@ -60,20 +55,6 @@ Run the tests with: bin/rspec ``` -If you add SCSS code you can check it with: - -``` -scss-lint -``` - -To maintain accesibility level, if you add new colors use a [Color contrast checker](http://webaim.org/resources/contrastchecker/) (WCAG AA is mandatory, WCAG AAA is recommended) - -If you work on Coffeescript code you can check it with [coffeelint](http://www.coffeelint.org/) (install with `npm install -g coffeelint`) : - -``` -coffeelint . -``` - You can use the default admin user from the seeds file: **user:** admin@consul.dev @@ -84,18 +65,9 @@ But for some actions like voting, you will need a verified user, the seeds file **user:** verified@consul.dev **pass:** 12345678 -### Customization +## Documentation -Read more on documentation: - -* English: [CUSTOMIZE_EN.md](CUSTOMIZE_EN.md) -* Spanish: [CUSTOMIZE_ES.md](CUSTOMIZE_ES.md) - -### OAuth - -To test authentication services with external OAuth suppliers - right now Twitter, Facebook and Google - you'll need to create an "application" in each of the supported platforms and set the *key* and *secret* provided in your *secrets.yml* - -In the case of Google, verify that the APIs *Contacts API* and *Google+ API* are enabled for the application. +Please check the ongoing documentation at https://consul_docs.gitbooks.io/docs/content/ to learn more about how to start your own CONSUL fork, install it, customize it and learn to use it from an administrator/maintainer perspective. You can contribute to it at https://github.com/consul/docs ## License @@ -104,7 +76,3 @@ 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 155ab957f..b22312e29 100644 --- a/README_ES.md +++ b/README_ES.md @@ -23,14 +23,9 @@ Este es el repositorio de código abierto de la Aplicación de Participación Ci El desarrollo de esta aplicación comenzó el [15 de Julio de 2015](https://github.com/consul/consul/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6) y el código fue puesto en producción el día 7 de Septiembre de 2015 en [decide.madrid.es](https://decide.madrid.es). Desde entonces se le añaden mejoras y funcionalidades constantemente. Las funcionalidades actuales se pueden consultar en [características](http://www.decide.es/es/) o en la [documentación](https://github.com/consul/consul/tree/master/doc) y las siguientes funcionaliades en la lista de [tareas por hacer](https://github.com/consul/consul/issues). Para conocer el estado actual de las próximas caracteristicas, vaya a [Roadmap](https://github.com/consul/consul/projects/6) -## Tecnología - -El backend de esta aplicación se desarrolla con el lenguaje de programación [Ruby](https://www.ruby-lang.org/) sobre el *framework* [Ruby on Rails](http://rubyonrails.org/). -Las herramientas utilizadas para el frontend no están cerradas aún. Los estilos de la página usan [SCSS](http://sass-lang.com/) sobre [Foundation](http://foundation.zurb.com/) - ## Configuración para desarrollo y tests -**NOTA**: para unas instrucciones más detalladas consulta la [documentación](https://github.com/consul/consul/tree/master/doc/es/dev_test_setup.md) +**NOTA**: para unas instrucciones más detalladas consulta la [documentación](https://github.com/consul/docs/tree/master/es/getting_started/prerequisites) Prerequisitos: tener instalado git, Ruby 2.3.2, la gema `bundler` y PostgreSQL (9.4 o superior). @@ -41,7 +36,8 @@ cd consul bundle install cp config/database.yml.example config/database.yml cp config/secrets.yml.example config/secrets.yml -bin/rake db:setup +bin/rake db:create +bin/rake db:migrate bin/rake db:dev_seed RAILS_ENV=test rake db:setup ``` @@ -60,20 +56,6 @@ Para ejecutar los tests: bin/rspec ``` -Si añades código SCSS puedes revisarlo con: - -``` -scss-lint -``` - -Para mantener el nivel de accesibilidad, si añades colores nuevos utiliza un [Comprobador de contraste de color](http://webaim.org/resources/contrastchecker/) (WCAG AA es obligatorio, WCAG AAA es recomendable) - -Si trabajas en código coffeescript puedes revisarlo con [coffeelint](http://www.coffeelint.org/) (instalalo con `npm install -g coffeelint`) : - -``` -coffeelint . -``` - Puedes usar el usuario administrador por defecto del fichero seeds: **user:** admin@consul.dev @@ -84,15 +66,9 @@ Pero para ciertas acciones, como apoyar, necesitarás un usuario verificado, el **user:** verified@consul.dev **pass:** 12345678 -### Customización +## Documentación -Ver fichero [CUSTOMIZE_ES.md](CUSTOMIZE_ES.md) - -### OAuth - -Para probar los servicios de autenticación mediante proveedores externos OAuth — en este momento Twitter, Facebook y Google —, necesitas crear una "aplicación" en cada una de las plataformas soportadas y configurar la *key* y el *secret* proporcionados en tu *secrets.yml* - -En el caso de Google, comprueba que las APIs *Contacts API* y *Google+ API* están habilitadas para la aplicación. +Por favor visita la documentación que está siendo completada en https://consul_docs.gitbooks.io/docs/content/ para conocer más sobre este proyecto, como comenzar tu propio fork, instalarlo, customizarlo y usarlo como administrador/mantenedor. Puedes colaborar en ella en https://github.com/consul/docs ## Licencia @@ -101,7 +77,3 @@ 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/javascripts/comments.js.coffee b/app/assets/javascripts/comments.js.coffee index fefe85544..94845ca78 100644 --- a/app/assets/javascripts/comments.js.coffee +++ b/app/assets/javascripts/comments.js.coffee @@ -5,6 +5,8 @@ App.Comments = this.update_comments_count() add_reply: (parent_id, response_html) -> + if $("##{parent_id} .comment-children").length == 0 + $("##{parent_id}").append("
    • ") $("##{parent_id} .comment-children:first").prepend($(response_html)) this.update_comments_count() diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index cf07f35ca..7e41026f1 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -205,7 +205,7 @@ a { .menu.simple { border-bottom: 1px solid $border; - margin: $line-height 0; + margin-bottom: $line-height; li { padding-bottom: rem-calc(7); diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 3c37e9657..84e80f01f 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -896,9 +896,14 @@ } .help-header { + background: #fafafa; + border-bottom: 1px solid #eee; + padding-bottom: $line-height / 2; + padding-top: $line-height; h1 { font-size: rem-calc(24); + text-transform: uppercase; } } diff --git a/app/helpers/embed_videos_helper.rb b/app/helpers/embed_videos_helper.rb index 1034a7a59..f1750bf8b 100644 --- a/app/helpers/embed_videos_helper.rb +++ b/app/helpers/embed_videos_helper.rb @@ -1,5 +1,8 @@ module EmbedVideosHelper + VIMEO_REGEX = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/ + YOUTUBE_REGEX = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/ + def embedded_video_code link = @proposal.video_url title = t('proposals.show.embed_video_title', proposal: @proposal.title) @@ -10,10 +13,10 @@ module EmbedVideosHelper end if server == "Vimeo" - reg_exp = /vimeo.*(staffpicks\/|channels\/|videos\/|video\/|\/)([^#\&\?]*).*/ + reg_exp = VIMEO_REGEX src = "https://player.vimeo.com/video/" elsif server == "YouTube" - reg_exp = /youtu.*(be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/ + reg_exp = YOUTUBE_REGEX src = "https://www.youtube.com/embed/" end @@ -28,4 +31,11 @@ module EmbedVideosHelper end end -end \ No newline at end of file + def valid_video_url? + return if video_url.blank? + return if video_url.match(VIMEO_REGEX) + return if video_url.match(YOUTUBE_REGEX) + errors.add(:video_url, :invalid) + end + +end diff --git a/app/models/proposal.rb b/app/models/proposal.rb index 4ee4f851e..f9eeecc6f 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -15,6 +15,7 @@ class Proposal < ActiveRecord::Base max_file_size: 3.megabytes, accepted_content_types: [ "application/pdf" ] accepts_nested_attributes_for :documents, allow_destroy: true + include EmbedVideosHelper acts_as_votable acts_as_paranoid column: :hidden_at @@ -41,6 +42,8 @@ class Proposal < ActiveRecord::Base validates :terms_of_service, acceptance: { allow_nil: false }, on: :create + validate :valid_video_url? + before_validation :set_responsible_name before_save :calculate_hot_score, :calculate_confidence_score diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb index 494568706..8cde29bc7 100644 --- a/app/views/budgets/index.html.erb +++ b/app/views/budgets/index.html.erb @@ -32,6 +32,7 @@

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

    +

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

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

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

    <%= t("budgets.index.section_footer.help_text_3", diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index c22e7aa19..0000f8cc0 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -93,6 +93,7 @@ <% end %> + <% unless child_comments_of(comment).empty? %>

    • + <% end %> <% end %> diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb index 28a5a69bd..01442c3e4 100644 --- a/app/views/debates/index.html.erb +++ b/app/views/debates/index.html.erb @@ -62,6 +62,7 @@

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

    +

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

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

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

    diff --git a/app/views/legislation/processes/index.html.erb b/app/views/legislation/processes/index.html.erb index 063e4048f..7630d29ac 100644 --- a/app/views/legislation/processes/index.html.erb +++ b/app/views/legislation/processes/index.html.erb @@ -23,6 +23,7 @@

    <%= t("legislation.processes.index.section_footer.title") %>

    +

    <%= t("legislation.processes.index.section_footer.description") %>

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

    <%= t("legislation.processes.index.section_footer.help_text_2", org: setting['org_name']) %>

    diff --git a/app/views/polls/index.html.erb b/app/views/polls/index.html.erb index a0673ada6..871b04953 100644 --- a/app/views/polls/index.html.erb +++ b/app/views/polls/index.html.erb @@ -27,6 +27,7 @@

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

    +

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

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

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

    diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index 69a8df4a3..a2b2901ba 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -76,6 +76,7 @@

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

    +

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

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

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

    diff --git a/app/views/shared/_section_header.html.erb b/app/views/shared/_section_header.html.erb index ca0476bb9..9408b663e 100644 --- a/app/views/shared/_section_header.html.erb +++ b/app/views/shared/_section_header.html.erb @@ -1,12 +1,9 @@ -
    +
    -
    +
    <%= image_tag "help/help_icon_#{image}.png", alt: t("#{i18n_namespace}.icon_alt"), class: "align-top" %>

    <%= t("#{i18n_namespace}.title") %>

    -

    - <%= t("#{i18n_namespace}.description") %>
    - <%= link_to t("#{i18n_namespace}.help"), "#section_help" %> -

    + <%= link_to t("#{i18n_namespace}.help"), "#section_help", class: "float-right" %>
    diff --git a/config/locales/en/budgets.yml b/config/locales/en/budgets.yml index 59406499f..c1879df16 100644 --- a/config/locales/en/budgets.yml +++ b/config/locales/en/budgets.yml @@ -41,10 +41,10 @@ en: 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 + description: With the participatory budgets the citizens decide to which projects presented by the neighbors is destined a part of the municipal budget. 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." diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 321887388..47a0b0a06 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -122,10 +122,10 @@ en: 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 + description: Start a debate to share opinions with others about the topics you are concerned about. 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." @@ -369,10 +369,10 @@ en: 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 + 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_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." @@ -461,10 +461,10 @@ en: 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 + description: Sign up to vote on citizen proposals and questions the City Council ask to the neighbors. Make municipal decisions directly. 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: diff --git a/config/locales/en/legislation.yml b/config/locales/en/legislation.yml index 7c3b4a236..37f9c02aa 100644 --- a/config/locales/en/legislation.yml +++ b/config/locales/en/legislation.yml @@ -66,10 +66,10 @@ en: 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 + 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_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." diff --git a/config/locales/es/budgets.yml b/config/locales/es/budgets.yml index cc6b27e2f..78b81fbd3 100644 --- a/config/locales/es/budgets.yml +++ b/config/locales/es/budgets.yml @@ -41,10 +41,10 @@ es: section_header: icon_alt: Icono de Presupuestos participativos title: Presupuestos participativos - description: Con los presupuestos participativos la ciudadanía decide a qué proyectos presentados por los vecinos y vecinas va destinada una parte del presupuesto municipal. help: Ayuda sobre presupuestos participativos section_footer: title: Ayuda sobre presupuestos participativos + description: Con los presupuestos participativos la ciudadanía decide a qué proyectos presentados por los vecinos y vecinas va destinada una parte del presupuesto municipal. help_text_1: "Los presupuestos participativos son unos procesos en los que la ciudadanía decide de forma directa en qué se gasta una parte del presupuesto municipal. Cualquier persona empadronada mayor de 16 años puede proponer un proyecto de gasto que se preselecciona en una fase de apoyos ciudadanos." help_text_2: "Los proyectos más votados se evalúan y pasan a una votación final en la que se deciden las actuaciones que llevará a cabo el Ayuntamiento una vez se aprueben los presupuestos municipales del año próximo." help_text_3: "La presentación de proyectos de presupuestos participativos se lleva a cabo desde enero y a lo largo de un periodo de mes y medio, aproximadamente. Para participar y plantear propuestas para toda la ciudad y/ los distritos hay que registrarse en %{org} y verificar la cuenta." diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index c4fd431b9..a73aac8ea 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -122,10 +122,10 @@ es: section_header: icon_alt: Icono de Debates title: Debates - description: Inicia un debate para compartir puntos de vista con otras personas sobre los temas que te preocupan. help: Ayuda sobre los debates section_footer: title: Ayuda sobre los debates + description: Inicia un debate para compartir puntos de vista con otras personas sobre los temas que te preocupan. help_text_1: "El espacio de debates ciudadanos está dirigido a que cualquier persona pueda exponer temas que le preocupan y sobre los que quiera compartir puntos de vista con otras personas." help_text_2: 'Para abrir un debate es necesario registrarse en %{org}. Los usuarios ya registrados también pueden comentar los debates abiertos y valorarlos con los botones de "Estoy de acuerdo" o "No estoy de acuerdo" que se encuentran en cada uno de ellos.' help_text_3: "Ten en cuenta que un debate no activa ningún mecanismo de actuación concreto. Si quieres hacer una %{proposal} para la ciudad o plantear un proyecto de %{budget} cuando se abra la convocatoria, ve a la sección correspondiente." @@ -369,10 +369,10 @@ es: section_header: icon_alt: Icono de Propuestas title: Propuestas - description: Haz una propuesta ciudadana. Si obtiene los apoyos suficientes y pasa a votación, puedes conseguir que todos los habitantes decidan cómo quieren que sea nuestra ciudad. help: Ayuda sobre las propuestas section_footer: title: Ayuda sobre las propuestas + description: Haz una propuesta ciudadana. Si obtiene los apoyos suficientes y pasa a votación, puedes conseguir que todos los habitantes decidan cómo quieren que sea nuestra ciudad. help_text_1: "Las propuestas ciudadanas son una oportunidad para que los vecinos y colectivos decidan directamente cómo quieren que sea su ciudad. Cualquier persona puede hacer una propuesta sobre un tema que le interese o preocupe para que el ayuntamiento la lleve a cabo, después de conseguir los apoyos suficientes y de someterse a votación ciudadana." help_text_2: "Para crear una propuesta hay que registrarse en %{org}. Las propuestas que consigan el apoyo del 1% de la gente en la web, pasan a votación. Para apoyar propuestas es necesario tener una cuenta verificada." help_text_3: "Se convoca una votación ciudadana cuando las propuestas consiguen los apoyos necesarios. Una vez celebrada, si hay más gente a favor que en contra, el Consistorio asume la propuesta y la lleva a cabo." @@ -461,10 +461,10 @@ es: section_header: icon_alt: Icono de Votaciones title: Votaciones - description: Regístrate para poder votar propuestas ciudadanas y las cuestiones que pregunta a sus vecinos el Ayuntamiento. Toma decisiones municipales de forma directa. help: Ayuda sobre las votaciones section_footer: title: Ayuda sobre las votaciones + description: Regístrate para poder votar propuestas ciudadanas y las cuestiones que pregunta a sus vecinos el Ayuntamiento. Toma decisiones municipales de forma directa. help_text_1: "Las votaciones se convocan cuando una propuesta ciudadana alcanza el 1% de apoyos del censo con derecho a voto. En las votaciones también se pueden incluir cuestiones que el Ayuntamiento somete a decisión directa de la ciudadanía." help_text_2: "Para participar en la próxima votación tienes que registrarte en %{org} y verificar tu cuenta. Pueden votar todas las personas empadronadas en la ciudad mayores de 16 años. Los resultados de todas las votaciones serán vinculantes para el gobierno." show: diff --git a/config/locales/es/legislation.yml b/config/locales/es/legislation.yml index 454422046..4d2a72cf5 100644 --- a/config/locales/es/legislation.yml +++ b/config/locales/es/legislation.yml @@ -66,10 +66,10 @@ es: section_header: icon_alt: Icono de Procesos legislativos title: Procesos legislativos - description: Participa en los debates y procesos previos a la aprobación de una norma o de una actuación municipal. Tu opinión será tenida en cuenta por el Ayuntamiento. help: Ayuda sobre procesos legislativos section_footer: title: Ayuda sobre procesos legislativos + description: Participa en los debates y procesos previos a la aprobación de una norma o de una actuación municipal. Tu opinión será tenida en cuenta por el Ayuntamiento. help_text_1: "En los procesos participativos, el Ayuntamiento ofrece a la ciudadanía la oportunidad de participar en la elaboración y modificación de normativa que afecta a la ciudad y de dar su opinión sobre ciertas actuaciones que tiene previsto llevar a cabo." help_text_2: "Las personas registradas en %{org} pueden participar con aportaciones en la consulta pública de nuevas ordenanzas, reglamentos y directrices, entre otros. Sus comentarios son analizados por el área correspondiente y tenidos en cuenta de cara a la redacción final de las normas." help_text_3: "El Ayuntamiento también abre procesos para recibir aportaciones y opiniones sobre actuaciones municipales." diff --git a/db/migrate/20170914154743_fix_password_changed_at_default.rb b/db/migrate/20170914154743_fix_password_changed_at_default.rb new file mode 100644 index 000000000..dd3eb9aea --- /dev/null +++ b/db/migrate/20170914154743_fix_password_changed_at_default.rb @@ -0,0 +1,10 @@ +class FixPasswordChangedAtDefault < ActiveRecord::Migration + def up + change_column_default :users, :password_changed_at, Time.new(2015, 1, 1, 1, 1, 1) + end + + def down + change_column_default :users, :password_changed_at, Time.now + end + +end diff --git a/db/schema.rb b/db/schema.rb index 0b3c30a99..9ad55610c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170908175149) do +ActiveRecord::Schema.define(version: 20170914154743) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -974,7 +974,7 @@ ActiveRecord::Schema.define(version: 20170908175149) do t.boolean "email_digest", default: true t.boolean "email_on_direct_message", default: true t.boolean "official_position_badge", default: false - t.datetime "password_changed_at", default: '2017-06-22 11:21:30', null: false + t.datetime "password_changed_at", default: '2015-01-01 00:01:01', null: false t.boolean "created_from_signature", default: false t.integer "failed_email_digests_count", default: 0 t.text "former_users_data_log", default: "" diff --git a/doc/en/dev_test_setup.md b/doc/en/dev_test_setup.md deleted file mode 100644 index d5fa28fe0..000000000 --- a/doc/en/dev_test_setup.md +++ /dev/null @@ -1,11 +0,0 @@ -# Configuration for development and test environments (Mac OS X) - -## Linux - -See [here](dev_test_setup_linux.md) - -## Mac OS X - -See [here](dev_test_setup_osx.md) - -## Windows diff --git a/doc/en/dev_test_setup_linux.md b/doc/en/dev_test_setup_linux.md deleted file mode 100644 index d9e7ad84f..000000000 --- a/doc/en/dev_test_setup_linux.md +++ /dev/null @@ -1,146 +0,0 @@ -# Configuration for development and test environments (GNU/Linux) - -## Git - -Git is officially maintained in Debian/Ubuntu: - -``` -sudo apt-get install git -``` - -## Ruby - -Ruby versions packaged in official repositories are not suitable to work with consul (at least Debian 7 and 8), so we'll have to install it manually. - -The preferred method is via rvm: - -(only the multi user option installs all dependencies automatically, as we use 'sudo'.) - -### As local user - -``` -curl -L https://get.rvm.io | bash -s stable -``` - -### For all system users - -``` -curl -L https://get.rvm.io | sudo bash -s stable -``` - -and then add your user to rvm group - -``` -sudo usermod -a -G rvm -``` - -and finally, add rvm script source to user's bash (~/.bashrc) (this step it's only necessary if you still can't execute rvm command) - -``` -[[ -s /usr/local/rvm/scripts/rvm ]] && source /usr/local/rvm/scripts/rvm -``` - -with all this, you are suppose to be able to install a ruby version from rvm, as for example version 2.3.0: - -``` -sudo rvm install 2.3.0 -``` - -## Bundler - -with - -``` -gem install bundler -``` - -or there is more methods [here](https://rvm.io/integration/bundler) that should be better as: - -``` -gem install rubygems-bundler -``` - -## PostgreSQL (>=9.4) - -PostgreSQL version 9.4 is not official in debian 7 (wheezy), in 8 it seems to be officially maintained. - -So you have to add a repository, the official postgresql works fine. - -Add the repository to apt, for example creating file */etc/apt/sources.list.d/pgdg.list* with: - -``` -deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main -``` - -afterwards you'll have to download the key, and install it, by: - -``` -wget https://www.postgresql.org/media/keys/ACCC4CF8.asc -apt-key add ACCC4CF8.asc -``` - -and install postgresql - -``` -apt-get update -apt-get install postgresql-9.4 -``` - -Besides, you will also need the dev libraries and headers so that pg gem can be compiled when running `bundle install`. Also, you will need the postgresql postGIS scripts. You can install them by running a single command: - -``` -apt-get install postgresql-server-dev-9.4 postgresql-9.4-postgis-scripts -``` - -## Cloning the repository - -Now, with all the dependencies installed, clone the CONSUL repository: - -``` -git clone https://github.com/consul/consul.git -cd consul -bundle install -cp config/database.yml.example config/database.yml -cp config/secrets.yml.example config/secrets.yml -``` - -Perhaps it's needed to create a superuser rol with password in postgresql, and write it in */config/database.yml* 'user:' and 'password:' fields. - -Also, it seems that postgresql use as default an unix socket for localhost communications. If we encounter problems creating database (connection problems) we can change in */config/database.yml* the line: - -``` -host: localhost -``` - -for: - -``` -host: /var/run/postgresql -``` - -After this: - -``` -rake db:create -rake db:setup -rake db:dev_seed -RAILS_ENV=test bin/rake db:setup -``` - -If you get the following error message when running `rake db:create`: - -``` -PG::InvalidParameterValue: ERROR: new encoding (UTF8) is incompatible with the encoding of the template database (SQL_ASCII) -HINT: Use the same encoding as in the template database, or use template0 as template. -``` - -you probably have template1 using `SQL_ASCII` encoding instead of `UTF8`, to correct this run the following sequence of commands within the postgresql client to recreate the template1 with `UTF8` encoding: - -``` -UPDATE pg_database SET datistemplate = FALSE WHERE datname = 'template1'; -DROP DATABASE template1; -CREATE DATABASE template1 WITH TEMPLATE = template0 ENCODING = 'UNICODE'; -UPDATE pg_database SET datistemplate = TRUE WHERE datname = 'template1'; -\c template1 -VACUUM FREEZE; -``` diff --git a/doc/en/dev_test_setup_osx.md b/doc/en/dev_test_setup_osx.md deleted file mode 100644 index 82f6f430e..000000000 --- a/doc/en/dev_test_setup_osx.md +++ /dev/null @@ -1,128 +0,0 @@ -# Configuration for development and test environments (Mac OS X) - -## Homebrew - -Homebrew is a very popular package manager for OS X. It's advised to use it since it makes the installation of some of the dependencies much easier. - -You can find the installation instructions at: [brew.sh](http://brew.sh) - -## XCode and XCode Command Line Tools - -To install *git* you'll first need to install *Xcode* (download it from the Mac App Store) and its *Xcode Command Line Tools* (you can install them from the Xcode's app menu) - -## Git - -You can download git from: [git-scm.com/download/mac](https://git-scm.com/download/mac) - -## Ruby y rbenv - -OS X already comes with a preinstalled Ruby version, but it's quite old and we need a newer one (2.3.2). One of the multiple ways of installing Ruby in OS X is through *rbenv*. The installation instructions are in its GitHub repository and are pretty straight-forward: - -[github.com/rbenv/rbenv](https://github.com/rbenv/rbenv) - -## Bundler - -``` -gem install bundler -``` - -## PostgreSQL (>=9.4) - -``` -brew install postgres -``` - -Once installed, we need to *initialize* it: - -``` -initdb /usr/local/var/postgres -``` - -Now we're going to configure some things related to the *default user*. First we start postgres server with: - -``` -postgres -D /usr/local/var/postgres -``` - -At this point we're supposed to have postgres correctly installed and a default user will automatically be created (whose name will match our username). This user hasn't got a password yet. - -If we run `psql` we'll login into the postgres console with the default user. Probably it will fail since its required that a default database exists for that user. We can create it by typing: - -``` -createdb 'your_username' -``` - -If we run `psql` again we should now get access to postgres console. With `\du` you can see the current users list. - -In case you want to set a password for your user you can make it throught postgres console by: - -``` -ALTER USER your_username WITH PASSWORD 'your_password'; -``` - -Now we'll create the *consul* user, the one the application is using. Run in postgres console: - -``` -CREATE ROLE consul WITH PASSWORD '000'; -ALTER ROLE consul WITH SUPERUSER; -ALTER ROLE consul WITH login; -``` - -If at any point during PostgreSQL installation you feel you have messed things up, you can uninstall it and start again by running: - -``` -brew uninstall postgres -``` - -You'll have to delete also this directory (otherwise the new installation will generate conflicts, source: [gist.github.com/lxneng/741932](https://gist.github.com/lxneng/741932)): - -``` -rm -rf /usr/local/var/postgres -``` - -## Postgis - -``` -brew install postgis -``` - -## PhantomJS - -``` -brew install phantomjs -``` - -## Imagemagick - -``` -brew install imagemagick -``` - -## Cloning the repository - -Now that we have all the dependencies installed we can download the repository: - -``` -git clone https://github.com/consul/consul.git -cd consul -bundle install -cp config/database.yml.example config/database.yml -cp config/secrets.yml.example config/secrets.yml -``` - -Now copy in `database.yml` the database user and password you used for *consul*. - -After this: - -``` -rake db:create -rake db:setup -rake db:dev_seed -RAILS_ENV=test bin/rake db:setup -``` - -To run the tests: - -``` -bundle exec rspec -``` diff --git a/doc/es/dev_test_setup.md b/doc/es/dev_test_setup.md deleted file mode 100644 index cda2613e7..000000000 --- a/doc/es/dev_test_setup.md +++ /dev/null @@ -1,11 +0,0 @@ -# Configuración para los entornos de desarrollo y pruebas - -## Linux - -Consultar [aqui](dev_test_setup_linux.md) - -## Mac OS X - -Consultar [aquí](dev_test_setup_osx.md) - -## Windows diff --git a/doc/es/dev_test_setup_linux.md b/doc/es/dev_test_setup_linux.md deleted file mode 100644 index 6f3b2e47a..000000000 --- a/doc/es/dev_test_setup_linux.md +++ /dev/null @@ -1,141 +0,0 @@ -# Configuración para los entornos de desarrollo y pruebas (GNU/Linux) - -## Git - -Git es mantenido oficialmente en Debian/Ubuntu: - -``` -sudo apt-get install git -``` - -## Ruby - -Las versiones de Ruby versions empaquetadas en repositorios oficiales no son aptas para trabajar con consul (al menos Debian 7 y 8), así que debemos instalar manualmente. - -El método recomendado es via rvm: - -(sólo la opción multiusuario instala todas las dependencias automáticamente, al usar 'sudo'.) - -### Como usuario local - -``` -curl -L https://get.rvm.io | bash -s stable -``` - -### Para todos los usuarios del sistema - -``` -curl -L https://get.rvm.io | sudo bash -s stable -``` - -añadismos nuestro usuario al grupo de rvm - -``` -sudo usermod -a -G rvm -``` - -y finalmente, añadimos el script rvm a nuestro bash (~/.bashrc) (este paso sólo es necesario si no puedes ejecutar el comando rvm) - -``` -[[ -s /usr/local/rvm/scripts/rvm ]] && source /usr/local/rvm/scripts/rvm -``` - -con todo esto, deberías poder instalar la versión de ruby con rvm, por ejemplo la 2.3.2: - -``` -sudo rvm install 2.3.2 -``` - -## Bundler - -usando - -``` -gem install bundler -``` - -hay varios métodos alternativos [aquí](https://rvm.io/integration/bundler) que podrían ser mejores como: - -``` -gem install rubygems-bundler -``` - -## PostgreSQL (>=9.4) - -La versión 9.4 de PostgreSQL no es oficial en Debian 7 (wheezy), pero en Debian 8 parece ser mantenida oficialmente. - -Así que debemos añadir el respositorio oficial de postgresql a apt, por ejemplo creando el fichero */etc/apt/sources.list.d/pgdg.list* con: - -``` -deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main -``` - -después deberás descargar la key e instalarla: - -``` -wget https://www.postgresql.org/media/keys/ACCC4CF8.asc -apt-key add ACCC4CF8.asc -``` - -y finalmente instalar postgresql - -``` -apt-get update -apt-get install postgresql-9.4 -``` - -## Clonar el repositorio - -Ahora que ya tenemos todas las dependencias instalado podemos bajarnos el proyecto: - -``` -git clone https://github.com/consul/consul.git -cd consul -bundle install -cp config/database.yml.example config/database.yml -cp config/secrets.yml.example config/secrets.yml -``` - -Ahora copia en `database.yml` el usuario y la contraseña que pusiste para *consul*. Cuando ya lo hayas hecho: - -``` -rake db:create -rake db:setup -rake db:dev_seed -RAILS_ENV=test bin/rake db:setup -``` - -Para ejecutar los tests: - -``` -bundle exec rspec -``` - -Quizás necesites crear un rol de superusuario en postgresql, y completar en el fichero*/config/database.yml* los campos 'user:' y 'password:'. - -Además, parece que postgresql usa un socket unix por defecto para las comunicaciones en local. Si te encuentras este problema creando la base de datos, cambia en */config/database.yml* la linea: - -``` -host: localhost -``` - -por: - -``` -host: /var/run/postgresql -``` - -Tras esto en el terminal ejecutaremos: - -``` -rake db:create -rake db:setup -rake db:dev_seed -RAILS_ENV=test bin/rake db:setup -``` - -Y por último para comprobar que todo esta bien, lanza los tests: - -``` -bundle exec rspec -``` diff --git a/doc/es/dev_test_setup_osx.md b/doc/es/dev_test_setup_osx.md deleted file mode 100644 index 01cea3923..000000000 --- a/doc/es/dev_test_setup_osx.md +++ /dev/null @@ -1,128 +0,0 @@ -# Configuración para los entornos de desarrollo y pruebas (Mac OS X) - -## Homebrew - -Homebrew es un gestor de paquetes para OS X muy popular. Es recomendable usarlo pues facilita enormemente la instalación de algunos de los paquetes necesarios. - -Puedes encontrar las instrucciones de instalación en: [brew.sh](http://brew.sh) - -## XCode y XCode Command Line Tools - -Para utilizar git necesitarás instalar *Xcode* (está en la Mac App Store) y las *Xcode Command Line Tools* (se instalan desde el menú de Xcode). - -## Git y Github - -Puedes descargar git desde: [git-scm.com/download/mac](https://git-scm.com/download/mac) - -## Ruby y rbenv - -OS X ya viene con una versión preinstalada de ruby, pero es bastante vieja y en nuestro caso no nos sirve. Una de las formas de instalar Ruby es a través de rbenv. Las instrucciones de instalación están en su GitHub y son bastante claras: - -[github.com/rbenv/rbenv](https://github.com/rbenv/rbenv) - -Después instala la versión de Ruby 2.3.2 - -## Bundler - -``` -gem install bundler -``` - -## PostgreSQL (>=9.4) - -``` -brew install postgres -``` - -Una vez instalado es necesario *inicializar* la instalación: - -``` -initdb /usr/local/var/postgres -``` - -Ahora vamos a configurar algunos aspectos del usuario por defecto. Primero iniciamos el servidor de postgres con: - -``` -postgres -D /usr/local/var/postgres -``` - -Llegados a este punto se supone que tenemos postgres correctamente instalado y se nos habrá creado un usuario por defecto (cuyo nombre es nuestro nombre de usuario), y que (todavía) no tiene contraseña. - -Si ejecutamos `psql` accederemos a la consola de postgres con el usuario por defecto. Probablemente fallará porque es necesario que de antemano exista una base de datos por defecto para dicho usuario. Podemos crearla ejecutando sobre la terminal: - -``` -createdb 'tu_nombre_de_usuario' -``` - -Si ahora ejecutamos `psql` de nuevo deberíamos poder acceder correctamente a la consola de postgres. Si sobre la consola de postgres ejecutas `\du` puede ver la lista de usuarios actual. - -En el caso de que quieras asignarte una contraseña puedes hacerlo desde la consola de postgres con: - -``` -ALTER USER tu_nombre_usuario WITH PASSWORD 'tu_contraseña'; -``` - -Ahora vamos a crear el usuario *consul*, que es el que utiliza la aplicación. Ejecuta sobre la consola de postgres: - -``` -CREATE ROLE consul WITH PASSWORD '000'; -ALTER ROLE consul WITH SUPERUSER; -ALTER ROLE consul WITH login; -``` - -Si en algún momento durante la instalación de PostgreSQL y postgis sospechas que te has equivocado y deseas desinstalarlo y volver a empezar desde cero: - -``` -brew uninstall postgres -``` - -También tendrás que borrar el siguiente directorio para que no de conflictos cuando intentes volver a instalarlo (fuente: [gist.github.com/lxneng/741932](https://gist.github.com/lxneng/741932)): - -``` -rm -rf /usr/local/var/postgres -``` - -## Postgis - -``` -brew install postgis -``` - -## PhantomJS - -``` -brew install phantomjs -``` - -## Imagemagick - -``` -brew install imagemagick -``` - -## Clonar el repositorio - -Ahora que ya tenemos todas las dependencias instalado podemos bajarnos el proyecto: - -``` -git clone https://github.com/consul/consul.git -cd consul -bundle install -cp config/database.yml.example config/database.yml -cp config/secrets.yml.example config/secrets.yml -``` - -Ahora copia en `database.yml` el usuario y la contraseña que pusiste para *consul*. Cuando ya lo hayas hecho: - -``` -rake db:create -rake db:setup -rake db:dev_seed -RAILS_ENV=test bin/rake db:setup -``` - -Para ejecutar los tests: - -``` -bundle exec rspec -``` diff --git a/public/consul_brand.zip b/public/consul_brand.zip deleted file mode 100644 index 6664d406f..000000000 Binary files a/public/consul_brand.zip and /dev/null differ diff --git a/spec/factories.rb b/spec/factories.rb index 9cebfddea..9a038816a 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -155,7 +155,7 @@ FactoryGirl.define do description 'Proposal description' question 'Proposal question' external_url 'http://external_documention.es' - video_url 'http://video_link.com' + video_url 'https://youtu.be/nhuNb0XtRhQ' responsible_name 'John Snow' terms_of_service '1' association :author, factory: :user diff --git a/spec/features/comments/budget_investments_spec.rb b/spec/features/comments/budget_investments_spec.rb index 587a1c517..ae8fc935a 100644 --- a/spec/features/comments/budget_investments_spec.rb +++ b/spec/features/comments/budget_investments_spec.rb @@ -33,6 +33,10 @@ feature 'Commenting Budget::Investments' do expect(page).to have_content second_child.body expect(page).to have_link "Go back to #{investment.title}", href: budget_investment_path(investment.budget, investment) + + expect(page).to have_selector("ul#comment_#{parent_comment.id}>li", count: 2) + expect(page).to have_selector("ul#comment_#{first_child.id}>li", count: 1) + expect(page).to have_selector("ul#comment_#{second_child.id}>li", count: 1) end scenario 'Collapsable comments', :js do diff --git a/spec/features/comments/debates_spec.rb b/spec/features/comments/debates_spec.rb index 76320a848..28166784a 100644 --- a/spec/features/comments/debates_spec.rb +++ b/spec/features/comments/debates_spec.rb @@ -33,6 +33,10 @@ feature 'Commenting debates' do expect(page).to have_content second_child.body expect(page).to have_link "Go back to #{debate.title}", href: debate_path(debate) + + expect(page).to have_selector("ul#comment_#{parent_comment.id}>li", count: 2) + expect(page).to have_selector("ul#comment_#{first_child.id}>li", count: 1) + expect(page).to have_selector("ul#comment_#{second_child.id}>li", count: 1) end scenario 'Collapsable comments', :js do diff --git a/spec/features/comments/legislation_annotations_spec.rb b/spec/features/comments/legislation_annotations_spec.rb index 87896df03..aad2b90b2 100644 --- a/spec/features/comments/legislation_annotations_spec.rb +++ b/spec/features/comments/legislation_annotations_spec.rb @@ -38,6 +38,10 @@ feature 'Commenting legislation questions' do expect(page).to have_content second_child.body expect(page).to have_link "Go back to #{legislation_annotation.title}", href: href + + expect(page).to have_selector("ul#comment_#{parent_comment.id}>li", count: 2) + expect(page).to have_selector("ul#comment_#{first_child.id}>li", count: 1) + expect(page).to have_selector("ul#comment_#{second_child.id}>li", count: 1) end scenario 'Collapsable comments', :js do diff --git a/spec/features/comments/legislation_questions_spec.rb b/spec/features/comments/legislation_questions_spec.rb index 50eb60172..d21cefc4e 100644 --- a/spec/features/comments/legislation_questions_spec.rb +++ b/spec/features/comments/legislation_questions_spec.rb @@ -35,6 +35,10 @@ feature 'Commenting legislation questions' do expect(page).to have_content second_child.body expect(page).to have_link "Go back to #{legislation_question.title}", href: href + + expect(page).to have_selector("ul#comment_#{parent_comment.id}>li", count: 2) + expect(page).to have_selector("ul#comment_#{first_child.id}>li", count: 1) + expect(page).to have_selector("ul#comment_#{second_child.id}>li", count: 1) end scenario 'Collapsable comments', :js do diff --git a/spec/features/comments/proposals_spec.rb b/spec/features/comments/proposals_spec.rb index 475e018f3..acba0bec9 100644 --- a/spec/features/comments/proposals_spec.rb +++ b/spec/features/comments/proposals_spec.rb @@ -32,6 +32,10 @@ feature 'Commenting proposals' do expect(page).to have_content first_child.body expect(page).to have_content second_child.body expect(page).to have_link "Go back to #{proposal.title}", href: proposal_path(proposal) + + expect(page).to have_selector("ul#comment_#{parent_comment.id}>li", count: 2) + expect(page).to have_selector("ul#comment_#{first_child.id}>li", count: 1) + expect(page).to have_selector("ul#comment_#{second_child.id}>li", count: 1) end scenario 'Collapsable comments', :js do diff --git a/spec/features/management/proposals_spec.rb b/spec/features/management/proposals_spec.rb index 8f63146e9..349a4f904 100644 --- a/spec/features/management/proposals_spec.rb +++ b/spec/features/management/proposals_spec.rb @@ -26,7 +26,7 @@ feature 'Proposals' do fill_in 'proposal_summary', with: 'In summary, what we want is...' fill_in 'proposal_description', with: 'This is very important because...' fill_in 'proposal_external_url', with: 'http://rescue.org/refugees' - fill_in 'proposal_video_url', with: 'http://youtube.com' + fill_in 'proposal_video_url', with: 'https://www.youtube.com/watch?v=yRYFKcMa_Ek' check 'proposal_terms_of_service' click_button 'Create proposal' @@ -38,7 +38,7 @@ feature 'Proposals' do expect(page).to have_content 'In summary, what we want is...' expect(page).to have_content 'This is very important because...' expect(page).to have_content 'http://rescue.org/refugees' - expect(page).to have_content 'http://youtube.com' + expect(page).to have_content 'https://www.youtube.com/watch?v=yRYFKcMa_Ek' expect(page).to have_content user.name expect(page).to have_content I18n.l(Proposal.last.created_at.to_date) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 0c69eee3e..f9bef400c 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -151,7 +151,7 @@ feature 'Proposals' do fill_in 'proposal_summary', with: 'In summary, what we want is...' fill_in 'proposal_description', with: 'This is very important because...' fill_in 'proposal_external_url', with: 'http://rescue.org/refugees' - fill_in 'proposal_video_url', with: 'http://youtube.com' + fill_in 'proposal_video_url', with: 'https://www.youtube.com/watch?v=yPQfcG-eimk' fill_in 'proposal_responsible_name', with: 'Isabel Garcia' fill_in 'proposal_tag_list', with: 'Refugees, Solidarity' check 'proposal_terms_of_service' @@ -169,7 +169,7 @@ feature 'Proposals' do expect(page).to have_content 'In summary, what we want is...' expect(page).to have_content 'This is very important because...' expect(page).to have_content 'http://rescue.org/refugees' - expect(page).to have_content 'http://youtube.com' + expect(page).to have_content 'https://www.youtube.com/watch?v=yPQfcG-eimk' expect(page).to have_content author.name expect(page).to have_content 'Refugees' expect(page).to have_content 'Solidarity' @@ -187,7 +187,7 @@ feature 'Proposals' do fill_in 'proposal_summary', with: 'In summary, what we want is...' fill_in 'proposal_description', with: 'This is very important because...' fill_in 'proposal_external_url', with: 'http://rescue.org/refugees' - fill_in 'proposal_video_url', with: 'http://youtube.com' + fill_in 'proposal_video_url', with: 'https://www.youtube.com/watch?v=yPQfcG-eimk' fill_in 'proposal_responsible_name', with: 'Isabel Garcia' fill_in 'proposal_tag_list', with: 'Refugees, Solidarity' check 'proposal_terms_of_service' @@ -393,7 +393,7 @@ feature 'Proposals' do fill_in 'proposal_summary', with: 'In summary, what we want is...' fill_in 'proposal_description', with: 'This is very important because...' fill_in 'proposal_external_url', with: 'http://rescue.org/refugees' - fill_in 'proposal_video_url', with: 'http://youtube.com' + fill_in 'proposal_video_url', with: 'https://www.youtube.com/watch?v=yPQfcG-eimk' fill_in 'proposal_responsible_name', with: 'Isabel Garcia' check 'proposal_terms_of_service' @@ -421,7 +421,7 @@ feature 'Proposals' do fill_in 'proposal_summary', with: 'In summary, what we want is...' fill_in 'proposal_description', with: 'This is very important because...' fill_in 'proposal_external_url', with: 'http://rescue.org/refugees' - fill_in 'proposal_video_url', with: 'http://youtube.com' + fill_in 'proposal_video_url', with: 'https://www.youtube.com/watch?v=yPQfcG-eimk' fill_in 'proposal_responsible_name', with: 'Isabel Garcia' check 'proposal_terms_of_service' diff --git a/spec/features/tags/proposals_spec.rb b/spec/features/tags/proposals_spec.rb index cf5017d4f..d2a16b8f7 100644 --- a/spec/features/tags/proposals_spec.rb +++ b/spec/features/tags/proposals_spec.rb @@ -101,7 +101,7 @@ feature 'Tags' do fill_in 'proposal_summary', with: 'In summary, what we want is...' fill_in_ckeditor 'proposal_description', with: 'A description with enough characters' fill_in 'proposal_external_url', with: 'http://rescue.org/refugees' - fill_in 'proposal_video_url', with: 'http://youtube.com' + fill_in 'proposal_video_url', with: 'https://www.youtube.com/watch?v=Ae6gQmhaMn4' fill_in 'proposal_responsible_name', with: 'Isabel Garcia' check 'proposal_terms_of_service' diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb index 5bf6d90e1..83c19edde 100644 --- a/spec/models/proposal_spec.rb +++ b/spec/models/proposal_spec.rb @@ -67,6 +67,18 @@ describe Proposal do end end + describe "#video_url" do + it "should not be valid when URL is not from Youtube or Vimeo" do + proposal.video_url = "https://twitter.com" + expect(proposal).to_not be_valid + end + + it "should be valid when URL is from Youtube or Vimeo" do + proposal.video_url = "https://vimeo.com/112681885" + expect(proposal).to be_valid + end + end + describe "#responsible_name" do it "should be mandatory" do proposal.responsible_name = nil