Consul pull ⬇️

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

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

Gemfile

@@ -33,8 +33,9 @@ gem 'omniauth-facebook', '~> 4.0.0'
 gem 'omniauth-google-oauth2', '~> 0.4.0'
 gem 'omniauth-twitter', '~> 1.4.0'
 gem 'paperclip', '~> 5.1.0'
+gem 'jquery-fileupload-rails'
 gem 'paranoia', '~> 2.3.1'
-gem 'pg', '~> 0.20.0'
+gem 'pg', '~> 0.21.0'
 gem 'pg_search', '~> 2.0.1'
 gem 'rails-assets-markdown-it', '~> 8.2.1', source: 'https://rails-assets.org'
 gem 'redcarpet', '~> 3.4.0'
@@ -71,7 +72,7 @@ end
 group :test do
   gem 'capybara', '~> 2.14.0'
   gem 'coveralls', '~> 0.8.21', require: false
-  gem 'database_cleaner', '~> 1.5.3'
+  gem 'database_cleaner', '~> 1.6.1'
   gem 'email_spec', '~> 2.1.0'
   gem 'poltergeist', '~> 1.15.0'
   gem 'rspec-rails', '~> 3.6'
@@ -84,7 +85,7 @@ group :development do
   gem 'capistrano3-delayed-job', '~> 1.7.3'
   gem 'mdl', '~> 0.4.0', require: false
   gem 'rvm1-capistrano3', '~> 1.4.0', require: false
-  gem 'scss_lint', '~> 0.53.0', require: false
+  gem 'scss_lint', '~> 0.54.0', require: false
   gem 'web-console', '~> 3.3.0'
 end
 

Gemfile.lock

@@ -123,7 +123,7 @@ GEM
       tins (~> 1.6)
     daemons (1.2.4)
     dalli (2.7.6)
-    database_cleaner (1.5.3)
+    database_cleaner (1.6.1)
     debug_inspector (0.0.2)
     delayed_job (4.1.2)
       activesupport (>= 3.0, < 5.1)
@@ -205,6 +205,10 @@ GEM
       railties (>= 3.1, < 6.0)
     invisible_captcha (0.9.2)
       rails (>= 3.2.0)
+    jquery-fileupload-rails (0.4.7)
+      actionpack (>= 3.1)
+      railties (>= 3.1)
+      sass (>= 3.2)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -302,7 +306,7 @@ GEM
       activerecord (>= 4.0, < 5.2)
     parser (2.4.0.0)
       ast (~> 2.2)
-    pg (0.20.0)
+    pg (0.21.0)
     pg_search (2.0.1)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
@@ -406,7 +410,7 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 2.4)
       wasabi (~> 3.4)
-    scss_lint (0.53.0)
+    scss_lint (0.54.0)
       rake (>= 0.9, < 13)
       sass (~> 3.4.20)
     selenium-webdriver (3.0.5)
@@ -511,7 +515,7 @@ DEPENDENCIES
   coveralls (~> 0.8.21)
   daemons (~> 1.2.4)
   dalli (~> 2.7.6)
-  database_cleaner (~> 1.5.3)
+  database_cleaner (~> 1.6.1)
   delayed_job_active_record (~> 4.1.0)
   devise (~> 3.5.7)
   devise-async (~> 0.10.2)
@@ -527,6 +531,7 @@ DEPENDENCIES
   i18n-tasks (~> 0.9.15)
   initialjs-rails (~> 0.2.0.5)
   invisible_captcha (~> 0.9.2)
+  jquery-fileupload-rails
   jquery-rails (~> 4.3.1)
   jquery-ui-rails (~> 6.0.1)
   kaminari (~> 1.0.1)
@@ -541,7 +546,7 @@ DEPENDENCIES
   omniauth-twitter (~> 1.4.0)
   paperclip (~> 5.1.0)
   paranoia (~> 2.3.1)
-  pg (~> 0.20.0)
+  pg (~> 0.21.0)
   pg_search (~> 2.0.1)
   poltergeist (~> 1.15.0)
   quiet_assets (~> 1.1.0)
@@ -557,7 +562,7 @@ DEPENDENCIES
   rvm1-capistrano3 (~> 1.4.0)
   sass-rails (~> 5.0, >= 5.0.4)
   savon (~> 2.11.1)
-  scss_lint (~> 0.53.0)
+  scss_lint (~> 0.54.0)
   selenium-webdriver (~> 3.0.5)
   sitemap_generator (~> 5.3.1)
   social-share-button (~> 0.10)
@@ -573,4 +578,4 @@ DEPENDENCIES
   whenever (~> 0.9.7)
 
 BUNDLED WITH
-   1.15.1
+   1.15.4

README.md

@@ -2,7 +2,7 @@
 
 ![Logo of Consul](https://raw.githubusercontent.com/consul/consul/master/public/consul_logo.png)
 
-# Consul
+# CONSUL
 
 Citizen Participation and Open Government Application
 
@@ -21,7 +21,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
 
@@ -108,3 +108,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.

README_ES.md

@@ -2,7 +2,7 @@
 
 ![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
 
@@ -21,7 +21,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
 
@@ -105,3 +105,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.

app/assets/javascripts/application.js

@@ -15,6 +15,7 @@
 //= require jquery-ui/widgets/datepicker
 //= require jquery-ui/i18n/datepicker-es
 //= require jquery-ui/effects/effect-shake
+//= require jquery-fileupload/basic
 //= require foundation
 //= require turbolinks
 //= require ckeditor/loader
@@ -62,6 +63,7 @@
 //= require legislation_annotatable
 //= require watch_form_changes
 //= require followable
+//= require documentable
 //= require tree_navigator
 //= require custom
 
@@ -97,6 +99,7 @@ var initialize_modules = function() {
     App.LegislationAnnotatable.initialize();
   App.WatchFormChanges.initialize();
   App.TreeNavigator.initialize();
+  App.Documentable.initialize();
 };
 
 $(function(){
@@ -105,4 +108,4 @@ $(function(){
   $(document).ready(initialize_modules);
   $(document).on('page:load', initialize_modules);
   $(document).on('ajax:complete', initialize_modules);
-});
+});

app/assets/javascripts/documentable.js.coffee

@@ -0,0 +1,101 @@
+App.Documentable =
+
+  initialize: ->
+    @initializeDirectUploads()
+    @initializeInterface()
+
+  initializeDirectUploads: ->
+
+    $('input.document_ajax_attachment[type=file]').fileupload
+
+      paramName: "document[attachment]"
+
+      formData: null
+
+      add: (e, data) ->
+        wrapper = $(e.target).closest('.document')
+        index = $(e.target).data('index')
+        is_nested_document = $(e.target).data('nested-document')
+        $(wrapper).find('.progress-bar-placeholder').empty()
+        data.progressBar = $(wrapper).find('.progress-bar-placeholder').html('<div class="progress-bar"><div class="loading-bar uploading"></div></div>')
+        $(wrapper).find('.progress-bar-placeholder').css('display','block')
+        data.formData = {
+          "document[title]": $(wrapper).find('input.document-title').val() || data.files[0].name
+          "index": index,
+          "nested_document": is_nested_document
+        }
+        data.submit()
+
+      change: (e, data) ->
+        wrapper = $(e.target).parent()
+        $.each(data.files, (index, file)->
+          $(wrapper).find('.file-name').text(file.name)
+        )
+
+      progress: (e, data) ->
+        progress = parseInt(data.loaded / data.total * 100, 10)
+        $(data.progressBar).find('.loading-bar').css 'width', progress + '%'
+        return
+
+  initializeInterface: ->
+    input_files = $('input.document_ajax_attachment[type=file]')
+
+    $.each input_files, (index, file) ->
+      wrapper = $(file).parent()
+      App.Documentable.watchRemoveDocumentbutton(wrapper)
+
+  watchRemoveDocumentbutton:  (wrapper) ->
+    remove_document_button = $(wrapper).find('.remove-document')
+    $(remove_document_button).on 'click', (e) ->
+      e.preventDefault()
+      $(wrapper).remove()
+      $('#new_document_link').show()
+      $('.max-documents-notice').hide()
+
+  uploadNestedDocument: (id, nested_document, result) ->
+    $('#' + id).replaceWith(nested_document)
+    @updateLoadingBar(id, result)
+    @initialize()
+
+  uploadPlainDocument: (id, nested_document, result) ->
+    $('#' + id).replaceWith(nested_document)
+    @updateLoadingBar(id, result)
+    @initialize()
+
+  updateLoadingBar: (id, result) ->
+    if result
+      $('#' + id).find('.loading-bar').addClass 'complete'
+    else
+      $('#' + id).find('.loading-bar').addClass 'errors'
+    $('#' + id).find('.progress-bar-placeholder').css('display','block')
+
+  new: (nested_fields) ->
+    $(".documents-list").append(nested_fields)
+    @initialize()
+
+  destroyNestedDocument: (id, notice) ->
+    $('#' + id).remove()
+    @updateNotice(notice)
+
+  replacePlainDocument: (id, notice, plain_document) ->
+    $('#' + id).replaceWith(plain_document)
+    @updateNotice(notice)
+    @initialize()
+
+  updateNotice: (notice) ->
+    if $('[data-alert]').length > 0
+      $('[data-alert]').replaceWith(notice)
+    else
+      $("body").append(notice)
+
+  updateNewDocumentButton: (link) ->
+    if $('.document').length >= $('.documents').data('max-documents')
+      $('#new_document_link').hide()
+      $('.max-documents-notice').removeClass('hide')
+      $('.max-documents-notice').show()
+    else if $('#new_document_link').length > 0
+      $('#new_document_link').replaceWith(link)
+      $('.max-documents-notice').hide()
+    else
+      $('.max-documents-notice').hide()
+      $(link).insertBefore('.documents hr:last')

app/assets/javascripts/embed_video.js.coffee

@@ -1,7 +1,6 @@
 App.EmbedVideo =
-  
+
   initialize: ->
     $('#js-embedded-video').each ->
-      code    = $(this).data("video-code")
+      code = $(this).data("video-code")
       $('#js-embedded-video').html(code)
-

app/assets/stylesheets/application.scss

@@ -10,10 +10,12 @@
 @import 'pages';
 @import 'legislation';
 @import 'legislation_process';
+@import 'community';
 @import 'custom';
 @import 'custom/*';
 @import 'c3';
 @import 'annotator.min';
 @import 'annotator_overrides';
 @import 'jquery-ui/datepicker';
 @import 'datepicker_overrides';
+@import 'documentable';