decidim 0.0.1.alpha9 → 0.0.1

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

@@ -1,8 +1,9 @@
-//= require jquery
-//= require jquery_ujs
-//= require foundation
-//= require turbolinks
-//= require_self
+// = require jquery
+// = require jquery_ujs
+// = require foundation
+// = require turbolinks
+// = require decidim/editor
+// = require_self
 
 $(document).on('turbolinks:load', () => {
   $(document).foundation();

data/decidim-system/app/assets/stylesheets/decidim/system/application.scss

@@ -1,8 +1,13 @@
-@import 'https://fonts.googleapis.com/css?family=Montserrat:400,700';
-
 @import "foundation_and_overrides";
 @import "layout";
 @import "login";
 @import "sidebar";
 @import "tables";
 @import "actions";
+
+@import "decidim/editor";
+@import "decidim/utils/fontface";
+
+body {
+  font-family: 'Source Sans Pro', sans-serif;
+}

data/decidim-system/app/commands/decidim/system/create_admin.rb

@@ -11,7 +11,7 @@ module Decidim
         @form = form
       end
 
-      # Executes the command. Braodcasts these events:
+      # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
       # - :invalid if the form wasn't valid and we couldn't proceed.

data/decidim-system/app/commands/decidim/system/create_default_pages.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+module Decidim
+  module System
+    # A command with all the business logic when creating a new organization in
+    # the system. It creates the organization and invites the admin to the
+    # system.
+    class CreateDefaultPages < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form - A form object with the params.
+      def initialize(organization)
+        @organization = organization
+      end
+
+      # Executes the command.
+      #
+      # Returns nothing.
+      def call
+        Decidim::StaticPage::DEFAULT_PAGES.map do |slug|
+          Decidim::StaticPage.find_or_create_by!(slug: slug) do |page|
+            page.organization = organization
+            page.title = localized_attribute(slug, :title)
+            page.content = localized_attribute(slug, :content)
+          end
+        end
+      end
+
+      private
+
+      attr_reader :organization
+
+      def localized_attribute(slug, attribute)
+        I18n.available_locales.inject({}) do |result, locale|
+          text = I18n.with_locale(locale) do
+            I18n.t(attribute, scope: "decidim.system.default_pages.placeholders", page: slug)
+          end
+
+          result.update(locale => text)
+        end
+      end
+    end
+  end
+end

data/decidim-system/app/commands/decidim/system/register_organization.rb

@@ -12,7 +12,7 @@ module Decidim
         @form = form
       end
 
-      # Executes the command. Braodcasts these events:
+      # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
       # - :invalid if the form wasn't valid and we couldn't proceed.
@@ -24,6 +24,7 @@ module Decidim
         transaction do
           organization = create_organization
           invite_admin(organization)
+          CreateDefaultPages.call(organization)
         end
 
         broadcast(:ok)
@@ -39,7 +40,8 @@ module Decidim
         Decidim::Organization.create!(
           name: form.name,
           host: form.host,
-          description: form.description
+          available_locales: form.available_locales,
+          default_locale: form.default_locale
         )
       end
 

data/decidim-system/app/commands/decidim/system/update_admin.rb

@@ -12,7 +12,7 @@ module Decidim
         @form = form
       end
 
-      # Executes the command. Braodcasts these events:
+      # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
       # - :invalid if the form wasn't valid and we couldn't proceed.

data/decidim-system/app/commands/decidim/system/update_organization.rb

@@ -13,7 +13,7 @@ module Decidim
         @form = form
       end
 
-      # Executes the command. Braodcasts these events:
+      # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
       # - :invalid if the form wasn't valid and we couldn't proceed.
@@ -42,7 +42,6 @@ module Decidim
       def save_organization
         organization.name = form.name
         organization.host = form.host
-        organization.description = form.description
 
         organization.save!
       end

data/decidim-system/app/controllers/decidim/system/admins_controller.rb

@@ -11,11 +11,11 @@ module Decidim
       end
 
       def new
-        @form = AdminForm.new
+        @form = form(AdminForm).instance
       end
 
       def create
-        @form = AdminForm.from_params(params)
+        @form = form(AdminForm).from_params(params)
 
         CreateAdmin.call(@form) do
           on(:ok) do
@@ -32,12 +32,12 @@ module Decidim
 
       def edit
         @admin = Admin.find(params[:id])
-        @form = AdminForm.from_model(@admin)
+        @form = form(AdminForm).from_model(@admin)
       end
 
       def update
         @admin = Admin.find(params[:id])
-        @form = AdminForm.from_params(params)
+        @form = form(AdminForm).from_params(params)
 
         UpdateAdmin.call(@admin, @form) do
           on(:ok) do

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

@@ -3,6 +3,7 @@ module Decidim
   module System
     # The main application controller that inherits from Rails.
     class ApplicationController < ActionController::Base
+      include FormFactory
       protect_from_forgery with: :exception, prepend: true
 
       helper Decidim::TranslationsHelper

data/decidim-system/app/controllers/decidim/system/organizations_controller.rb

@@ -7,11 +7,11 @@ module Decidim
     #
     class OrganizationsController < ApplicationController
       def new
-        @form = RegisterOrganizationForm.new
+        @form = form(RegisterOrganizationForm).instance
       end
 
       def create
-        @form = RegisterOrganizationForm.from_params(params)
+        @form = form(RegisterOrganizationForm).from_params(params)
 
         RegisterOrganization.call(@form) do
           on(:ok) do
@@ -36,11 +36,11 @@ module Decidim
 
       def edit
         organization = Organization.find(params[:id])
-        @form = UpdateOrganizationForm.from_model(organization)
+        @form = form(UpdateOrganizationForm).from_model(organization)
       end
 
       def update
-        @form = UpdateOrganizationForm.from_params(params)
+        @form = form(UpdateOrganizationForm).from_params(params)
 
         UpdateOrganization.call(params[:id], @form) do
           on(:ok) do

data/decidim-system/app/forms/decidim/system/admin_form.rb

@@ -3,7 +3,7 @@ module Decidim
   module System
     # A form object used to create organizations from the system dashboard.
     #
-    class AdminForm < Rectify::Form
+    class AdminForm < Form
       mimic :admin
 
       attribute :email, String

data/decidim-system/app/forms/decidim/system/register_organization_form.rb

@@ -6,16 +6,17 @@ module Decidim
     # A form object used to create organizations from the system dashboard.
     #
     class RegisterOrganizationForm < UpdateOrganizationForm
-      include TranslatableAttributes
-
       mimic :organization
 
       attribute :organization_admin_email, String
       attribute :organization_admin_name, String
+      attribute :available_locales, Array
+      attribute :default_locale, String
 
-      validates :organization_admin_email, :organization_admin_name, presence: true
-
-      translatable_attribute :description, String
+      validates :organization_admin_email, :organization_admin_name, :name, :host, presence: true
+      validates :available_locales, presence: true
+      validates :default_locale, presence: true
+      validates :default_locale, inclusion: { in: :available_locales }
     end
   end
 end

data/decidim-system/app/forms/decidim/system/update_organization_form.rb

@@ -5,7 +5,7 @@ module Decidim
   module System
     # A form object used to update organizations from the system dashboard.
     #
-    class UpdateOrganizationForm < Rectify::Form
+    class UpdateOrganizationForm < Form
       include TranslatableAttributes
 
       mimic :organization
@@ -13,8 +13,6 @@ module Decidim
       attribute :name, String
       attribute :host, String
 
-      translatable_attribute :description, String
-
       validate :validate_organization_uniqueness
 
       private

data/decidim-system/app/helpers/decidim/system/application_helper.rb

@@ -4,6 +4,8 @@ module Decidim
     # Custom helpers, scoped to the system panel.
     #
     module ApplicationHelper
+      include Decidim::LocalizedLocalesHelper
+
       def title
         "Decidim"
       end

data/decidim-system/app/views/decidim/system/organizations/edit.html.erb

@@ -7,10 +7,6 @@
     <%= f.text_field :host %>
   </div>
 
-  <div class="field">
-    <%= f.translated :text_area, :description %>
-  </div>
-
   <div class="actions">
     <%= f.submit t("decidim.system.actions.save") %>
   </div>

data/decidim-system/app/views/decidim/system/organizations/new.html.erb

@@ -12,16 +12,36 @@
   </div>
 
   <div class="field">
-    <%= f.translated :text_area, :description %>
+    <%= f.text_field :organization_admin_name %>
   </div>
 
   <div class="field">
-    <%= f.text_field :organization_admin_name %>
+    <%= f.email_field :organization_admin_email %>
   </div>
 
+  <%= f.fields_for :locales do |fields| %>
   <div class="field">
-    <%= f.email_field :organization_admin_email %>
+    <%= f.label :organization_locales, '', class: @form.respond_to?(:errors) && @form.errors[:default_locale].present? ? "is-invalid-label" : "" %>
+    <table>
+      <thead>
+        <tr>
+          <td>Locale</td>
+          <td>Enabled <%= f.error_for(:available_locales) %></td>
+          <td>Default? <%= f.error_for(:default_locale) %></td>
+        </tr>
+      </thead>
+      <tbody>
+        <% localized_locales.each do |locale| %>
+          <tr>
+            <td><%= locale.name %></td>
+            <td><%= check_box_tag "organization[available_locales][#{locale.id}]", locale.id, @form.available_locales.include?(locale.id) %></td>
+            <td><%= radio_button_tag "organization[default_locale]", locale.id, @form.default_locale == locale.id %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
+  <% end %>
 
   <div class="actions">
     <%= f.submit t("decidim.system.models.organization.actions.save_and_invite") %>

data/decidim-system/config/i18n-tasks.yml

@@ -88,7 +88,9 @@ search:
 # - '{devise,simple_form}.*'
 
 ## Consider these keys used:
-# ignore_unused:
+ignore_unused:
+  - decidim.system.default_pages.placeholders.*
+  - decidim.system.models.page.name
 # - 'activerecord.attributes.*'
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'

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

@@ -1,4 +1,3 @@
----
 ca:
   decidim:
     system:
@@ -14,9 +13,9 @@ ca:
           error: S'ha produït un error en crear un nou administrador.
           success: Administrador creat correctament
         destroy:
-          success: Administrador eliminat correctament.
+          success: L'administrador s'ha eliminat correctament
         edit:
-          title: Edita administrador
+          title: Editar administrador
           update: Actualitzar administrador
         index:
           title: Administradors
@@ -24,8 +23,12 @@ ca:
           create: Crear administrador
           title: Nou administrador
         update:
-          error: S'ha produït un error en actualitzar aquest administrador..
-          success: Administrador actualitzat correctament
+          error: S'ha produït un error en actualitzar aquest administrador.
+          success: L'administrador s'ha actualitzat correctament
+      default_pages:
+        placeholders:
+          content: Si us plau, afegeix contingut significatiu a aquesta pàgina des del tauler de control.
+          title: Títol predeterminat per %{page}
       menu:
         admins: Administradors
         dashboard: Tauler de control
@@ -37,24 +40,26 @@ ca:
             email: Correu electrònic
           name: Administrador
           validations:
-            email_uniqueness: Ja existeix un altre administrador amb aquest correu electrònic.
+            email_uniqueness: ja existeix un altre administrador amb aquest correu electrònic
         organization:
           actions:
-            save_and_invite: Crear organització i convidar a administrador
+            save_and_invite: Crear organització i convidar l'administrador
           fields:
             created_at: Data de creació
             name: Nom
           name: Organització
+        page:
+          name: pàgina
       organizations:
         create:
           error: S'ha produït un error en crear una nova organització.
-          success: Organització creada correctament.
+          success: L'organització s'ha creat correctament.
         index:
           title: Organitzacions
         new:
           title: Nova organització
         update:
           error: S'ha produït un error en actualitzar aquesta organització.
-          success: Organització actualitzada correctament.
+          success: L'organització s'ha actualitzat correctament.
       titles:
-        dashboard: Tauler de control
+        dashboard: Tauler de control

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

@@ -26,6 +26,10 @@ en:
         update:
           error: There was an error when updating this admin.
           success: Admin updated successfully
+      default_pages:
+        placeholders:
+          content: Please add meaningful content to this page on the admin dashboard.
+          title: Default title for %{page}
       menu:
         admins: Admins
         dashboard: Dashboard
@@ -45,6 +49,8 @@ en:
             created_at: Created at
             name: Name
           name: Organization
+        page:
+          name: Page
       organizations:
         create:
           error: There was an error when creating a new organization.

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

@@ -1,9 +1,8 @@
----
 es:
   decidim:
     system:
       actions:
-        confirm_destroy: "¿Seguro que lo quieres eliminar?"
+        confirm_destroy: '¿Seguro que lo quieres eliminar?'
         destroy: Eliminar
         edit: Editar
         new: Nuevo %{name}
@@ -14,7 +13,7 @@ es:
           error: Se ha producido un error al crear un nuevo administrador.
           success: Administrador creado correctamente
         destroy:
-          success: Administrador eliminado correctamente.
+          success: El administrador se ha eliminado correctamente.
         edit:
           title: Editar administrador
           update: Actualizar administrador
@@ -24,8 +23,12 @@ es:
           create: Crear administrador
           title: Nuevo administrador
         update:
-          error: Se ha producido un error al actualizar este administrador ..
+          error: Se ha producido un error al actualizar este administrador.
           success: Administrador actualizado correctamente
+      default_pages:
+        placeholders:
+          content: Por favor, añade contenido significativo en ésta página desde el panel de control.
+          title: Título predeterminado para %{page}
       menu:
         admins: Administradores
         dashboard: Panel de control
@@ -37,7 +40,7 @@ es:
             email: Correo electrónico
           name: Administrador
           validations:
-            email_uniqueness: Ya existe otro administrador con este correo electrónico.
+            email_uniqueness: ya existe otro administrador con este correo electrónico
         organization:
           actions:
             save_and_invite: Crear organización e invitar a administrador
@@ -45,6 +48,8 @@ es:
             created_at: Fecha de creación
             name: Nombre
           name: Organización
+        page:
+          name: página
       organizations:
         create:
           error: Se ha producido un error al crear una nueva organización.
@@ -57,4 +62,4 @@ es:
           error: Se ha producido un error al actualizar esta organización.
           success: Organización actualizada correctamente.
       titles:
-        dashboard: Panel de control
+        dashboard: Panel de control