decidim-core 0.0.5 → 0.0.6

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

@@ -0,0 +1,11 @@
+<% provide :meta_title, t(".title") %>
+
+<main class="wrapper">
+  <section id="processes-grid" class="section row collapse">
+    <h1 class="section-heading"><%= t(".group_participatory_processes", group: translated_attribute(group.name)) %></h1>
+    <%= render partial: "decidim/participatory_processes/order_by_processes" %>
+    <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
+      <%= render participatory_processes || render(partial: "no_processes_yet") %>
+    </div>
+  </section>
+</main>

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

@@ -11,7 +11,7 @@
   <section id="processes-grid" class="section row collapse">
     <%= render partial: "order_by_processes" %>
     <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
-      <%= render(participatory_processes) || render(partial: "no_processes_yet") %>
+      <%= render collection || render(partial: "no_processes_yet") %>
     </div>
   </section>
 </main>

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

@@ -1,6 +1,10 @@
-<% provide :meta_description, translated_attribute(current_participatory_process.short_description) %>
-<% provide :meta_title, translated_attribute(current_participatory_process.title) %>
-<% provide :meta_url, participatory_process_url(current_participatory_process) %>
+<% add_decidim_meta_tags({
+  image_url: current_participatory_process.hero_image.url,
+  description: translated_attribute(current_participatory_process.short_description),
+  title: translated_attribute(current_participatory_process.title),
+  url: participatory_process_url(current_participatory_process),
+  twitter_handler: current_organization.twitter_handler
+}) %>
 
 <div class="row column">
   <div class="row">
@@ -14,10 +18,10 @@
     </div>
     <div class="section columns medium-5 mediumlarge-4 large-3">
       <div class="card extra definition-data">
-        <% if translated_attribute(current_participatory_process.scope).present? %>
+        <% if translated_attribute(current_participatory_process.meta_scope).present? %>
           <div class="definition-data__item scope">
             <span class="definition-data__title"><%= t(".scope") =%></span>
-              <%== translated_attribute(current_participatory_process.scope) %>
+              <%== translated_attribute(current_participatory_process.meta_scope) %>
           </div>
         <% end %>
 
@@ -66,5 +70,14 @@
     </div>
   </div>
 
+  <div class="row">
+    <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
+      <%= render partial: "decidim/shared/share_modal" %>
+    </div>
+  </div>
+
   <%= attachments_for current_participatory_process %>
 </div>
+
+<%= javascript_include_tag "decidim/proposals/social_share" %>
+<%= stylesheet_link_tag "decidim/proposals/social_share" %>

data/app/views/decidim/reported_mailer/hide.html.erb

@@ -0,0 +1,5 @@
+<p><%= t(".hello", name: @user.name) %></p>
+
+<p>
+  <%= t(".report_html", { content: reported_content.html_safe }) %>
+</p>

data/app/views/decidim/reported_mailer/report.html.erb

@@ -0,0 +1,5 @@
+<p><%= t(".hello", name: @user.name) %></p>
+
+<p>
+  <%= t(".report_html", { content: reported_content.html_safe }) %>
+</p>

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

@@ -0,0 +1,9 @@
+<div class="address__details">
+  <% if geolocalizable.respond_to? :location %>
+    <strong><%== translated_attribute geolocalizable.location %></strong><br />
+  <% end %>
+  <span><%= geolocalizable.address %></span><br />
+  <% if geolocalizable.respond_to? :location_hints %>
+    <span><%== translated_attribute geolocalizable.location_hints %></span>
+  <% end %>
+</div>

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

@@ -0,0 +1,20 @@
+<div class="reveal flag-modal" id="flagModal" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t('.title') %></h3>
+    <button class="close-button" data-close aria-label="<%= t('.close') %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <% if reportable.reported_by? current_user %>
+    <p><%= t('.already_reported') %></p>
+  <% else %>
+    <p><%= t('.description') %></p>
+    <%= decidim_form_for form, url: url, method: :post do |f| %>
+      <%= f.collection_radio_buttons :reason, [[:spam, t('.spam')], [:offensive, t('.offensive')], [:does_not_belong, t('.does_not_belong', organization_name: current_organization.name)]], :first, :last do |builder| %>
+        <%= builder.label { builder.radio_button + builder.text } %>
+      <% end %>
+      <%= f.text_area :details, rows: 4 %>
+      <%= f.submit t(".report") %>
+    <% end %>
+  <% end %>
+</div>

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

@@ -12,11 +12,11 @@
     </button>
   </div>
   <div class="button-group text-center">
-  <%= social_share_button_tag(content_for(:meta_title),
-        url: content_for(:meta_url),
-        image: content_for(:meta_image_url),
-        desc: content_for(:meta_description),
-        via: content_for(:twitter_handler)) %>
+  <%= social_share_button_tag(decidim_page_title,
+        url: decidim_meta_url,
+        image: decidim_meta_image_url,
+        desc: h(decidim_meta_description),
+        via: decidim_meta_twitter_handler) %>
     <a class="button secondary" data-open="urlShare">
       <%= icon "link-intact" %>
     </a>

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

@@ -0,0 +1,17 @@
+<% if geolocalizable.address.present? %>
+  <div class="card card--secondary">
+    <div class="card__content address">
+      <div class="address__info">
+        <div class="address__icon">
+          <%= icon icon_name, width: 40, height: 70 %>
+        </div>
+        <%= render partial: "decidim/shared/address_details", locals: { geolocalizable: geolocalizable } %>
+      </div>
+      <% if Decidim.geocoder.present? %>
+        <div class="address__map">
+          <%= static_map_link(geolocalizable) %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+<% end %>

data/app/views/devise/mailer/invite_collaborator.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_collaborator.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/layouts/decidim/_application.html.erb

@@ -10,22 +10,15 @@
 <html class="no-js">
   <head>
     <title><%= decidim_page_title %></title>
-
-    <%= csrf_meta_tags %>
-
-    <%= render partial: 'layouts/decidim/meta' %>
-    <%= render partial: 'layouts/decidim/social_meta' %>
-
-    <%= favicon %>
-    <%= stylesheet_link_tag    'application', media: 'all' %>
-    <%= javascript_include_tag 'application' %>
+    <%= render partial: 'layouts/decidim/head' %>
   </head>
 
   <body>
     <%= render partial: 'layouts/decidim/cookie_warning' %>
-    <%= render partial: 'layouts/decidim/header' %>
-    <%= yield %>
-    <%= render partial: 'layouts/decidim/footer' %>
+
+    <%= render 'layouts/decidim/wrapper' do %>
+      <%= yield %>
+    <% end %>
 
     <%= render partial: "decidim/shared/login_modal" %>
   </body>

data/app/views/layouts/decidim/{_social_meta.html.erb → _head.html.erb}

@@ -1,3 +1,10 @@
+<%= csrf_meta_tags %>
+
+<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 %>
+
 <meta name="twitter:card" content="summary_large_image" />
 <meta name="twitter:site" content="@<%= decidim_meta_twitter_handler %>" />
 <meta name="twitter:title" content="<%= decidim_page_title %>" />
@@ -9,3 +16,9 @@
 <meta property="og:title" content="<%= decidim_page_title %>" />
 <meta property="og:description" content="<%= decidim_meta_description %>" />
 <meta property="og:image" content="<%= decidim_meta_image_url %>" />
+
+<%= favicon %>
+<%= stylesheet_link_tag    'application', media: 'all' %>
+<%= javascript_include_tag 'application' %>
+
+<%= render partial: 'layouts/decidim/head_extra' %>

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

@@ -0,0 +1,7 @@
+<%#
+This file is meant to be overriden by the app developers in order to
+include extra headers like tracking, error handling and such.
+
+Just copy your own version of the file under:
+`app/views/layouts/decidim/_head_extra.html.erb`
+%>

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

@@ -3,15 +3,21 @@
        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>
+          <h1 class="text-highlight heading2">
+            <%= translated_attribute(current_participatory_process.title) %>
+          </h1>
+        </div>
+        <div>
+          <h2 class="text-highlight heading-small">
+            <% if current_participatory_process.hashtag.present? %>
+              <span class="process-header__hashtag">
+                <%= link_to "##{current_participatory_process.hashtag}", "https://twitter.com/hashtag/#{current_participatory_process.hashtag}" %>
+              </span>
+            <% end %>
+            <%= translated_attribute(current_participatory_process.subtitle) %>
+          </h2>
+        </div>
       </div>
       <%= render partial: "layouts/decidim/process_header_steps", locals: { participatory_process: current_participatory_process } %>
     </div>

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

@@ -1,7 +1,7 @@
 <% if participatory_process.steps.any? %>
   <div class="columns mediumlarge-3">
-    <div class="process-header__phase">
-      <div class="process-header__progress">
+    <div class="process-header__phase process-header__phase--simple">
+      <div class="process-header__progress show-for-medium">
         <ol>
           <% past_step = true %>
           <% participatory_process.steps.each_with_index do |step, index| %>
@@ -21,7 +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" %>
+      <%= link_to t('.view_steps'), decidim.participatory_process_participatory_process_steps_path(current_participatory_process), class: "button tiny hollow show-for-medium" %>
     </div>
   </div>
 <% end %>

data/app/views/layouts/decidim/{_header.html.erb → _wrapper.html.erb}

@@ -1,22 +1,22 @@
 <div class="off-canvas-wrapper">
   <div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>
     <div class="off-canvas position-right hide-for-large" data-position="right"
-      id="offCanvas" data-off-canvas>
+         id="offCanvas" data-off-canvas>
       <!-- Close button -->
       <button class="close-button"
-        aria-label="<%= t(".close_menu") %>" type="button"
-        data-close>
+              aria-label="<%= t("layouts.decidim.header.close_menu") %>" type="button"
+              data-close>
         <span aria-hidden="true">&times;</span>
       </button>
       <!-- Menu -->
       <div class="hide-for-medium" data-set="nav-holder"></div>
       <div class="hide-for-medium usermenu-off-canvas-holder"
-        data-set="nav-login-holder"></div>
+           data-set="nav-login-holder"></div>
     </div>
     <div class="off-canvas-content" data-off-canvas-content>
       <div class="footer-separator">
         <!--separates the footer from the rest of the page,
-            creates a sticky footer-->
+             creates a sticky footer-->
         <!-- Topbar -->
         <div class="title-bar">
           <% if current_organization.official_img_header? %>
@@ -31,7 +31,7 @@
             <%= render partial: "layouts/decidim/language_chooser" %>
             <div class="hide-for-medium topbar__menu">
               <button type="button" data-toggle="offCanvas">
-                <%= icon "menu", aria_label: t('.navigation'), role: "img" %>
+                <%= icon "menu", aria_label: t('layouts.decidim.header.navigation'), role: "img" %>
               </button>
             </div>
             <% if current_user %>
@@ -53,10 +53,10 @@
               </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'), decidim.new_user_registration_path, class: "sign-up-link" %>
-                    <%= link_to t('.sign_in'), decidim.new_user_session_path, class: "sign-in-link" %>
-                  </div>
+                <div class="topbar__user__login js-append">
+                  <%= link_to t('layouts.decidim.header.sign_up'), decidim.new_user_registration_path, class: "sign-up-link" %>
+                  <%= link_to t('layouts.decidim.header.sign_in'), decidim.new_user_session_path, class: "sign-in-link" %>
+                </div>
               </div>
             <% end %>
           </div>
@@ -71,3 +71,40 @@
 
         <main>
           <%= display_flash_messages %>
+          <%= yield %>
+        </main>
+      </div><!-- /.footer-separator -->
+      <div class="main-footer">
+        <% if current_organization.official_img_footer? %>
+          <%= link_to  current_organization.official_url, class: "main-footer__badge" do %>
+            <%= image_tag current_organization.official_img_footer.url.to_s , alt: current_organization.name %>
+          <% end %>
+        <% end %>
+        <div class="row">
+          <div class="medium-8 large-6 large-offset-3 column main__footer__nav">
+            <% if current_organization.static_pages.any? %>
+              <ul class="footer-nav">
+                <% current_organization.static_pages.each do |page| %>
+                  <li><%= link_to translated_attribute(page.title), decidim.page_path(page) %></a></li>
+                <% end %>
+              </ul>
+            <% end %>
+          </div>
+          <%= render partial: 'layouts/decidim/social_media_links' %>
+        </div>
+      </div>
+      <div class="mini-footer">
+        <div class="row">
+          <div class="columns">
+            <a rel="license" class="cc-badge"
+               href="http://creativecommons.org/licenses/by-sa/4.0/"
+               target="_blank">
+              <%= image_tag("decidim/cc-badge.png", alt: "Creative Commons License" ) %>
+            </a>
+            <%= t('layouts.decidim.footer.made_with_open_source').html_safe %>
+          </div>
+        </div>
+      </div>
+    </div><!--/.off-canvas-content-->
+  </div><!--/.off-canvas-wrapper-inner-->
+</div><!--/.off-canvas-wrapper-->

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

@@ -1,6 +1,6 @@
 <section class="wrapper-home">
   <div class="row">
-    <h3 class="section-heading"><%= t(".processes_ending_soon") %></h3>
+    <h3 class="section-heading"><%= t(".active_processes") %></h3>
     <div class="row collapse">
       <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-3
                   large-up-4 card-grid">
@@ -34,4 +34,4 @@
       <%= link_to t(".see_all_processes"), participatory_processes_path, class: "button expanded hollow button--sc home-section__cta" %>
     </div>
   </div>
-</section>
+</section>

data/config/i18n-tasks.yml

@@ -93,6 +93,7 @@ ignore_unused:
   - activerecord.attributes.decidim/user.*
   - activerecord.models.decidim/user
   - activemodel.attributes.user.*
+  - activemodel.attributes.report.*
   - booleans.*
   - errors.messages.*
   - social_share_button.*
@@ -101,6 +102,8 @@ ignore_unused:
   - decidim.authorizations.first_login.actions.*
   - decidim.features.dummy.*
   - invisible_captcha.*
+  - decidim.participatory_processes.scopes.global
+  - decidim.participatory_processes.participatory_process_groups.none
 # - 'activerecord.attributes.*'
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'

data/config/locales/ca.yml

@@ -1,6 +1,8 @@
 ca:
   activemodel:
     attributes:
+      report:
+        details: Comentaris addicionals
       user:
         email: El teu email
         name: El teu nom
@@ -150,6 +152,10 @@ ca:
     pages:
       index:
         title: Més informació
+    participatory_process_groups:
+      show:
+        group_participatory_processes: Processos per a %{group}
+        title: Grup de processos participatius
     participatory_process_steps:
       index:
         process_steps: Fases del procés
@@ -157,6 +163,10 @@ ca:
     participatory_processes:
       index:
         title: Processos participatius
+      participatory_process_groups:
+        none: cap
+      scopes:
+        global: Àmbit global
       show:
         developer_group: Grup promotor
         end_date: Data de finalització
@@ -165,6 +175,19 @@ ca:
         participatory_structure: Estructura participativa
         scope: Àmbit
         target: A qui va dirigit?
+    reported_mailer:
+      hide:
+        hello: Hola %{name},
+        report_html: "<p>El següent contingut:</p>%{content}<p>ha estat amagat automàticament.</p>"
+        subject: Un contingut ha estat amagat automàticament
+      report:
+        hello: Hola %{name},
+        report_html: "<p>El següent contingut:</p>%{content}<p>ha estat denunciat.</p>"
+        subject: Un contingut ha estat denunciat
+    reports:
+      create:
+        error: S'ha produït un error en denunciar. Torna-ho a intentar.
+        success: La denúncia s'ha creat amb èxit i serà revisada per un administrador.
     shared:
       action_authorization_modal:
         incomplete:
@@ -181,9 +204,20 @@ ca:
           invalid: "%{field} no és vàlid."
           ok: D'acord
           title: Acció no autoritzada
+      flag_modal:
+        already_reported: Aquest contingut ja ha estat denunciat i serà revisat per un administrador.
+        close: Tancar
+        description: Aquest contingut no és apropiat?
+        does_not_belong: Conté activitat il·legal, amenaces de suïcidi, informació personal, o qualsevol altra cosa que creguis que no pertany a %{organization_name}.
+        offensive: Conté racisme, sexisme, insults, atacs personals, amenaces de mort, peticions de suïcidi o qualsevol forma de discurs d'odi.
+        report: Denuncia
+        spam: Conté "clickbait", publicitat o estafes.
+        title: Denuncia un problema
       login_modal:
         please_sign_in: Si us plau, inicia sessió
         sign_up: Donar-se d'alta
+      reference:
+        reference: 'Referència: %{reference}'
       share_modal:
         close_window: Tanca la finestra
         share: Compartir
@@ -205,6 +239,8 @@ ca:
         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}
+      invite_collaborator:
+        subject: Has estat convidat a col·laborar a %{organization}
       organization_admin_invitation_instructions:
         subject: Has estat convidat a gestionar %{organization}
       password_change:
@@ -238,6 +274,9 @@ ca:
         navigation: Navegació
         sign_in: Entra
         sign_up: Registra't
+      participatory_process_groups:
+        participatory_process_group:
+          browse: Explorar
       participatory_processes:
         index:
           promoted_processes: Processos destacats
@@ -298,8 +337,8 @@ ca:
         participate: Participa
         welcome: Benvingut a %{organization}!
       highlighted_processes:
+        active_processes: Processos actius
         active_step: Fase activa
-        processes_ending_soon: Processos que acaben aviat
         see_all_processes: Veure tots els processos
       statistics:
         headline: Estat actual de %{organization}