decidim 0.2.0 → 0.3.0

data/README.md

@@ -20,7 +20,7 @@ Decidim is a participatory democracy framework written on Ruby on Rails original
 [![Code Climate](https://img.shields.io/codeclimate/github/decidim/decidim.svg)](https://codeclimate.com/github/decidim/decidim/trends)
 [![codecov](https://img.shields.io/codecov/c/github/decidim/decidim.svg)](https://codecov.io/gh/decidim/decidim)
 [![Dependency Status](https://img.shields.io/gemnasium/decidim/decidim.svg)](https://gemnasium.com/github.com/decidim/decidim)
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/decidim/localized.svg)](https://crowdin.com/project/decidim/invite)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/decidim/localized.svg)](https://crowdin.com/project/decidim)
 [![Inline docs](http://inch-ci.org/github/decidim/decidim.svg?branch=master)](http://inch-ci.org/github/decidim/decidim)
 [![Accessibility issues](https://rocketvalidator.com/badges/a11y_issues.svg?url=http://staging.decidim.codegram.com/)](https://rocketvalidator.com/badges/link?url=http://staging.decidim.codegram.com/&report=a11y)
 [![HTML issues](https://rocketvalidator.com/badges/html_issues.svg?url=http://staging.decidim.codegram.com/)](https://rocketvalidator.com/badges/link?url=http://staging.decidim.codegram.com/&report=html)
@@ -52,6 +52,12 @@ We've set up a guide on how to install, set up and upgrade Decidim. See the [Get
 
 ## How to contribute
 
+### As a Translator
+
+Decidim is already translated on multiple languages (English, Spanish, Catalan, Basque, Italian, Finnish, Dutch and French). You can help us at [Crowdin, the translation service](https://crowdin.com/project/decidim), reviewing this translations or proposing a new language to add to the platform.
+
+### As a Developer
+
 In order to develop on decidim, you'll need:
 
 * **PostgreSQL** 9.4+
@@ -74,7 +80,7 @@ You have several rake tasks available for you:
 * `bundle exec rake development_app`: Creates a development app which you can use to run an application with the gems in your path.
 * `bundle exec rake test_all`: Generates a test app for every engine and runs their tests.
 
-### Browse Decidim
+#### Browse Decidim
 
 After you create a development app (`bundle exec rake development_app`):
 - `cd development_app`
@@ -86,7 +92,7 @@ Optionally, you can log in as: user@example.org | decidim123456
 Also, if you want to verify yourself against the default authorization handler use a document number ended with "X".
 
 
-### Browse Admin Interface
+#### Browse Admin Interface
 
 After you create a development app (`bundle exec rake development_app`):
 - `cd development_app`
@@ -95,10 +101,10 @@ After you create a development app (`bundle exec rake development_app`):
 - Login data: admin@example.org | decidim123456
 
 
-## Components
+## Officially supported libraries
 
 
-| Component        | Description           |
+| Library        | Description           |
 | ------------- |-------------|
 | [Admin](https://github.com/decidim/decidim/tree/master/decidim-admin)      | This library adds an administration dashboard so users can manage their organization, participatory processes and all other entities. |
 | [API](https://github.com/decidim/decidim/tree/master/decidim-api)      | This library exposes a GraphQL API to programatically interact with the Decidim platform via HTTP      |
@@ -106,7 +112,7 @@ After you create a development app (`bundle exec rake development_app`):
 | [Comments](https://github.com/decidim/decidim/tree/master/decidim-comments) | The Comments module adds the ability to include comments to any resource which can be commentable by users.      |
 | [Core](https://github.com/decidim/decidim/tree/master/decidim-core) | The basics of Decidim: users, participatory processes, etc. This is the only required engine to run Decidim, all the others are optional. |
 | [Dev](https://github.com/decidim/decidim/tree/master/decidim-dev) | This gem aids the local development of Decidim's features. |
-| [Meeting](https://github.com/decidim/decidim/tree/master/decidim-meetings) | The Meeeting module adds meeting to any participatory process. It adds a CRUD engine to the admin and public view scoped inside the participatory process. |
+| [Meeting](https://github.com/decidim/decidim/tree/master/decidim-meetings) | The Meeting module adds meeting to any participatory process. It adds a CRUD engine to the admin and public view scoped inside the participatory process. |
 | [Pages](https://github.com/decidim/decidim/tree/master/decidim-pages) | The Pages module adds static page capabilities to any participatory process. It basically provides an interface to include arbitrary HTML content to any step. |
 | [Proposals](https://github.com/decidim/decidim/tree/master/decidim-proposals) | The Proposals module adds one of the main features of Decidim: allows users to contribute to a participatory process by creating proposals. |
 | [Results](https://github.com/decidim/decidim/tree/master/decidim-results) | Adds a results section to any participatory process so users can follow along the state of the accepted proposals. |
@@ -116,7 +122,7 @@ After you create a development app (`bundle exec rake development_app`):
 
 ### Architecture
 
-This is not your tipical Ruby on Rails Vanilla App. We've tried that using [Consul](http://decide.es) but we've found some problems on reutilization, adaptation, modularization and configuration. You can read more about that on "[Propuesta de Cambios de Arquitectura de Consul](https://www.gitbook.com/book/alabs/propuesta-de-cambios-en-la-arquitectura-de-consul/details)".
+This is not your typical Ruby on Rails Vanilla App. We've tried that using [Consul](http://decide.es) but we've found some problems on reutilization, adaptation, modularization and configuration. You can read more about that on "[Propuesta de Cambios de Arquitectura de Consul](https://www.gitbook.com/book/alabs/propuesta-de-cambios-en-la-arquitectura-de-consul/details)".
 
 ### Turbolinks
 
@@ -133,6 +139,15 @@ If you plan to release your application you'll need to publish it using the same
 
 ## Example applications
 
+Since Decidim is a ruby gem, you can check out the [dependent repositories](https://github.com/decidim/decidim/network/dependents?type=application) to see how many applications are on the wild or tests that other developers have made. Here's a partial list with some of the projects that have used Decidim: 
+
 * [Demo](http://staging.decidim.codegram.com)
-* [Decidim Barcelona](https://decidim.barcelona)
-* [L'H ON dels barris](https://www.lhon-participa.cat)
+* [Decidim Barcelona](https://decidim.barcelona) - [View code](https://github.com/AjuntamentdeBarcelona/decidim-barcelona)
+* [L'H ON Participa](https://www.lhon-participa.cat) - [View code](https://github.com/HospitaletDeLlobregat/decidim-hospitalet)
+* [Decidim Terrassa](https://participa.terrassa.cat) - [View code](https://github.com/AjuntamentDeTerrassa/decidim-terrassa)
+* [Decidim Sabadell](https://decidim.sabadell.cat) - [View code](https://github.com/AjuntamentDeSabadell/decidim-sabadell)
+* [Decidim Gavà](https://participa.gavaciutat.cat) - [View code](https://github.com/AjuntamentDeGava/decidim-gava)
+* [Decidim Sant Cugat](https://decidim.santcugat.cat/) - [View code](https://github.com/AjuntamentdeSantCugat/decidim-sant_cugat)
+* [Vilanova Participa](http://participa.vilanova.cat) - [View code](https://github.com/vilanovailageltru/decidim-vilanova)
+* [Erabaki Pamplona](https://erabaki.pamplona.es) - [View code](https://github.com/ErabakiPamplona/erabaki)
+* [Decidim Mataró](https://www.decidimmataro.cat) - [View code](https://github.com/AjuntamentDeMataro/decidim-mataro)

data/Rakefile

@@ -8,7 +8,7 @@ require_relative "lib/generators/decidim/docker_generator"
 load "decidim-core/lib/tasks/decidim_tasks.rake"
 load "decidim-dev/lib/tasks/test_app.rake"
 
-DECIDIM_GEMS = %w(core system admin api pages meetings proposals comments results budgets dev).freeze
+DECIDIM_GEMS = %w(core system admin api pages meetings proposals comments results budgets surveys dev).freeze
 
 RSpec::Core::RakeTask.new(:spec)
 
@@ -17,9 +17,12 @@ task default: :spec
 desc "Runs all tests in all Decidim engines"
 task test_all: ["decidim:generate_test_app"] do
   DECIDIM_GEMS.each do |gem_name|
-    Dir.chdir("#{File.dirname(__FILE__)}/decidim-#{gem_name}") do
+    next if gem_name == "dev"
+
+    Dir.chdir("#{__dir__}/decidim-#{gem_name}") do
       puts "Running #{gem_name}'s tests..."
-      sh "rake"
+      status = system "rake"
+      exit 1 unless status || ENV["FAIL_FAST"] == "false"
     end
   end
 end
@@ -28,7 +31,7 @@ desc "Pushes a new build for each gem."
 task release_all: [:check_locale_completeness, :webpack] do
   sh "rake release"
   DECIDIM_GEMS.each do |gem_name|
-    Dir.chdir("#{File.dirname(__FILE__)}/decidim-#{gem_name}") do
+    Dir.chdir("#{__dir__}/decidim-#{gem_name}") do
       sh "rake release"
     end
   end
@@ -37,7 +40,7 @@ end
 desc "Makes sure all official locales are complete and clean."
 task :check_locale_completeness do
   DECIDIM_GEMS.each do |gem_name|
-    Dir.chdir("#{File.dirname(__FILE__)}/decidim-#{gem_name}") do
+    Dir.chdir("#{__dir__}/decidim-#{gem_name}") do
       system({ "ENFORCED_LOCALES" => "en,ca,es" }, "rspec spec/i18n_spec.rb")
     end
   end
@@ -45,7 +48,7 @@ end
 
 desc "Generates a development app."
 task :development_app do
-  Dir.chdir(File.dirname(__FILE__)) do
+  Dir.chdir(__dir__) do
     sh "rm -fR development_app"
   end
 
@@ -53,10 +56,11 @@ task :development_app do
     ["development_app", "--path", ".."]
   )
 
-  Dir.chdir("#{File.dirname(__FILE__)}/development_app") do
+  Dir.chdir("#{__dir__}/development_app") do
     Bundler.with_clean_env do
       sh "bundle exec spring stop"
-      sh "bundle exec rake db:drop db:create db:migrate db:seed"
+      sh "bundle exec rake db:drop db:create db:migrate"
+      sh "bundle exec rake db:seed"
       sh "bundle exec rails generate decidim:demo"
     end
   end
@@ -64,11 +68,11 @@ end
 
 desc "Generates a development app based on Docker."
 task :docker_development_app do
-  Dir.chdir(File.dirname(__FILE__)) do
+  Dir.chdir(__dir__) do
     sh "rm -fR docker_development_app"
   end
 
-  path = File.dirname(__FILE__) + "/docker_development_app"
+  path = __dir__ + "/docker_development_app"
 
   Decidim::Generators::DockerGenerator.start(
     ["docker_development_app", "--path", path]

data/decidim-admin/app/assets/javascripts/decidim/admin/application.js.es6

@@ -1,12 +1,9 @@
-/* global sortSteps */
-
 // = require jquery
 // = require jquery_ujs
 // = require foundation
-// = require html.sortable
-// = require ./sort_steps
 // = require ./tab_focus
 // = require ./toggle_nav
+// = require ./sort_list.component
 // = require decidim/editor
 // = require foundation-datepicker
 // = require form_datepicker
@@ -16,17 +13,32 @@
 window.Decidim = window.Decidim || {};
 
 const pageLoad = () => {
+  const { toggleNav, createSortList } = window.DecidimAdmin;
+
   $(document).foundation();
-  sortSteps();
 
-  if (DecidimAdmin) {
-    DecidimAdmin.toggleNav();
-  }
+  toggleNav();
+
+  createSortList('#steps tbody', {
+    placeholder: $('<tr style="border-style: dashed; border-color: #000"><td colspan="4">&nbsp;</td></tr>')[0],
+    onSortUpdate: ($children) => {
+      const sortUrl = $('#steps tbody').data('sort-url')
+      const order = $children.map((index, child) => $(child).data('id')).toArray();
+
+      $.ajax({
+        method: 'POST',
+        url: sortUrl,
+        contentType: 'application/json',
+        data: JSON.stringify({ items_ids: order }) }, // eslint-disable-line camelcase
+      );
+    }
+  })
 };
 
 $(() => {
   pageLoad();
- if (window.Decidim.formDatePicker) {
+
+  if (window.Decidim.formDatePicker) {
     window.Decidim.formDatePicker();
   }
 });

data/decidim-admin/app/assets/javascripts/decidim/admin/sort_list.component.js.es6

@@ -0,0 +1,35 @@
+// = require html.sortable
+
+((exports) => {
+
+  class SortListComponent {
+
+    /**
+     * Creates a sortable list using hmtl5sortable function.
+     *
+     * @param {String} sortListSelector The list selector that has to be sortable.
+     * @param {Object} options An object containing the same options as html5sortable. It also includes
+     *                an extra option `onSortUpdate`, a callback which returns the children collection
+     *                whenever the list order has been changed.
+     *
+     * @returns {void} Nothing.
+     */
+    constructor(sortListSelector, options) {
+      if ($(sortListSelector).length > 0) {
+        exports.sortable(sortListSelector, options)[0].addEventListener('sortupdate', (event) => {
+          const $children = $(event.target).children();
+
+          if (options.onSortUpdate) {
+            options.onSortUpdate($children);
+          }
+        });
+      }
+    }
+  }
+
+  exports.DecidimAdmin = exports.DecidimAdmin || {};
+  exports.DecidimAdmin.SortListComponent = SortListComponent;
+  exports.DecidimAdmin.createSortList = (sortListSelector, options) => {
+    return new SortListComponent(sortListSelector, options);
+  };
+})(window);

data/decidim-admin/app/assets/stylesheets/decidim/admin/extra/_language-chooser.scss

@@ -0,0 +1,4 @@
+//Overrides position for the user-login block
+.user-login{ 
+  top: 30%;
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/extra/_sort.scss

@@ -0,0 +1,12 @@
+.survey-questions {
+  .question-divider {
+    cursor: move;
+    h2 {
+      line-height: 32px;
+    }
+  }
+}
+
+.icon--move {
+  vertical-align: middle;
+}

data/decidim-admin/app/controllers/decidim/admin/application_controller.rb

@@ -20,6 +20,7 @@ module Decidim
       helper Decidim::ReplaceButtonsHelper
       helper Decidim::OrganizationScopesHelper
       helper Decidim::TranslationsHelper
+      helper Decidim::LanguageChooserHelper
 
       protect_from_forgery with: :exception, prepend: true
 

data/decidim-admin/app/controllers/decidim/admin/participatory_process_attachments_controller.rb

@@ -11,6 +11,10 @@ module Decidim
       include Concerns::ParticipatoryProcessAdmin
       include Concerns::HasAttachments
 
+      def after_destroy_path
+        participatory_process_attachments_path(participatory_process.id)
+      end
+
       def attached_to
         participatory_process
       end

data/decidim-admin/app/helpers/decidim/admin/menu_helper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module Decidim

data/decidim-admin/app/models/decidim/admin/participatory_process_user_role.rb

@@ -5,8 +5,8 @@ module Decidim
     # Defines a relation between a user and a participatory process, and what
     # kind of relation does the user has.
     class ParticipatoryProcessUserRole < ApplicationRecord
-      belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
-      belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id", class_name: "Decidim::ParticipatoryProcess"
+      belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User", optional: true
+      belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id", class_name: "Decidim::ParticipatoryProcess", optional: true
 
       ROLES = %w(admin collaborator).freeze
       validates :role, inclusion: { in: ROLES }, uniqueness: { scope: [:user, :participatory_process] }

data/decidim-admin/app/views/decidim/admin/categories/index.html.erb

@@ -30,7 +30,13 @@
                   <% end %>
 
                   <% if can? :destroy, category %>
-                    <%= icon_link_to "circle-x", participatory_process_category_path(participatory_process, category), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                    <% if category.unused? %>
+                      <%= icon_link_to "circle-x", participatory_process_category_path(participatory_process, category), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                    <% else %>
+                      <span class="action-icon" title="<%= t('.category_used') %>" data-tooltip="true" data-disable-hover="false">
+                        <%= icon "circle-x", class: "action-icon action-icon--disabled" %>
+                      </span>
+                    <% end %>
                   <% end %>
                 </td>
               </tr>

data/decidim-admin/app/views/decidim/admin/exports/_dropdown.html.erb

@@ -1,4 +1,4 @@
-<button class="exports dropdown tiny button button--simple" data-toggle="export-dropdown"><%= t "actions.export", scope: "decidim.admin" %></button>
+<span class="exports dropdown tiny button button--simple" data-toggle="export-dropdown"><%= t "actions.export", scope: "decidim.admin" %></span>
 <div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
   <ul class="vertical menu add-features">
     <% feature.manifest.export_manifests.each do |manifest| %>

data/decidim-admin/app/views/decidim/admin/moderations/index.html.erb

@@ -17,7 +17,7 @@
         <thead>
           <tr>
             <th><%= t("models.moderation.fields.reportable", scope: "decidim.moderations") %></th>
-            <th><%= t("models.moderation.fields.reported_content", scope: "decidim.moderations") %></th>
+            <th><%= t("models.moderation.fields.reported_content_url", scope: "decidim.moderations") %></th>
             <th><%= t("models.moderation.fields.reports", scope: "decidim.moderations") %></th>
             <th><%= t("models.moderation.fields.report_count", scope: "decidim.moderations") %></th>
             <% if params[:hidden] %>
@@ -33,7 +33,11 @@
                 <%= moderation.reportable.class.name.demodulize %>
               </td>
               <td>
-                <%= moderation.reportable.reported_content %>
+                <%=
+                  link_to moderation.reportable.reported_content_url, target: "_blank" do
+                    (moderation.reportable.reported_content_url + " " + icon("external-link")).html_safe
+                  end
+                %>
               </td>
               <td>
                 <% reports = moderation.reports.map { |report| render 'report', report: report } %>

data/decidim-admin/app/views/decidim/admin/participatory_process_steps/index.html.erb

@@ -24,6 +24,7 @@
             <% participatory_process.steps.each do |step| %>
               <tr data-id="<%= step.id %>">
                 <td>
+                  <span class="table-list__actions"><%= icon("move", class: "action-icon") %></span>                
                   <% if step.active? %>
                     <span class="icon-active"></span>
                   <% end %>

data/decidim-admin/app/views/layouts/decidim/admin/_title_bar.html.erb

@@ -8,6 +8,16 @@
     <% end %>
   <% end %>
   <div class="user-login">
+  <ul class="dropdown menu language-chooser" data-dropdown-menu>
+      <li class="is-dropdown-submenu-parent">
+        <%= link_to t("name", scope: "locale") %>
+        <ul class="menu is-dropdown-submenu">
+          <% (available_locales - [I18n.locale.to_s]).each do |locale| %>
+            <li><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post%></li>
+          <% end %>
+        </ul>
+      </li>
+    </ul>
     <ul class="dropdown menu" data-dropdown-menu>
       <li class="is-dropdown-submenu-parent">
         <a href="#"><%= current_user.email %></a>

data/decidim-admin/bin/rails

@@ -4,11 +4,11 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path("../..", __FILE__)
-ENGINE_PATH = File.expand_path("../../lib/decidim/admin/engine", __FILE__)
+ENGINE_ROOT = File.expand_path("..", __dir__)
+ENGINE_PATH = File.expand_path("../lib/decidim/admin/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 
 require "rails/all"

data/decidim-admin/config/locales/ca.yml

@@ -155,6 +155,8 @@ ca:
         edit:
           title: Edita categoria
           update: Actualitzar
+        index:
+          category_used: Aquesta categoria no es pot suprimir perquè és en ús.
         new:
           create: Crea una categoria
           title: Nova categoria
@@ -542,7 +544,7 @@ ca:
             hidden_at: Data d'ocultació
             report_count: Recompte
             reportable: Tipus
-            reported_content: Contingut
+            reported_content_url: URL contingut del contingut reportat
             reports: Denúncies
     participatory_processes:
       participatory_process_groups:

data/decidim-admin/config/locales/en.yml

@@ -156,6 +156,8 @@ en:
         edit:
           title: Edit category
           update: Update
+        index:
+          category_used: This category cannot be removed because it is in use.
         new:
           create: Create category
           title: New category
@@ -543,7 +545,7 @@ en:
             hidden_at: Hidden at
             report_count: Count
             reportable: Reportable
-            reported_content: Reported content
+            reported_content_url: Reported content URL
             reports: Reports
     participatory_processes:
       participatory_process_groups:

data/decidim-admin/config/locales/es.yml

@@ -155,6 +155,8 @@ es:
         edit:
           title: Editar categoría
           update: Actualizar
+        index:
+          category_used: Esta categoría no se puede eliminar porque está en uso.
         new:
           create: Crear categoría
           title: Nueva categoría
@@ -542,7 +544,7 @@ es:
             hidden_at: Fecha de ocultación
             report_count: Recuento
             reportable: Tipo
-            reported_content: Contenido
+            reported_content_url: URL del contenido reportado
             reports: Denuncias
     participatory_processes:
       participatory_process_groups: