decidim-core 0.0.1 → 0.0.2

data/app/views/decidim/devise/shared/_links.html.erb

@@ -27,11 +27,3 @@
     <%= link_to t("devise.shared.links.didn_t_receive_unlock_instructions"), new_unlock_path(resource_name) %>
   </p>
 <% end -%>
-
-<%- if devise_mapping.omniauthable? %>
-  <%- resource_class.omniauth_providers.each do |provider| %>
-    <p class="text-center">
-      <%= link_to t("devise.shared.links.sign_in_with_provider", provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider) %>
-    </p>
-  <% end -%>
-<% end -%>

data/app/views/decidim/devise/shared/_omniauth_buttons.html.erb

@@ -0,0 +1,21 @@
+<%- if devise_mapping.omniauthable? && any_social_provider_enabled? %>
+  <div class="row">
+    <div class="columns large-4 mediumlarge-6 medium-8 medium-centered">
+      <span class="register__separator">
+        <span class="register__separator__text"><%= t('.or') %></span>
+      </span>
+      <%- resource_class.omniauth_providers.each do |provider| %>
+        <% if social_provider_enabled? provider %>
+          <div class="social-register">
+            <%= link_to decidim.send("user_#{provider}_omniauth_authorize_path"), class: "button button--social button--#{normalize_provider_name(provider)}" do %>
+              <span class="button--social__icon">
+                <%= icon normalize_provider_name(provider) %>
+              </span>
+              <%= t("devise.shared.links.sign_in_with_provider", provider: normalize_provider_name(provider).titleize) %>
+            <% end %> 
+          </div>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+<% end %>

data/app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb

@@ -0,0 +1,16 @@
+<li class="<%= "timeline__item #{step_status_class}" %>">
+  <div class="timeline__phase">
+    <span class="timeline__phase__number"><%= participatory_process_step.position + 1 %></span>
+  </div>
+  <div class="timeline__info">
+    <div class="timeline__header">
+      <span class="timeline__date text-small">
+        <%= participatory_process_step_dates(participatory_process_step) %>
+      </span>
+      <h6 class="timeline__title heading6"><%= t('.info') %></h6>
+    </div>
+    <div class="timeline__content">
+      <%= translated_attribute(participatory_process_step.description).html_safe %>
+    </div>
+  </div>
+</li>

data/app/views/decidim/participatory_process_steps/_timeline.html.erb

@@ -0,0 +1,7 @@
+<ol class="timeline">
+  <% past_step = true %>
+  <% current_participatory_process.steps.each do |step| %>
+    <%= render step, step_status_class: step_class(step, past_step)  %>
+    <% past_step = false if step.active? %>
+  <% end %>
+</ol>

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

@@ -0,0 +1,12 @@
+<main class="wrapper steps">
+  <div class="row column">
+    <div class="row">
+      <div class="columns mediumlarge-9 large-7">
+        <div class="section">
+          <h4 class="section-heading"><%= t('.process_steps') %></h4>
+          <%= render partial: 'timeline' %>
+        </div>
+      </div>
+    </div>
+  </div>
+</main>

data/app/views/decidim/participatory_processes/show.html.erb

@@ -3,18 +3,18 @@
     <div class="columns medium-7 mediumlarge-8">
       <div class="section">
         <div class="lead">
-          <%== translated_attribute(participatory_process.short_description) %>
+          <%== translated_attribute(current_participatory_process.short_description) %>
         </div>
-        <%== translated_attribute(participatory_process.description) %>
+        <%== translated_attribute(current_participatory_process.description) %>
       </div>
     </div>
   </div>
 </div>
-<% if participatory_process.attachments.any? %>
+<% if current_participatory_process.attachments.any? %>
   <div class="row attachments">
     <div class="columns large-8">
-      <%= render partial: "documents", locals: { documents: participatory_process.documents } %>
-      <%= render partial: "photos", locals: { photos: participatory_process.photos } %>
+      <%= render partial: "documents", locals: { documents: current_participatory_process.documents } %>
+      <%= render partial: "photos", locals: { photos: current_participatory_process.photos } %>
     </div>
   </div>
 <% end %>

data/app/views/decidim/shared/_login_modal.html.erb

@@ -0,0 +1,30 @@
+<div class="reveal" id="loginModal" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t('.please_sign_in') %></h3>
+    <button class="close-button" data-close aria-label="Close modal"
+      type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="row">
+    <div class="columns medium-8 medium-centered">
+      <%= form_for(Decidim::User.new, as: :user, url: session_path(:user), html: { class: "register-form new_user" }) do |f| %>
+        <div>
+          <div class="field">
+            <%= f.email_field :email, autofocus: true  %>
+          </div>
+          <div class="field">
+            <%= f.password_field :password, autocomplete: "off" %>
+          </div>
+        </div>
+        <div class="actions">
+          <%= f.submit t("devise.sessions.new.sign_in"), class: "button expanded" %>
+        </div>
+      <% end %>
+      
+      <p class="text-center">
+        <%= link_to t('.sign_up'), decidim.new_user_registration_path, class: "sign-up-link" %>
+      </p>
+    </div>
+  </div>
+</div>

data/app/views/devise/mailer/invite_admin.html.erb

@@ -0,0 +1,17 @@
+<p><%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %></p>
+
+<p>
+  <% if @resource.invited_by.present? %>
+    <%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+  <% else %>
+    <%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %>
+  <% end %>
+</p>
+
+<p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %></p>
+
+<% if @resource.invitation_due_at %>
+  <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %></p>
+<% end %>
+
+<p><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>

data/app/views/devise/mailer/invite_admin.text.erb

@@ -0,0 +1,15 @@
+<%= t("devise.mailer.invitation_instructions.hello", email: @resource.name) %>
+
+<% if @resource.invited_by.present? %>
+<%= t("devise.mailer.invitation_instructions.invited_you_as_admin", invited_by: @resource.invited_by.name, application: @resource.organization.name) %>
+<% else %>
+<%= t("devise.mailer.invitation_instructions.you_are_now_admin", application: @resource.organization.name) %>
+<% end %>
+
+<%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>
+
+<% if @resource.invitation_due_at %>
+<%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %>
+<% end %>
+
+<%= t("devise.mailer.invitation_instructions.ignore").html_safe %>

data/app/views/devise/mailer/organization_admin_invitation_instructions.html.erb

@@ -1,6 +1,6 @@
 <p><%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %></p>
 
-<p><%= t("devise.mailer.invitation_instructions.someone_invited_you", application: Decidim.config.application_name) %></p>
+<p><%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %></p>p>
 <p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %></p>
 
 <% if @resource.invitation_due_at %>

data/app/views/devise/mailer/organization_admin_invitation_instructions.text.erb

@@ -1,6 +1,6 @@
 <%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %>
 
-<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: Decidim.config.application_name) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>
 

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

@@ -7,6 +7,7 @@
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
     <%= render partial: 'layouts/decidim/meta' %>
+    <%= render partial: 'layouts/decidim/social_meta' %>
   </head>
 
   <body>

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

@@ -1,6 +1,6 @@
 <div class="off-canvas-wrapper">
   <div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>
-    <div class="off-canvas position-right" data-position="right"
+    <div class="off-canvas position-right hide-for-large" data-position="right"
       id="offCanvas" data-off-canvas>
       <!-- Close button -->
       <button class="close-button"

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

@@ -1,3 +1,4 @@
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
 <% available_locales.each do |locale| %>
   <link rel="alternate" href="<%= url_for(request.parameters.merge(locale: locale)) %>" hreflang="<%= locale %>" />
 <% end %>

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

@@ -21,9 +21,20 @@
       <div class="process-nav">
         <div class="row column process-nav__content">
           <ul>
+            <li>
+              <%= active_link_to decidim.participatory_process_path(current_participatory_process), active: :exact, class: "process-nav__link", class_active: "is-active" do %>
+                <%= icon "process" %>
+                <%= t ".process_menu_item" %>
+              <% end %>
+            </li>
+
             <% current_participatory_process.features.each do |feature| %>
               <li>
-                <%= link_to translated_attribute(feature.name), decidim.feature_path(current_participatory_process, feature), class: "process-nav__link" %>
+                <%= active_link_to decidim.feature_path(current_participatory_process, feature), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>
+                  <%= feature_icon(feature) %>
+
+                  <%= translated_attribute(feature.name) %>
+                <% end %>
               </li>
             <% end %>
           </ul>

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

@@ -21,6 +21,7 @@
           <%= participatory_process_step_dates participatory_process.active_step %>
         </span>
       </div>
+      <%= link_to t('.view_steps'), decidim.participatory_process_participatory_process_steps_path(current_participatory_process), class: "button tiny hollow" %>
     </div>
   </div>
 <% end %>

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

@@ -0,0 +1,11 @@
+<meta name="twitter:card" content="summary_large_image" />
+<meta name="twitter:site" content="@<%= content_for(:twitter_handler) %>" />
+<meta name="twitter:title" content="<%= content_for(:meta_title) %>" />
+<meta name="twitter:description" content="<%= content_for(:meta_description) %>" />
+<meta name="twitter:image" content="<%= content_for(:meta_image_url) %>" />
+
+<meta property="og:url" content="<%= content_for(:meta_url) %>" />
+<meta property="og:type" content="article" />
+<meta property="og:title" content="<%= content_for(:meta_title) %>" />
+<meta property="og:description" content="<%= content_for(:meta_description) %>" />
+<meta property="og:image" content="<%= content_for(:meta_image_url) %>" />

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

@@ -1,3 +1,7 @@
+<% content_for :meta_image_url do %>
+  <% current_participatory_process.banner_image.url %>
+<% end %>
+
 <%= render "layouts/decidim/application" do %>
   <div class="wrapper">
     <%= render partial: "layouts/decidim/process_header" %>

data/app/views/pages/home.html.erb

@@ -39,7 +39,7 @@
     <div class="row collapse">
       <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-3
                   large-up-4 card-grid">
-        <% participatory_processes.each do |process| %>
+        <% promoted_participatory_processes.each do |process| %>
           <div class="column">
             <article class="card card--process card--mini">
               <%= link_to participatory_process_path(process), class: "card__link" do %>
@@ -70,6 +70,7 @@
     </div>
   </div>
 </section>
+
 <section class="extended">
   <div class="wrapper-home home-section">
     <div class="row column text-center">
@@ -117,4 +118,30 @@
       </div>
     </div>
   </div>
-</section>
+</section>   
+
+<% if current_organization.show_statistics? %>
+  <section class="extended" id="statistics">
+    <div class="wrapper-home">
+      <div class="row column text-center">
+        <h3 class="heading2"><%= t(".stats.headline", organization: current_organization.name) %></h3>
+      </div>
+      <div class="row">
+        <div class="columns small-centered mediumlarge-10 large-8">
+          <div class="home-pam">
+            <div class="home-pam__highlight">
+              <div class="home-pam__data">
+                <h4 class="home-pam__title"><%= t(".stats.users") %></h4>
+                <span class="home-pam__number users-count"><%= users.count %></span>
+              </div>
+              <div class="home-pam__data">
+                <h4 class="home-pam__title"><%= t(".stats.processes") %></h4>
+                <span class="home-pam__number processes-count"><%= participatory_processes.count %></span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </section>
+<% end %>

data/config/i18n-tasks.yml

@@ -92,6 +92,7 @@ ignore_unused:
   - devise.mailer.password_change.subject
   - activerecord.attributes.decidim/user.*
   - activerecord.models.decidim/user
+  - activemodel.attributes.user.*
   - booleans.*
   - errors.messages.file_size_is_less_than_or_equal_to
   - errors.messages.nesting_too_deep

data/config/initializers/devise.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:disable Metrics/BlockLength
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 
@@ -299,7 +300,15 @@ Devise.setup do |config|
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting
   # up on your models and hooks.
-  # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+  if Rails.application.secrets.dig(:omniauth, "facebook").present?
+    config.omniauth :facebook, Rails.application.secrets.omniauth["facebook"]["app_id"], Rails.application.secrets.omniauth["facebook"]["app_secret"], scope: :email, info_fields: "name,email,verified"
+  end
+  if Rails.application.secrets.dig(:omniauth, "twitter").present?
+    config.omniauth :twitter, Rails.application.secrets.omniauth["twitter"]["api_key"], Rails.application.secrets.omniauth["twitter"]["api_secret"]
+  end
+  if Rails.application.secrets.dig(:omniauth, "google_oauth2").present?
+    config.omniauth :google_oauth2, Rails.application.secrets.omniauth["google_oauth2"]["client_id"], Rails.application.secrets.omniauth["google_oauth2"]["client_secret"]
+  end
 
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or

data/config/locales/ca.yml

@@ -1,4 +1,10 @@
 ca:
+  activemodel:
+    attributes:
+      user:
+        user_group_document_number: Número de document acreditatiu
+        user_group_name: Nom de l'organització
+        user_group_phone: Telèfon de l'organització
   activerecord:
     attributes:
       decidim/user:
@@ -26,6 +32,8 @@ ca:
         title: El meu compte
     authorization_handlers:
       decidim/dummy_authorization_handler: Autorització d'exemple
+      errors:
+        duplicate_authorization: Un usuari ja està autoritzat amb les mateixes dades.
     authorizations:
       create:
         error: S'ha produït un error en crear l'autorització.
@@ -46,11 +54,22 @@ ca:
       actions:
         unauthorized: No tens permís per realitzar aquesta acció
     devise:
+      omniauth_registrations:
+        create:
+          email_already_exists: Un altre compte està utilitzant la mateixa adreça de correu electrònic
+        new:
+          complete_profile: Completa el perfil
+          sign_up: Completi el seu perfil
+          subtitle: Si us plau, ompli el següent formulari per tal de completar la seva inscripció
       registrations:
         new:
           already_have_an_account?: Ja tens un compte?
           sign_in: Entra
           sign_up: Registra't
+          sign_up_as:
+            legend: Inscriure's com
+            user: Individu
+            user_group: Organització/Col·lectiu
           subtitle: Crea un compte per poder participar en els debats i donar suport a les propostes.
           terms: els termes i condicions d'ús
           tos_agreement: En registrar-te acceptes %{link}.
@@ -59,30 +78,45 @@ ca:
         new:
           are_you_new?: Ets nou a la plataforma?
           register: Crea't un compte
+      shared:
+        omniauth_buttons:
+          or: O
     menu:
       home: Inici
       processes: Processos
+    participatory_process_steps:
+      index:
+        process_steps: Fases del procés
+      participatory_process_step:
+        info: Informació
     participatory_processes:
       documents:
         related_documents: Documents relacionats
       photos:
         related_photos: Fotos relacionades
+    shared:
+      login_modal:
+        please_sign_in: Si us plau, inicii sessió
+        sign_up: Donar-se d'alta
   devise:
     mailer:
       invitation_instructions:
         accept: Acceptar invitació
         accept_until: Aquesta invitació caducarà el dia %{due_date}.
-        hello: Hola %{email}
+        hello: Hola %{email},
         ignore: |-
           Si no vols acceptar la invitació, ignora aquest correu.<br />
           El teu compte no es crearà fins que no accedeixis a l'enllaç de sota i triïs la teva contrasenya.
+        invited_you_as_admin: "%{invited_by} t'ha convidat com un administrador de %{application}, pots acceptar-ho mitjançant el següent enllaç."
         someone_invited_you: Algú t'ha convidat a %{application}, pots acceptar la invitació amb l'enllaç a continuació.
+      invite_admin:
+        subject: Has estat convidat a gestionar %{organization}
       organization_admin_invitation_instructions:
-        subject: T'han convidat a administrar %{organization}
+        subject: Has estat convidat a gestionar %{organization}
       password_change:
         greeting: Hola %{recipient}!
         message: Ens posem en contacte amb tu per notificar-te que la teva contrasenya ha estat canviada correctament.
-        subject: Contrasenya canviada
+        subject: Contrasenya modificada
   errors:
     messages:
       file_size_is_less_than_or_equal_to: la mida del fitxer ha de ser menor que o igual a %{count}
@@ -114,6 +148,10 @@ ca:
           active_step: 'Fase actual:'
           more_info: Més informació
           take_part: Participa
+      process_header:
+        process_menu_item: El procés
+      process_header_steps:
+        view_steps: Veure les fases
       user_menu:
         profile: El meu compte
         sign_out: Surt
@@ -142,6 +180,10 @@ ca:
       proposals_explanation: Espai obert de propostes dels ciutadans sobre quin tipus de ciutat volem viure.
       register: Registra't
       see_all_processes: Mostra tots els processos
+      stats:
+        headline: Estat actual de %{organization}
+        processes: Processos
+        users: Usuaris
       welcome: Benvingut/da a %{organization}!
   views:
     pagination: