decidim-core 0.0.1.alpha9 → 0.0.1

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

@@ -0,0 +1,14 @@
+<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 - [I18n.locale.to_s]).each do |locale| %>
+            <li><%= link_to t(locale, scope: "locales"), decidim.locale_path(locale: locale), method: :post%></li>
+          <% end %>
+        </ul>
+      <% end %>
+    </li>
+  </ul>
+</div>

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

@@ -1,15 +1,19 @@
 <%= link_to root_path do %>
-  <!-- Remove this, use the final SVG logo -->
-  <span><%= current_organization.name %></span>
-  <style>
-    .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-->
+  <% if current_organization.logo.present? %>
+    <%= image_tag current_organization.logo.medium.url, height: "20" %>
+  <% else %>
+    <!-- Remove this, use the final SVG logo -->
+    <span><%= current_organization.name %></span>
+    <style>
+      .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-->
+  <% end %>
 <% end %>

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

@@ -0,0 +1,34 @@
+<div class="process-header row column">
+  <div class="row column process-header__main"
+       style="background-image:url(<%= current_participatory_process.banner_image.url %>);">
+    <div class="process-header__container row">
+      <div class="columns mediumlarge-9 process-header__info">
+        <h1 class="text-highlight heading2">
+          <%= translated_attribute(current_participatory_process.title) %>
+        </h1>
+        <h2 class="text-highlight heading-small">
+          <span class="process-header__hashtag">
+            <%= current_participatory_process.hashtag %>
+          </span>
+          <%= translated_attribute(current_participatory_process.subtitle) %>
+        </h2>
+      </div>
+      <%= render partial: "layouts/decidim/process_header_steps", locals: { participatory_process: current_participatory_process } %>
+    </div>
+  </div>
+  <% if current_participatory_process.features.any? %>
+    <div class="row column">
+      <div class="process-nav">
+        <div class="row column process-nav__content">
+          <ul>
+            <% 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" %>
+              </li>
+            <% end %>
+          </ul>
+        </div>
+      </div>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,26 @@
+<% if participatory_process.steps.any? %>
+  <div class="columns mediumlarge-3">
+    <div class="process-header__phase">
+      <div class="process-header__progress">
+        <ol>
+          <% past_step = true %>
+          <% participatory_process.steps.each_with_index do |step, index| %>
+            <% if past_step %>
+              <li class="phase-item--past"><span></span></li>
+            <% else %>
+              <li><span></span></li>
+            <% end %>
+            <% past_step = false if step.active? %>
+          <% end %>
+        </ol>
+        <span class="phase-current">Fase <%= participatory_process.active_step.position + 1 %> de <%= current_participatory_process.steps.count %></span>
+      </div>
+      <div>
+        <span class="phase-title"><%= translated_attribute participatory_process.active_step.title %></span>
+        <span class="phase-date">
+          <%= participatory_process_step_dates participatory_process.active_step %>
+        </span>
+      </div>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,2 @@
+<li><%= link_to t(".profile"), decidim.account_path %></li>
+<li><%= link_to t(".sign_out"), decidim.destroy_user_session_path, method: :delete, class: "sign-out-link" %></li>

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

@@ -0,0 +1,3 @@
+<%= render "layouts/decidim/application" do %>
+  <%= yield %>
+<% end %>

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

@@ -0,0 +1,15 @@
+<%= render "layouts/decidim/application" do %>
+  <div class="wrapper">
+    <%= render partial: "layouts/decidim/process_header" %>
+    <%= yield %>
+  </div>
+  <% if content_for? :expanded %>
+    <div class="expanded">
+      <div class="wrapper wrapper--inner">
+        <div class="row">
+          <%= yield :expanded %>
+        </div>
+      </div>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,12 @@
+<main class="wrapper">
+  <div class="row column">
+    <h1 class="heading1 page-title"><%= translated_attribute page.title %></h1>
+  </div>
+  <div class="row">
+    <div class="columns large-8">
+      <div class="static__content">
+        <%== translated_attribute page.content %>
+      </div>
+    </div>
+  </div>
+</main>

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

@@ -1,9 +1,13 @@
-<section class="extended hero" style="background-image:url(<%= asset_url("decidim/hero-home.jpg") %>);">
+<section class="extended hero" style="background-image:url(<%= current_organization.homepage_image.url %>);">
   <div class="hero__container">
     <div class="row">
       <div class="columns small-centered large-10">
         <h1 class="text-highlight heading1 hero-heading">
-          <%= t('.welcome', organization: current_organization.name) %>
+          <% if translated_attribute(current_organization.welcome_text).blank? %>
+            <%= t('.welcome', organization: current_organization.name) %>
+          <% else %>
+            <%== translated_attribute current_organization.welcome_text %>
+          <% end %>
         </h1>
       </div>
     </div>
@@ -14,3 +18,103 @@
     </div>
   </div>
 </section>
+
+<% if !translated_attribute(current_organization.description).blank? %>
+  <section class="extended subhero home-section">
+    <div class="row">
+      <div class="columns small-centered large-10">
+        <h2 class="heading3"><%== translated_attribute current_organization.description %></h2>
+        <%= link_to new_user_registration_path, class: "button--sc link subhero-cta" do %>
+          <%= t(".register") %>
+          <%= icon "chevron-right", aria_hidden: true %>
+        <% end %>
+      </div>
+    </div>
+  </section>
+<% end %>
+
+<section class="wrapper-home">
+  <div class="row">
+    <h3 class="section-heading"><%= t(".highlighted_processes") %></h3>
+    <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| %>
+          <div class="column">
+            <article class="card card--process card--mini">
+              <%= link_to participatory_process_path(process), class: "card__link" do %>
+                <div class="card__image-top"
+                     style="background-image:url(<%= process.banner_image.url %>)"></div>
+              <% end %>
+              <div class="card__content">
+                <%= link_to participatory_process_path(process), class: "card__link" do %>
+                  <h4 class="card__title"><%= translated_attribute process.title %></h4>
+                <% end %>
+                <% if process.active_step %>
+                  <span class="card--process__small">
+                    <%= t(".active_step") %>
+                    <strong><%= translated_attribute process.active_step.title %></strong>
+                  </span>
+                <% end %>
+              </div>
+            </article>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="columns small-centered small-12
+                smallmedium-8 medium-6 large-4">
+      <%= link_to t(".see_all_processes"), participatory_processes_path, class: "button expanded hollow button--sc home-section__cta" %>
+    </div>
+  </div>
+</section>
+<section class="extended">
+  <div class="wrapper-home home-section">
+    <div class="row column text-center">
+      <h3 class="heading2"><%t(".how_to_participate") %></h3>
+    </div>
+    <div class="row small-up-1 medium-up-3 home-bullets">
+      <div class="column">
+        <div class="home-bullet">
+          <div class="home-bullet__icon">
+            <%= icon "meetings" %>
+          </div>
+          <div class="home-bullet__desc">
+            <h4 class="heading6"><%= t(".meetings") %></h4>
+            <p><%= t(".meetings_explanation") %></p>
+          </div>
+        </div>
+      </div>
+      <div class="column">
+        <div class="home-bullet">
+          <div class="home-bullet__icon">
+            <%= icon "debates" %>
+          </div>
+          <div class="home-bullet__desc">
+            <h4 class="heading6"><%= t(".debates") %></h4>
+            <p><%= t(".debates_explanation") %></p>
+          </div>
+        </div>
+      </div>
+      <div class="column">
+        <div class="home-bullet">
+          <div class="home-bullet__icon">
+            <%= icon "proposals" %>
+          </div>
+          <div class="home-bullet__desc">
+            <h4 class="heading6"><%= t(".proposals") %></h4>
+            <p><%= t(".proposals_explanation") %></p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="row">
+      <div class="columns small-centered small-10
+                smallmedium-8 medium-6 large-4">
+        <%= link_to t(".more_info"), page_path("faq"), class: "button expanded hollow button--sc" %>
+      </div>
+    </div>
+  </div>
+</section>

data/config/i18n-tasks.yml

@@ -3,7 +3,7 @@
 # The "main" locale.
 base_locale: en
 ## All available locales are inferred from the data by default. Alternatively, specify them explicitly:
-# locales: [es, fr]
+locales: [en]
 ## Reporting locale, default: en. Available: en, ru.
 # internal_locale: en
 
@@ -93,6 +93,8 @@ ignore_unused:
   - activerecord.attributes.decidim/user.*
   - activerecord.models.decidim/user
   - booleans.*
+  - errors.messages.file_size_is_less_than_or_equal_to
+  - errors.messages.nesting_too_deep
 # - 'activerecord.attributes.*'
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'

data/config/locales/ca.yml

@@ -1,4 +1,3 @@
----
 ca:
   activerecord:
     attributes:
@@ -14,7 +13,10 @@ ca:
       decidim/user: Usuari
   booleans:
     'false': 'No'
-    'true': Sí
+    'true': 'Sí'
+  carrierwave:
+    errors:
+      image_too_big: La imatge és massa gran
   decidim:
     account:
       authorizations:
@@ -26,11 +28,11 @@ ca:
       decidim/dummy_authorization_handler: Autorització d'exemple
     authorizations:
       create:
-        error: S'ha produït un error al crear l'autorització.
+        error: S'ha produït un error en crear l'autorització.
         success: Has estat autoritzat/da correctament.
       current_participatory_processes: fer una ullada als processos actuals
       destroy:
-        success: Autorització destruïda correctament.
+        success: L'autorització s'ha destruït correctament
       index:
         actions:
           decidim/dummy_authorization_handler: Verificar-me amb l'exemple
@@ -42,7 +44,7 @@ ca:
       skip_verification: Pots saltar-te aquest pas per ara i %{link}
     core:
       actions:
-        unauthorized: No tens permís per realitzar aquesta acció.
+        unauthorized: No tens permís per realitzar aquesta acció
     devise:
       registrations:
         new:
@@ -60,6 +62,11 @@ ca:
     menu:
       home: Inici
       processes: Processos
+    participatory_processes:
+      documents:
+        related_documents: Documents relacionats
+      photos:
+        related_photos: Fotos relacionades
   devise:
     mailer:
       invitation_instructions:
@@ -76,18 +83,20 @@ ca:
         greeting: Hola %{recipient}!
         message: Ens posem en contacte amb tu per notificar-te que la teva contrasenya ha estat canviada correctament.
         subject: Contrasenya canviada
+  errors:
+    messages:
+      file_size_is_less_than_or_equal_to: la mida del fitxer ha de ser menor que o igual a %{count}
+      invalid_manifest: Arxiu de manifest invàlid
+      invalid_participatory_process: Procés participatiu invàlid
+      nesting_too_deep: no pot estar dins d'una subcategoria
   layouts:
     decidim:
       footer:
-        about: Quant a Decidim
-        accessibility: Accessibilitat
-        made_with_open_source: Aquesta web està feta amb <a target="_blank" href="https://github.com/AjuntamentdeBarcelona/decidim">software lliure</a>.
-        terms_of_use: Termes i condicions
+        made_with_open_source: 'Aquesta web està feta amb <a target="_blank" href="https://github.com/AjuntamentdeBarcelona/decidim">software lliure</a>.'
       header:
         close_menu: Tancar menú
         navigation: Navegació
         sign_in: Entra
-        sign_out: Surt
         sign_up: Registra't
       participatory_processes:
         index:
@@ -105,6 +114,9 @@ ca:
           active_step: 'Fase actual:'
           more_info: Més informació
           take_part: Participa
+      user_menu:
+        profile: El meu compte
+        sign_out: Surt
   locales:
     ca: Català
     en: English
@@ -118,5 +130,23 @@ ca:
       title: Hi ha hagut un problema amb el nostre servidor
       try_later: Si us plau, torna-ho a intentar més tard.
     home:
+      active_step: Fase activa
+      debates: Debats
+      debates_explanation: Anem a conèixer, debatre i compartir el que pensem que és important per a la nostra ciutat.
+      highlighted_processes: Processos ressaltats
+      how_to_participate: Com participo en un procés?
+      meetings: Llistat de trobades
+      meetings_explanation: Anem a conèixer, debatre i compartir el que pensem que és important per a la nostra ciutat.
+      more_info: Més informació
+      proposals: Propostes
+      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
       welcome: Benvingut/da a %{organization}!
+  views:
+    pagination:
+      first: "&laquo; Primera"
+      last: Última &raquo;
+      next: Següent &rsaquo;
+      previous: "&lsaquo; Anterior"
+      truncate: "&hellip;"

data/config/locales/en.yml

@@ -15,6 +15,9 @@ en:
   booleans:
     'false': 'No'
     'true': 'Yes'
+  carrierwave:
+    errors:
+      image_too_big: The image is too big
   decidim:
     account:
       authorizations:
@@ -60,6 +63,11 @@ en:
     menu:
       home: Home
       processes: Processes
+    participatory_processes:
+      documents:
+        related_documents: Related documents
+      photos:
+        related_photos: Related photos
   devise:
     mailer:
       invitation_instructions:
@@ -72,18 +80,24 @@ en:
         someone_invited_you: Someone has invited you to %{application}, you can accept it through the link below.
       organization_admin_invitation_instructions:
         subject: You've been invited to admin %{organization}
+      password_change:
+        greeting: Hello %{recipient}!
+        message: We're contacting you to notify you that your password has been changed.
+        subject: Password Changed
+  errors:
+    messages:
+      file_size_is_less_than_or_equal_to: file size must be less than or equal to %{count}
+      invalid_manifest: Invalid manifest
+      invalid_participatory_process: Invalid participatory process
+      nesting_too_deep: can't be inside of a subcategory
   layouts:
     decidim:
       footer:
-        about: About Decidim
-        accessibility: Accessibility
         made_with_open_source: Website made with <a target="_blank" href="https://github.com/AjuntamentdeBarcelona/decidim">open-source software</a>.
-        terms_of_use: Terms Of Use
       header:
         close_menu: Close menu
         navigation: Navigation
         sign_in: Sign In
-        sign_out: Sign out
         sign_up: Sign Up
       participatory_processes:
         index:
@@ -101,6 +115,9 @@ en:
           active_step: 'Current step:'
           more_info: More info
           take_part: Take part
+      user_menu:
+        profile: My account
+        sign_out: Sign out
   locales:
     ca: Català
     en: English
@@ -114,5 +131,23 @@ en:
       title: There was a problem with our server
       try_later: Please try again later.
     home:
+      active_step: Active step
+      debates: Debates
+      debates_explanation: Let's meet, debate and share what we think it's important for our city.
+      highlighted_processes: Highlighted processes
+      how_to_participate: How do I take part in a process?
+      meetings: Meetings
+      meetings_explanation: Let's meet, debate and share what we think it's important for our city.
+      more_info: More info
+      proposals: Proposals
+      proposals_explanation: Open space for citizen proposals about what kind of city we want to live in.
       register: Register
+      see_all_processes: See all processes
       welcome: Welcome to %{organization}!
+  views:
+    pagination:
+      first: "&laquo; First"
+      last: Last &raquo;
+      next: Next &rsaquo;
+      previous: "&lsaquo; Prev"
+      truncate: "&hellip;"