decidim-core 0.0.2 → 0.0.3

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

@@ -16,7 +16,7 @@
           <%= 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("devise.registrations.new.username_help") %>
+                <%= f.text_field :name, help_text: t(".username_help"), label: t(".username_help") %>
               </div>
             </div>
 

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

@@ -38,7 +38,7 @@
             </div>
 
             <div class="field">
-              <%= f.password_field :password_confirmation, autocomplete: "off" %>
+              <%= f.password_field :password_confirmation %>
             </div>
 
             <div class="user-group-fields">

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

@@ -0,0 +1,24 @@
+<div class="row column">
+  <section class="section">
+    <div class="card card--list">
+      <% @user_groups.each do |user_group| %>
+        <div class="card--list__item">
+          <div class="card--list__text">
+            <div>
+              <h5 class="card--list__heading">
+                <%= user_group.name %>
+              </h5>
+              
+              <span class="text-small"><%= l(user_group.created_at, format: :long) %></span>
+              
+              <% if user_group.verified? %>
+                <span class="success label"><%= t('.verified') %></span>                
+              <% else %>
+                <span class="warning label"><%= t('.not_verified') %></span>
+              <% end %>             
+            </div>
+          </div>
+        </div>
+      <% end %>
+    </div>
+</div>

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

@@ -7,7 +7,7 @@
       <span class="timeline__date text-small">
         <%= participatory_process_step_dates(participatory_process_step) %>
       </span>
-      <h6 class="timeline__title heading6"><%= t('.info') %></h6>
+      <h6 class="timeline__title heading6"><%= translated_attribute(participatory_process_step.title) %></h6>
     </div>
     <div class="timeline__content">
       <%= translated_attribute(participatory_process_step.description).html_safe %>

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

@@ -1,4 +1,6 @@
-<main class="wrapper steps">
+<% content_for :meta_title, t(".title") %>
+
+<main class="steps">
   <div class="row column">
     <div class="row">
       <div class="columns mediumlarge-9 large-7">

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

@@ -1,12 +1,12 @@
 <div class="column">
   <article class="card card--process">
     <div class="card__image-top"
-      style="background-image:url(<%= participatory_process.banner_image.url %>)"></div>
+      style="background-image:url(<%= participatory_process.hero_image.url %>)"></div>
     <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>
       <% end %>
-      <p class="card__desc"><%== translated_attribute(participatory_process.short_description) %></p>
+      <p class="card__desc"><%== html_truncate(translated_attribute(participatory_process.short_description), length: 630, separator: '...') %></p>
     </div>
     <div class="card__footer">
       <div class="card__support">

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

@@ -5,7 +5,7 @@
         <%= link_to participatory_process_path(promoted_process), class: "card__link" do %>
           <h2 class="card__title"><%= translated_attribute promoted_process.title %></h2>
         <% end %>
-        <%== html_truncate(translated_attribute(promoted_process.description), length: 630, separator: ' ') %>
+        <%== html_truncate(translated_attribute(promoted_process.short_description), length: 630, separator: '...') %>
         <%= link_to participatory_process_path(promoted_process), class: "button secondary small hollow card__button" do %>
           <%= t(".more_info", scope: "layouts") %>
         <% end %>

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

@@ -1,3 +1,5 @@
+<% content_for :meta_title, t(".title") %>
+
 <main class="wrapper">
   <% if promoted_processes.any? %>
     <section id ="highlighted-processes" class="row section">

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

@@ -1,3 +1,7 @@
+<% 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) %>
+
 <div class="row column">
   <div class="row">
     <div class="columns medium-7 mediumlarge-8">
@@ -8,13 +12,38 @@
         <%== translated_attribute(current_participatory_process.description) %>
       </div>
     </div>
-  </div>
-</div>
-<% if current_participatory_process.attachments.any? %>
-  <div class="row attachments">
-    <div class="columns large-8">
-      <%= render partial: "documents", locals: { documents: current_participatory_process.documents } %>
-      <%= render partial: "photos", locals: { photos: current_participatory_process.photos } %>
+    <div class="section columns medium-5 mediumlarge-4 large-3">
+      <div class="card extra definition-data">
+        <% if translated_attribute(current_participatory_process.scope).present? %>
+          <div class="definition-data__item scope">
+            <span class="definition-data__title"><%= t(".scope") =%></span>
+              <%== translated_attribute(current_participatory_process.scope) %>
+          </div>
+        <% end %>
+
+        <% if current_participatory_process.end_date.present? %>
+          <div class="definition-data__item end-date">
+            <span class="definition-data__title"><%= t(".end_date")=%></span>
+              <%== l(current_participatory_process.end_date, format: :long) %>
+          </div>
+        <% end %>
+
+        <% if 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 %>
+          </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) %>
+          </div>
+        <% end %>
+      </div>
     </div>
   </div>
-<% end %>
+
+  <%= attachments_for current_participatory_process %>
+</div>

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

@@ -1,13 +1,15 @@
 <!DOCTYPE html>
-<html>
+<html class="no-js">
   <head>
     <title><%= decidim_page_title %></title>
     <%= csrf_meta_tags %>
 
-    <%= 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' %>
+
+    <%= favicon %>
+    <%= stylesheet_link_tag    'application', media: 'all' %>
+    <%= javascript_include_tag 'application' %>
   </head>
 
   <body>

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

@@ -19,9 +19,9 @@
             creates a sticky footer-->
         <!-- Topbar -->
         <div class="title-bar">
-          <div class="row topbar">
+          <div class="row column topbar">
             <div class="logo-wrapper">
-              <%= render partial: "layouts/decidim/logo" %>
+              <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>
             </div>
             <%= render partial: "layouts/decidim/language_chooser" %>
             <div class="hide-for-medium topbar__menu">
@@ -34,7 +34,7 @@
                 <ul class="dropdown menu" data-dropdown-menu>
                   <li class="is-dropdown-submenu-parent show-for-medium">
                     <%= link_to current_user.name, decidim.account_path %>
-                    <ul class="menu is-dropdown-subeenu js-append usermenu-off-canvas">
+                    <ul class="menu is-dropdown-submenu js-append usermenu-off-canvas">
                       <%= render partial: "layouts/decidim/user_menu" %>
                     </ul>
                     <span data-set="nav-login-holder" class="show-for-medium">
@@ -58,7 +58,7 @@
         </div>
         <div class="show-for-medium" data-set="nav-holder">
           <nav class="navbar js-append">
-            <div class="row">
+            <div class="row column">
               <ul class="main-nav">
                 <li>
                   <%= active_link_to t("menu.home", scope: "decidim"), decidim.root_path, active: :exact, class: "main-nav__link", class_active: "main-nav__link--active" %>

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

@@ -1,19 +1,31 @@
-<%= link_to root_path do %>
-  <% 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-->
+<% if organization %>
+  <%= link_to root_url(host: organization.host) do %>
+    <% if organization.logo.present? %>
+      <%= image_tag organization.logo.medium.url %>
+    <% else %>
+      <span><%= 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>
+    <% end %>
   <% end %>
+<% else %>
+  <%= Decidim.application_name %>
 <% end %>

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

@@ -19,9 +19,21 @@
   <% if current_participatory_process.features.any? %>
     <div class="row column">
       <div class="process-nav">
-        <div class="row column process-nav__content">
+        <button class="process-nav__trigger hide-for-medium"  data-toggle="process-nav-content">
+          <%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t('.unfold'), role: "img" %>
+            <div class="process-nav__link">
+            <%  if self.try(:current_feature) %>
+                <%= feature_icon(current_feature) %>
+                <%= translated_attribute(current_feature.name) %>
+            <% else %>
+                <%= icon "process" %>
+                <%= t ".process_menu_item" %>
+            <% end %>
+            </div>
+        </button>
+        <div class="row column process-nav__content" id="process-nav-content" data-toggler=".is-active">
           <ul>
-            <li>
+            <li class="<%= "is-active" if is_active_link?(decidim.participatory_process_path(current_participatory_process), :exclusive) %>">
               <%= 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" %>
@@ -29,7 +41,7 @@
             </li>
 
             <% current_participatory_process.features.each do |feature| %>
-              <li>
+              <li class="<%= "is-active" if is_active_link?(decidim.feature_path(current_participatory_process, feature), :inclusive) %>">
                 <%= active_link_to decidim.feature_path(current_participatory_process, feature), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>
                   <%= feature_icon(feature) %>
 

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

@@ -13,7 +13,7 @@
             <% 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>
+        <span class="phase-current"><%= t(".step", current: (participatory_process.active_step.position + 1), total: current_participatory_process.steps.count) %></span>
       </div>
       <div>
         <span class="phase-title"><%= translated_attribute participatory_process.active_step.title %></span>

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

@@ -1,2 +1,5 @@
 <li><%= link_to t(".profile"), decidim.account_path %></li>
+<% if can? :read, :admin_dashboard %>
+  <li><%= link_to t(".admin_dashboard"), decidim_admin.root_path %></li>
+<% end %>
 <li><%= link_to t(".sign_out"), decidim.destroy_user_session_path, method: :delete, class: "sign-out-link" %></li>

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

@@ -19,7 +19,7 @@
                   <tr>
                     <th class="small-12 first columns decidim-bar">
                       <center class="decidim-logo">
-                        <%= link_to @organization.name, root_url(host: @organization.host) %>
+                        <%= render partial: "layouts/decidim/logo", locals: { organization: @organization } %>
                       </center>
                     </th>
                     <th class="expander"></th>

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

@@ -0,0 +1,35 @@
+<%= render "layouts/decidim/application" do %>
+  <main class="wrapper">
+    <div class="row collapse">
+      <div class="columns">
+        <h1 class="heading1 user-header"><%= t("title", scope: "layouts.decidim.user_profile") %></h1>
+      </div>
+    </div>
+    <div class="row collapse">
+      <div class="main-container">
+        <div class="row collapse main-container--side-panel">
+          <div class="columns medium-4 large-3">
+            <div class="side-panel">
+              <ul class="tabs vertical side-panel__tabs" id="user-settings-tabs">
+                <%= user_profile_tab t("account", scope: "layouts.decidim.user_profile"), account_path %>
+                <% if available_authorization_handlers.any? %>
+                  <%= user_profile_tab t("authorizations", scope: "layouts.decidim.user_profile"), authorizations_path %>
+                <% end %>
+                <% if user_groups.any? %>
+                  <%= user_profile_tab t("user_groups", scope: "layouts.decidim.user_profile"), own_user_groups_path %>
+                <% end %>
+              </ul>
+            </div>
+          </div>
+          <div class="columns medium-8 large-9">
+            <div class="main-container__content">
+              <div class="tabs-content vertical" aria-hidden="false">
+                <%= yield %>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </main>
+<% end %>

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

@@ -1,147 +1,13 @@
-<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">
-          <% 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>
-    <div class="row">
-      <div class="columns small-centered small-6 medium-4 mediumlarge-3">
-        <%= link_to t('.register'), new_user_registration_path, class: "hero-cta button expanded large button--sc" %>
-      </div>
-    </div>
-  </div>
-</section>
+<%= render partial: 'pages/home/hero' %>
 
 <% 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>
+  <%= render partial: 'pages/home/sub_hero' %>
 <% 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">
-        <% 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 %>
-                <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>
+<%= render partial: 'pages/home/highlighted_processes' %>
 
-<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>   
+<%= render partial: 'pages/home/extended' %>
 
 <% 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>
+  <%= render partial: 'pages/home/statistics' %>
 <% end %>