decidim-core 0.0.3 → 0.0.5

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

@@ -13,7 +13,7 @@
     <div class="columns large-6 medium-10 medium-centered">
       <div class="card">
         <div class="card__content">
-          <%= form_for(@form, as: resource_name, url: omniauth_registrations_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
+          <%= decidim_form_for(@form, as: resource_name, url: omniauth_registrations_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
             <div class="user-person">
               <div class="field">
                 <%= f.text_field :name, help_text: t(".username_help"), label: t(".username_help") %>

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

@@ -10,7 +10,7 @@
     <div class="columns medium-7 large-5 medium-centered">
       <div class="card">
         <div class="card__content">
-          <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: "register-form new_user" }) do |f| %>
+          <%= decidim_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: "register-form new_user" }) do |f| %>
             <%= f.hidden_field :reset_password_token %>
 
             <div class="field">

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t("devise.passwords.new.forgot_your_password")) %>
+
 <main class="wrapper">
 <div class="row collapse">
   <div class="row collapse">
@@ -10,7 +12,7 @@
     <div class="columns medium-7 large-5 medium-centered">
       <div class="card">
         <div class="card__content">
-          <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, class: "register-form new_user" }) do |f| %>
+          <%= decidim_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, class: "register-form new_user" }) do |f| %>
             <div class="field">
               <%= f.email_field :email, autofocus: true %>
             </div>

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

@@ -1,7 +1,8 @@
 <h2><%= t("devise.registrations.edit.title", resource: resource_class.model_name.human) %></h2>
 
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+<%= decidim_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
   <%= devise_error_messages! %>
+  <%= invisible_captcha %>
 
   <div class="field">
     <%= f.email_field :email %>

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".sign_up")) %>
+
 <main class="wrapper">
 <div class="row collapse">
   <div class="row collapse">
@@ -17,7 +19,9 @@
     <div class="columns large-6 medium-10 medium-centered">
       <div class="card">
         <div class="card__content">
-          <%= form_for(@form, as: resource_name, url: registration_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
+          <%= decidim_form_for(@form, as: resource_name, url: registration_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
+            <%= invisible_captcha %>
+
             <fieldset class="text-center">
               <legend class="text-center heading5"><%= t(".sign_up_as.legend") %></legend>
               <%= f.collection_radio_buttons :sign_up_as, [["user", t(".sign_up_as.user")], ["user_group", t(".sign_up_as.user_group") ]], :first, :last %>
@@ -55,7 +59,15 @@
               </div>
             </div>
 
+            <p class="lopd-text">
+              <%= strip_tags(translated_attribute(terms_and_conditions_page.content)) %>
+            </p>
+
             <fieldset>
+              <div class="field">
+                <%= f.check_box :newsletter_notifications, label: t(".newsletter_notifications") %>
+              </div>
+
               <div class="field">
                 <%= f.check_box :tos_agreement, label: t(".tos_agreement", link: link_to(t(".terms"), page_path("terms-and-conditions"))) %>
               </div>

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t("devise.sessions.new.sign_in")) %>
+
 <main class="wrapper">
   <div class="row collapse">
     <div class="row collapse">
@@ -13,7 +15,7 @@
       <div class="columns large-6 medium-centered">
         <div class="card">
           <div class="card__content">
-            <%= form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
+            <%= decidim_form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
               <div>
                 <div class="field">
                   <%= f.email_field :email, autofocus: true  %>

data/app/views/decidim/newsletter_mailer/newsletter.html.erb

@@ -0,0 +1,5 @@
+<%== @body %>
+
+<% content_for :note do %>
+  <%== t ".note", organization_name: @organization.name, link: decidim.notifications_settings_url(host: @organization.host) %>
+<% end %>

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

@@ -0,0 +1,26 @@
+<div class="row">
+  <%= form_for(@notifications_settings, url: notifications_settings_path, method: :put, class: "user-form") do |f| %>
+    <div class="switch tiny switch-with-label comments_notifications">
+      <label>
+        <%= f.check_box :comments_notifications, label: false, class: "switch-input" %>
+        <span class="switch-paddle"></span>
+        <span class="switch-label"><%= t('.comments_notifications') %></span>
+      </label>
+    </div>
+    <div class="switch tiny switch-with-label replies_notifications">
+      <label>
+        <%= f.check_box :replies_notifications, label: false, class: "switch-input" %>
+        <span class="switch-paddle"></span>
+        <span class="switch-label"><%= t('.replies_notifications') %></span>
+      </label>
+    </div>
+    <div class="switch tiny switch-with-label newsletter_notifications">
+      <label>
+        <%= f.check_box :newsletter_notifications, label: false, class: "switch-input" %>
+        <span class="switch-paddle"></span>
+        <span class="switch-label"><%= t('.newsletter_notifications') %></span>
+      </label>
+    </div>
+    <%= f.submit t(".update_notifications_settings"), disable_with: true %>
+  <% end %>
+</div>

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

@@ -0,0 +1,34 @@
+<% add_decidim_page_title(t(".title")) %>
+
+<main class="wrapper">
+  <div class="row column">
+    <h1 class="heading1 page-title"><%= t ".title" %></h1>
+  </div>
+  <div class="row">
+    <div class="columns large-8">
+      <div class="card card--list">
+        <% @pages.each do |page| %>
+          <div class="card--list__item">
+            <div class="card--list__text">
+              <div>
+                <%= link_to page_path(page), class: "card__link" do %>
+                  <h6 class="card--list__heading heading6">
+                    <%= translated_attribute page.title %>
+                  </h6>
+                  <span class="text-small">
+                    <%= truncate strip_tags(translated_attribute(page.content)), length: 100 %>
+                  </span>
+                <% end %>
+              </div>
+            </div>
+            <div class="card--list__data">
+              <%= link_to page_path(page), class: "card--list__data__icon" do %>
+                <%= icon "chevron-right" %>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</main>

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

@@ -1,4 +1,4 @@
-<% content_for :meta_title, t(".title") %>
+<% add_decidim_page_title(t(".title")) %>
 
 <main class="steps">
   <div class="row column">

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

@@ -1,7 +1,9 @@
 <div class="column">
   <article class="card card--process">
-    <div class="card__image-top"
-      style="background-image:url(<%= participatory_process.hero_image.url %>)"></div>
+    <%= link_to participatory_process_path(participatory_process), class: "card__link" do %>
+      <div class="card__image-top"
+           style="background-image:url(<%= participatory_process.hero_image.url %>)"></div>
+    <% end %>
     <div class="card__content">
       <%= link_to participatory_process_path(participatory_process), class: "card__link" do %>
         <h4 class="card__title"><%= translated_attribute participatory_process.title %></h4>

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

@@ -13,7 +13,7 @@
     </div>
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card--full__image"
-           style="background-image:url(<%= promoted_process.hero_image.url %>">
+           style="background-image:url(<%= promoted_process.hero_image.url %>)">
         <div class="card__content row collapse">
           <div class="large-6 large-offset-6 columns">
             <%= link_to participatory_process_path(promoted_process), class: "button expanded button--sc" do %>

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

@@ -1,10 +1,10 @@
-<% content_for :meta_title, t(".title") %>
+<% provide :meta_title, t(".title") %>
 
 <main class="wrapper">
-  <% if promoted_processes.any? %>
+  <% if promoted_participatory_processes.any? %>
     <section id ="highlighted-processes" class="row section">
       <h1 class="section-heading"><%= t(".promoted_processes", scope: "layouts") %></h1>
-      <%= render partial: "promoted_process", collection: promoted_processes, as: :promoted_process %>
+      <%= render partial: "promoted_process", collection: promoted_participatory_processes, as: :promoted_process %>
     </section>
   <% end %>
 

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

@@ -1,6 +1,6 @@
-<% content_for :meta_description, translated_attribute(current_participatory_process.short_description) %>
-<% content_for :meta_title, translated_attribute(current_participatory_process.title) %>
-<% content_for :meta_url, participatory_process_url(current_participatory_process) %>
+<% 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) %>
 
 <div class="row column">
   <div class="row">
@@ -28,17 +28,38 @@
           </div>
         <% end %>
 
-        <% if current_participatory_process.developer_group.present? %>
+        <% if translated_attribute(current_participatory_process.developer_group).present? %>
           <div class="definition-data__item developer-group">
             <span class="definition-data__title"><%= t(".developer_group") =%></span>
-              <%== current_participatory_process.developer_group %>
+              <%== translated_attribute(current_participatory_process.developer_group) %>
           </div>
         <% end %>
 
-        <% if translated_attribute(current_participatory_process.domain).present? %>
-          <div class="definition-data__item domain">
-            <span class="definition-data__title"><%= t(".domain") =%></span>
-              <%== translated_attribute(current_participatory_process.domain) %>
+        <% if translated_attribute(current_participatory_process.local_area).present? %>
+          <div class="definition-data__item local_area">
+            <span class="definition-data__title"><%= t(".local_area") =%></span>
+              <%== translated_attribute(current_participatory_process.local_area) %>
+          </div>
+        <% end %>
+
+         <% if translated_attribute(current_participatory_process.target).present? %>
+          <div class="definition-data__item target">
+            <span class="definition-data__title"><%= t(".target") =%></span>
+              <%== translated_attribute(current_participatory_process.target) %>
+          </div>
+        <% end %>
+
+         <% if translated_attribute(current_participatory_process.participatory_scope).present? %>
+          <div class="definition-data__item participatory_scope">
+            <span class="definition-data__title"><%= t(".participatory_scope") =%></span>
+              <%== translated_attribute(current_participatory_process.participatory_scope) %>
+          </div>
+        <% end %>
+
+        <% if translated_attribute(current_participatory_process.participatory_structure).present? %>
+          <div class="definition-data__item participatory_structure">
+            <span class="definition-data__title"><%= t(".participatory_structure") =%></span>
+              <%== translated_attribute(current_participatory_process.participatory_structure) %>
           </div>
         <% end %>
       </div>

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

@@ -0,0 +1,55 @@
+<% if current_user %>
+  <% status = action_authorization(action) %>
+  <% if !status.ok? %>
+    <div class="reveal" id="<%= action.underscore%>AuthorizationModal" data-reveal>
+      <button class="close-button" data-close aria-label="Close modal"
+              type="button">
+        <span aria-hidden="true">&times;</span>
+      </button>
+      <% if status.code == :incomplete %>
+        <div class="reveal__header incomplete-authorization">
+          <h3 class="reveal__title"><%= t('.incomplete.title') %></h3>
+        </div>
+        <p><%= t ".incomplete.explanation", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers") %></p>
+        <ul>
+          <% status.data[:fields].each do |field| %>
+            <li><strong><%= t("#{status.handler_name}.fields.#{field}", scope: "decidim.authorization_handlers") %></strong></li>
+          <% end %>
+        </ul>
+        <div class="row">
+          <div class="columns medium-8 medium-offset-2">
+            <%= link_to t('.incomplete.reauthorize'), authorize_action_path(action), class: "button expanded" %>
+          </div>
+        </div>
+        <div class="text-center">
+          <button class="link" data-close><%=t ".incomplete.cancel" %></button>
+        </div>
+      <% elsif status.code == :missing %>
+        <div class="reveal__header missing-authorization">
+          <h3 class="reveal__title"><%= t('.missing.title') %></h3>
+        </div>
+        <p><%= t ".missing.explanation", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers") %></p>
+        <div class="row">
+          <div class="columns medium-8 medium-offset-2">
+            <%= link_to t('.missing.authorize', authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers")), authorize_action_path(action), class: "button expanded" %>
+          </div>
+        </div>
+      <% elsif status.code == :invalid %>
+        <div class="reveal__header invalid-authorization">
+          <h3 class="reveal__title"><%= t('.unauthorized.title') %></h3>
+        </div>
+        <p><%= t ".unauthorized.explanation", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers") %></p>
+        <ul>
+          <% status.data[:fields].each do |field, value| %>
+            <li><strong><%= t(".unauthorized.invalid", field: t("#{status.handler_name}.fields.#{field}", scope: "decidim.authorization_handlers")) %></strong></li>
+          <% end %>
+        </ul>
+        <div class="row">
+          <div class="columns medium-8 medium-offset-2">
+            <button class="button expanded" data-close><%=t ".unauthorized.ok" %></button>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>

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

@@ -8,7 +8,7 @@
   </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| %>
+      <%= decidim_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  %>
@@ -21,10 +21,9 @@
           <%= 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>
+</div>

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

@@ -0,0 +1,15 @@
+<div class="row collapse order-by">
+  <div class="order-by__dropdown">
+    <span class="order-by__text"><%= t("#{i18n_scope}.label") %></span>
+    <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
+      <li>
+        <%= order_link order, i18n_scope: i18n_scope %>
+        <ul class="menu">
+          <% orders.each do |order_name| %>
+          <li><%= order_link order_name, i18n_scope: i18n_scope %></li>
+          <% end %>
+        </ul>
+      </li>
+    </ul>
+  </div>
+</div>

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

@@ -0,0 +1,33 @@
+<div class="text-center">
+  <button class="share-link link text-center" data-open="processShare">
+    <%= t(".share") %>
+    <%= icon "share", class: "icon--after"%>
+  </button>
+</div>
+<div class="reveal" id="processShare" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t(".share") %>:</h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </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)) %>
+    <a class="button secondary" data-open="urlShare">
+      <%= icon "link-intact" %>
+    </a>
+  </div>
+</div>
+<div class="reveal" id="urlShare" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t(".share_link") %>:</h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <h4 class="heading4"><%= "#{content_for(:meta_url)}" %></h4>
+</div>

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: @resource.organization.name) %></p>p>
+<p><%= t("devise.mailer.invitation_instructions.someone_invited_you", application: @resource.organization.name) %></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/layouts/decidim/_application.html.erb

@@ -1,7 +1,16 @@
+<% add_decidim_meta_tags({
+  description: strip_tags(translated_attribute(current_organization.description)),
+  title: current_organization.name,
+  url: request.original_url,
+  twitter_handler: current_organization.twitter_handler,
+  image_url: current_organization.homepage_image.url
+}) %>
+
 <!DOCTYPE html>
 <html class="no-js">
   <head>
     <title><%= decidim_page_title %></title>
+
     <%= csrf_meta_tags %>
 
     <%= render partial: 'layouts/decidim/meta' %>
@@ -13,8 +22,11 @@
   </head>
 
   <body>
+    <%= render partial: 'layouts/decidim/cookie_warning' %>
     <%= render partial: 'layouts/decidim/header' %>
     <%= yield %>
     <%= render partial: 'layouts/decidim/footer' %>
+
+    <%= render partial: "decidim/shared/login_modal" %>
   </body>
 </html>

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

@@ -0,0 +1,8 @@
+<% unless cookies_accepted? %>
+  <div class="cookie-warning">
+    <%= t('.description_html', link: link_to(t('.link_label'), decidim.page_path('terms-and-conditions'), target: "_blank")) %>
+    <div class="cookie-warning__action">
+      <%= button_to t('.ok'), decidim.accept_cookies_path, method: :get, remote: true, class: "button tiny cookie-bar__button" %>
+    </div>
+  </div>
+<% end %>

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

@@ -1,6 +1,11 @@
         </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? %>
@@ -11,6 +16,7 @@
             </ul>
             <% end %>
           </div>
+          <%= render partial: 'layouts/decidim/social_media_links' %>
         </div>
       </div>
       <div class="mini-footer">