decidim-core 0.0.1.alpha4 → 0.0.1.alpha5

data/app/assets/stylesheets/decidim/modules/_cards.scss

@@ -421,20 +421,6 @@ $datetime-bg: $primary;
     align-items: center;
     justify-content: center;
   }
-  &:after{
-    content: "";
-    display: block;
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-    background: linear-gradient(to bottom, rgba($white,1),rgba($white,0) 80%);
-    z-index: 0;
-    @include breakpoint(mediumlarge){
-      background: linear-gradient(to right, rgba($white,1),rgba($white,0) 80%);
-    }
-  }
   > .card__content{
     position: relative;
     z-index: 1;

data/app/assets/stylesheets/decidim/modules/_navbar.scss

@@ -62,6 +62,10 @@ $navbar-active-shadow-medium: inset 0 4px 0 0 $primary;
   }
   img{
     display: block;
+    max-width: 100px;
+    @include breakpoint(mediumlarge){
+      max-width: 140px;
+    }
   }
 }
 
@@ -246,6 +250,10 @@ $navbar-active-shadow-medium: inset 0 4px 0 0 $primary;
     background: $navbar-bg-hover;
     color: $navbar-color-hover;
   }
+  
+  @include breakpoint(medium){
+    padding: .75em 2em;
+  }
 }
 
 .main-nav__link--active{

data/app/assets/stylesheets/decidim/utils/_settings.scss

@@ -49,9 +49,8 @@ $global-font-size: 100%;
 $global-width: rem-calc(1200);
 $global-lineheight: 1.5;
 $foundation-palette: (
-  primary: #C24B29, //#dc0030,
-  //secondary: #777777,
-  secondary: #5295ad,//#74AABE,
+  primary: #ef604d,
+  secondary: #599aa6,
   success: #57d685,
   warning: #ffae00,
   alert: #ec5840,
@@ -539,7 +538,7 @@ $thumbnail-radius: $global-radius;
 
 $titlebar-background: $black;
 $titlebar-color: $white;
-$titlebar-padding: 0.5rem;
+$titlebar-padding: 1rem 0.5rem;
 $titlebar-text-font-weight: bold;
 $titlebar-icon-color: $white;
 $titlebar-icon-color-hover: $medium-gray;

data/app/controllers/concerns/decidim/locale_switcher.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # Common logic to switch between locales.
+  module LocaleSwitcher
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :set_locale
+      helper_method :current_locale, :available_locales
+
+      # Sets the locale for the current session.
+      #
+      # Returns nothing.
+      def set_locale
+        I18n.locale = if params["locale"] && available_locales.include?(params["locale"])
+                        params["locale"]
+                      elsif current_user && current_user.locale.present?
+                        current_user.locale
+                      else
+                        I18n.default_locale
+                      end
+      end
+
+      # Adds the current locale to all the URLs generated by url_for so users
+      # experience a consistent behaviour if they copy or share links.
+      #
+      # Returns a Hash.
+      def default_url_options
+        return {} if current_locale == I18n.default_locale.to_s
+
+        { locale: current_locale }
+      end
+
+      # The current locale for the user. Available as a helper for the views.
+      #
+      # Returns a String.
+      def current_locale
+        @current_locale ||= I18n.locale.to_s
+      end
+
+      # The available locales in the application. Available as a helper for the
+      # views.
+      #
+      # Returns an Array of Strings.
+      def available_locales
+        @available_locales ||= I18n.available_locales.map(&:to_s)
+      end
+    end
+  end
+end

data/app/controllers/decidim/application_controller.rb

@@ -3,6 +3,7 @@ module Decidim
   # The main application controller that inherits from Rails.
   class ApplicationController < ActionController::Base
     include Decidim::NeedsOrganization
+    include Decidim::LocaleSwitcher
     protect_from_forgery with: :exception, prepend: true
 
     layout "application"

data/app/controllers/decidim/devise/confirmations_controller.rb

@@ -4,6 +4,7 @@ module Decidim
     # Custom Devise ConfirmationsController to avoid namespace problems.
     class ConfirmationsController < ::Devise::ConfirmationsController
       include Decidim::NeedsOrganization
+      include Decidim::LocaleSwitcher
       layout "application"
     end
   end

data/app/controllers/decidim/devise/passwords_controller.rb

@@ -4,6 +4,7 @@ module Decidim
     # Custom Devise PasswordsController to avoid namespace problems.
     class PasswordsController < ::Devise::PasswordsController
       include Decidim::NeedsOrganization
+      include Decidim::LocaleSwitcher
       layout "application"
     end
   end

data/app/controllers/decidim/devise/registrations_controller.rb

@@ -5,10 +5,16 @@ module Decidim
     # RegistrationsController so we can specify a custom layout.
     class RegistrationsController < ::Devise::RegistrationsController
       include Decidim::NeedsOrganization
+      include Decidim::LocaleSwitcher
       layout "application"
+      before_action :configure_permitted_parameters
 
       protected
 
+      def configure_permitted_parameters
+        devise_parameter_sanitizer.permit(:sign_up, keys: [:name])
+      end
+
       # Called before resource.save
       def build_resource(hash = nil)
         super(hash)

data/app/controllers/decidim/devise/sessions_controller.rb

@@ -4,6 +4,7 @@ module Decidim
     # Custom Devise SessionsController to avoid namespace problems.
     class SessionsController < ::Devise::SessionsController
       include Decidim::NeedsOrganization
+      include Decidim::LocaleSwitcher
       layout "application"
     end
   end

data/app/controllers/decidim/locales_controller.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+require_dependency "decidim/application_controller"
+
+module Decidim
+  # A controller to allow users switching their locale.
+  class LocalesController < ApplicationController
+    def create
+      if current_user && params["locale"] && available_locales.include?(params["locale"])
+        current_user.update_attribute(:locale, params["locale"])
+      end
+
+      redirect_to referer_with_new_locale
+    end
+
+    private
+
+    def referer_with_new_locale
+      uri = URI(request.referrer || "/")
+      query = uri.query.to_s.gsub(/locale\=[a-zA-Z\-]{2,5}/, "")
+      params = URI.decode_www_form(query) << ["locale", current_locale]
+      uri.query = URI.encode_www_form(params)
+
+      uri.to_s
+    end
+  end
+end

data/app/helpers/decidim/layout_helper.rb

@@ -3,7 +3,7 @@ module Decidim
   # View helpers related to the layout.
   module LayoutHelper
     def decidim_page_title
-      Decidim.config.application_name
+      current_organization.name
     end
 
     # Outputs an SVG-based icon.

data/app/mailers/concerns/decidim/localised_mailer.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # A module to be included in mailers that changes the default behaviour so
+  # the emails are rendered in the user's locale instead of the default one.
+  module LocalisedMailer
+    extend ActiveSupport::Concern
+
+    included do
+      # Yields with the I18n locale changed to the user's one.
+      #
+      # Returns nothing.
+      def with_user(user)
+        I18n.with_locale(user.locale || I18n.locale) do
+          yield
+        end
+      end
+
+      # Overwrite default devise_mail method to always render the email with
+      # the user's locale.
+      def devise_mail(record, action, opts = {})
+        with_user(record) do
+          super
+        end
+      end
+    end
+  end
+end

data/app/mailers/decidim/application_mailer.rb

@@ -3,6 +3,8 @@ module Decidim
   # Main application mailer configuration. Inherit from this to create new
   # mailers.
   class ApplicationMailer < ActionMailer::Base
+    include Roadie::Rails::Automatic
+
     default from: "from@example.com"
     layout "mailer"
   end

data/app/mailers/decidim/decidim_devise_mailer.rb

@@ -1,11 +1,38 @@
 # frozen_string_literal: true
 module Decidim
   # A custom mailer for Devise so we can tweak the invitation instructions for
-  # each role.
+  # each role and use a localised version.
   class DecidimDeviseMailer < Devise::Mailer
-    def invitation_instructions(record, token, opts = {})
-      @token = token
-      devise_mail(record, opts[:invitation_instructions] || :invitation_instructions, opts)
+    include LocalisedMailer
+    include Roadie::Rails::Automatic
+
+    layout "decidim/mailer"
+
+    # Sends an email with the invitation instructions to a new user.
+    #
+    # user  - The User that has been invited.
+    # token - The String to be sent as a token to verify the invitation.
+    # opts  - A Hash with options to send the email (optional).
+    def invitation_instructions(user, token, opts = {})
+      with_user(user) do
+        @token = token
+
+        if opts[:invitation_instructions] == "organization_admin_invitation_instructions"
+          opts[:subject] = I18n.t("devise.mailer.organization_admin_invitation_instructions.subject", organization: user.organization.name)
+        end
+      end
+
+      devise_mail(user, opts[:invitation_instructions] || :invitation_instructions, opts)
+    end
+
+    private
+
+    # Overwrite devise_mail so we can inject the organization from the user.
+    def devise_mail(user, action, opts = {}, &block)
+      with_user(user) do
+        @organization = user.organization
+        super
+      end
     end
   end
 end

data/app/models/decidim/organization.rb

@@ -4,6 +4,7 @@ module Decidim
   # installation we can find many organizations and each of them can start
   # their own participatory processes.
   class Organization < ApplicationRecord
+    has_many :participatory_processes, foreign_key: "decidim_organization_id", class_name: Decidim::ParticipatoryProcess
     validates :name, :host, uniqueness: true
   end
 end

data/app/models/decidim/participatory_process.rb

@@ -8,7 +8,7 @@ module Decidim
   class ParticipatoryProcess < ApplicationRecord
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: Decidim::Organization
 
-    validates :title, :slug, :subtitle, :short_description, :description, presence: true
+    validates :slug, presence: true
     validates :slug, uniqueness: true
   end
 end

data/app/models/decidim/user.rb

@@ -11,7 +11,8 @@ module Decidim
 
     ROLES = %w(admin moderator official).freeze
 
-    validates :organization, presence: true
+    validates :organization, :name, presence: true
+    validates :locale, inclusion: { in: I18n.available_locales.map(&:to_s) }, allow_blank: true
     validate :all_roles_are_valid
 
     # Public: Allows customizing the invitation instruction email content when

data/app/views/decidim/devise/registrations/edit.html.erb

@@ -25,6 +25,10 @@
     <%= f.password_field :current_password %>
   </div>
 
+  <div class="field">
+    <%= f.text_field :name %>
+  </div>
+
   <div><%= f.submit t("devise.registrations.edit.update") %></div>
 <% end %>
 

data/app/views/decidim/devise/registrations/new.html.erb

@@ -15,6 +15,10 @@
     <%= f.password_field :password_confirmation, autocomplete: "off" %>
   </div>
 
+  <div class="field">
+    <%= f.text_field :name %>
+  </div>
+
   <div class="actions">
     <%= f.submit t("devise.registrations.new.sign_up") %>
   </div>

data/app/views/layouts/decidim/_header.html.erb

@@ -25,22 +25,62 @@
                 <!-- Remove this, use the final SVG logo -->
                 <span><%= current_organization.name %></span>
                 <style>
-.logo-wrapper span{ color: white; font-weight: 600;
-  display: inline-block; text-align: left;
-  padding-left: 8px; line-height: 1;
-  position: relative; }
-.logo-wrapper span:before{ content: ""; display: block;
-  position: absolute; border-left: 4px solid white; height: 88%;
-  top: 6%; left: 0; }
+                 .logo-wrapper span{ color: white; font-weight: 600;
+                   font-size: 1.4em;
+                   display: inline-block; text-align: left;
+                   padding-left: 8px; line-height: 1;
+                   position: relative; }
+                 .logo-wrapper span:before{ content: ""; display: block;
+                   position: absolute; border-left: 4px solid white; height: 88%;
+                   top: 6%; left: 0; }
                 </style>
                 <!-- /Remove-->
               </a>
             </div>
+            <div class="topbar__dropmenu language-choose">
+              <ul class="dropdown menu" data-dropdown-menu>
+                <li class="is-dropdown-submenu-parent">
+                  <%= link_to t(current_locale, scope: "locales") %>
+                  <% if available_locales.length > 1 %>
+                    <ul class="menu is-dropdown-submenu">
+                    <% available_locales.each do |locale| %>
+                      <li><%= link_to t(locale, scope: "locales"), locale_path(locale: locale), method: :post%></li>
+                    <% end %>
+                  <% end %>
+                  </ul>
+                </li>
+              </ul>
+            </div>
             <div class="hide-for-medium topbar__menu">
               <button type="button" data-toggle="offCanvas">
                 <%= icon "menu", aria_label: t('.navigation'), role: "img" %>
               </button>
             </div>
+            <% if current_user %>
+              <div class="topbar__dropmenu topbar__user__logged">
+                <ul class="dropdown menu" data-dropdown-menu>
+                  <li class="is-dropdown-submenu-parent show-for-medium">
+                    <%= link_to current_user.name, root_path %>
+                    <ul class="menu is-dropdown-subeenu js-append usermenu-off-canvas">
+                      <li><%= link_to t('.sign_out'), destroy_user_session_path, method: :delete, class: "sign-out-link" %></li>
+                    </ul>
+                    <span data-set="nav-login-holder" class="show-for-medium">
+                      <!-- Repeated due to dropdown limitations -->
+                      <ul class="menu is-dropdown-submenu js-append usermenu-off-canvas">
+                        <li><%= link_to t('.sign_out'), destroy_user_session_path, method: :delete, class: "sign-out-link" %></li>
+                      </ul>
+                    </span>
+                  </li>
+                </ul>
+              </div>
+            <% else %>
+              <div class="topbar__user show-for-medium" data-set="nav-login-holder">
+                  <div class="topbar__user__login js-append">
+                    <%= link_to t('.sign_up'), new_user_registration_path, class: "sign-up-link" %>
+                    <%= link_to t('.sign_in'), new_user_session_path, class: "sign-in-link" %>
+                  </div>
+              </div>
+            <% end %>
           </div>
         </div>
         <div class="show-for-medium" data-set="nav-holder">

data/app/views/layouts/decidim/_meta.html.erb

@@ -0,0 +1,3 @@
+<% available_locales.each do |locale| %>
+  <link rel="alternate" href="<%= url_for(request.parameters.merge(locale: locale)) %>" hreflang="<%= locale %>" />
+<% end %>

data/app/views/layouts/decidim/mailer.html.erb

@@ -0,0 +1,71 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta name="viewport" content="width=device-width" />
+  <%= stylesheet_link_tag "decidim/email" %>
+</head>
+
+<body>
+  <!-- <style> -->
+  <table class="body">
+    <tr>
+      <td class="float-center" align="center" valign="top">
+        <center>
+          <table class="container">
+            <tr>
+              <td>
+                <table class="row">
+                  <tr>
+                    <th class="small-12 first columns decidim-bar">
+                      <center class="decidim-logo">
+                        <%= link_to @organization.name, root_url(host: @organization.host) %>
+                      </center>
+                    </th>
+                    <th class="expander"></th>
+                  </tr>
+                </table>
+                <table class="spacer">
+                  <tbody>
+                    <tr>
+                      <td height="40px" style="font-size:40px;line-height:40px;"> </td>
+                    </tr>
+                  </tbody>
+                </table>
+
+                <table class="row content">
+                  <tr>
+                  <th class="small-12 first columns">
+                    <%= yield %>
+                  </th>
+                    <th class="expander"></th>
+                  </tr>
+                </table>
+
+                <table class="row">
+                  <tr>
+                    <th class="small-12 first columns">
+                    </th>
+                    <th class="expander"></th>
+                  </tr>
+                </table>
+
+                <table class="row">
+                  <tr>
+                    <th class="expander"></th>
+                    <th class="small-12 first columns cityhall-bar">
+                      <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
+                        <%= link_to @organization.name, root_url(host: @organization.host) %>
+                      </div>
+                    </th>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </center>
+      </td>
+    </tr>
+  </table>
+</body>
+</html>