decidim-core 0.11.2 → 0.12.0.pre

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

@@ -1,5 +1,9 @@
 <% add_decidim_page_title(t(".sign_up")) %>
 
+<% content_for :devise_links do %>
+  <%= render "decidim/devise/shared/links" %>
+<% end %>
+
 <main class="wrapper">
 <div class="row collapse">
   <div class="row collapse">
@@ -17,13 +21,13 @@
 
   <div class="row">
     <div class="columns large-6 medium-10 medium-centered">
-      <div class="card">
-        <div class="card__content">
-          <%= decidim_form_for(@form, as: resource_name, url: registration_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
-            <%= invisible_captcha %>
 
+      <%= decidim_form_for(@form, as: resource_name, url: registration_path(resource_name), html: { class: "register-form new_user", id: "register-form" }) do |f| %>
+        <%= invisible_captcha %>
+        <div class="card">
+          <div class="card__content">
             <fieldset class="text-center">
-              <legend class="text-center heading5"><%= t(".sign_up_as.legend") %></legend>
+              <legend><%= 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 %>
             </fieldset>
 
@@ -64,30 +68,48 @@
                 <%= f.text_field :user_group_phone %>
               </div>
             </div>
+          </div>
+        </div>
 
-            <p class="lopd-text">
+        <div class="card" id="card__tos">
+          <div class="card__content">
+            <legend><%= t(".tos_title") %></legend>
+
+            <p class="tos-text">
               <%= strip_tags(translated_attribute(terms_and_conditions_page.content)) %>
             </p>
 
-            <fieldset>
-              <div class="field">
-                <%= f.check_box :newsletter, label: t(".newsletter"), checked: true %>
-              </div>
+            <div class="field">
+              <%= f.check_box :tos_agreement, label: t(".tos_agreement", link: link_to(t(".terms"), page_path("terms-and-conditions"))) %>
+            </div>
+          </div>
+        </div>
+
+        <div class="card" id="card__newsletter">
+          <div class="card__content">
+            <legend><%= t(".newsletter_title") %></legend>
 
+            <fieldset>
               <div class="field">
-                <%= f.check_box :tos_agreement, label: t(".tos_agreement", link: link_to(t(".terms"), page_path("terms-and-conditions"))) %>
+                <%= f.check_box :newsletter, label: t(".newsletter"), checked: @form.newsletter %>
               </div>
             </fieldset>
+          </div>
+        </div>
 
+        <div class="card">
+          <div class="card__content">
             <div class="actions">
               <%= f.submit t("devise.registrations.new.sign_up"), class: "button expanded" %>
             </div>
-          <% end %>
-          <%= render "decidim/devise/shared/links" %>
+            <%= yield :devise_links %>
+          </div>
         </div>
-      </div>
+      <% end %>
     </div>
   </div>
+
   <%= render "decidim/devise/shared/omniauth_buttons" %>
 </div>
 </main>
+<%= render "decidim/devise/shared/newsletter_modal" %>

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

@@ -0,0 +1,25 @@
+<div class="reveal" id="sign-up-newsletter-modal" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t(".title") %></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-10 medium-centered">
+      <p><%= t(".notice") %></p>
+    </div>
+    <div class="columns medium-10 medium-centered">
+      <div class="row">
+        <div class="columns medium-6">
+          <button type="buton" class="check-newsletter clear button secondary expanded" data-check=false><%= t(".buttons.uncheck") %></button>
+        </div>
+        <div class="columns medium-6">
+          <button type="buton" class="check-newsletter button expanded" data-check=true><%= t(".buttons.check") %></button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/decidim/follows/update_button.js.erb

@@ -1,3 +1,3 @@
-var $followResource = $("#follow-resource");
+var $followResource = $("#<%= dom_id(resource, :follow) %>");
 
-morphdom($followResource[0], "<%= j(render partial: "decidim/shared/follow_button", locals: { followable: resource } ).strip.html_safe %>");
+morphdom($followResource[0], "<%= j((cell "decidim/follow_button", resource, inline: @inline, context: { current_user: current_user }).to_s.strip.html_safe) %>");

data/app/views/decidim/messaging/conversations/_message.html.erb

@@ -1,7 +1,7 @@
 <article class="message">
   <div class="message__header">
     <div class="card__author author-data author-data--small">
-      <%= render "decidim/shared/author_reference", author: present(message.sender) %>
+      <%= cell "decidim/author", present(message.sender), context: {extra_classes: ["author-data--small"]} %>
 
       <time datetime="<%= message.created_at.utc %>">
         <%= message.friendly_created_at %>

data/app/views/{pages → decidim/pages}/decidim_page.html.erb

@@ -4,9 +4,12 @@
 ) %>
 
 <main class="wrapper">
+  <%= cell "decidim/tos_page", :announcement %>
+
   <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">
@@ -14,4 +17,6 @@
       </div>
     </div>
   </div>
+
+  <%= cell "decidim/tos_page", :sticky_form %>
 </main>

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

@@ -0,0 +1,17 @@
+<%= render partial: "decidim/pages/home/hero" %>
+
+<% if !translated_attribute(current_organization.description).blank? %>
+  <%= render partial: "decidim/pages/home/sub_hero" %>
+<% end %>
+
+<%= render partial: "decidim/pages/home/highlighted_content_banner" %>
+
+<%= render partial: "decidim/pages/home/highlighted_processes" %>
+
+<%= render partial: "decidim/pages/home/extended" %>
+
+<% if current_organization.show_statistics? %>
+  <%= render partial: "decidim/pages/home/statistics" %>
+<% end %>
+
+<%= render partial: "decidim/pages/home/footer_sub_hero" %>

data/app/views/decidim/profiles/_followers.html.erb

@@ -0,0 +1,5 @@
+<div class="row small-up-1 medium-up-2 card-grid">
+  <% collection.each do |follower| %>
+    <%= render partial: "user_follow", locals: { user: follower } %>
+  <% end %>
+</div>

data/app/views/decidim/profiles/_following.html.erb

@@ -0,0 +1,5 @@
+<div class="row small-up-1 medium-up-2 card-grid">
+  <% collection.each do |following| %>
+    <%= render partial: "user_follow", locals: { user: following } %>
+  <% end %>
+</div>

data/app/views/decidim/profiles/_user.html.erb

@@ -0,0 +1,59 @@
+<% present(user) do |profile_user| %>
+  <div class="card">
+    <%= image_tag profile_user.avatar_url(:big), class: "card__image card__image--larger" %>
+    <div class="card__content">
+      <h5>
+        <div><strong><%= profile_user.name %></strong></div>
+        <span class="text-small"><%= user.nickname %></span>
+        <% if !current_user || (current_user && current_user != user) %>
+          <span class="user-contact_link">
+            <%= link_to_current_or_new_conversation_with(user) %>
+          </span>
+        <% end %>
+      </h5>
+      <p><%= profile_user.about %></p>
+      <% if profile_user.personal_url.present? %>
+        <%= link_to html_truncate(profile_user.personal_url.gsub(%r{https?\:\/\/}, ""), length: 30), profile_user.personal_url %>
+      <% end %>
+    </div>
+    <% if profile_user.badge.present? %>
+      <div class="badge-card__content">
+        <span>
+          <%= icon profile_user.badge, class: "author__verified" %>
+        </span>
+        <span>
+          <%= translated_attribute(profile_user.officialized_as).presence || t("decidim.profiles.default_officialization_text") %>
+        </span>
+      </div>
+    <% end %>
+    <%= render_hook(:user_profile_bottom) %>
+    <div class="card__footer card__footer--transparent">
+      <div class="flex--cc p-s text-center">
+        <div class="mr-s">
+          <%= link_to profile_followers_path(nickname: user.nickname) do %>
+            <%= t("decidim.profiles.show.followers") %>
+            <h1 class="heading1"><%= profile_user.followers_count %></h1>
+          <% end %>
+        </div>
+        <div class="ml-s">
+          <%= link_to profile_following_path(nickname: user.nickname) do %>
+            <%= t("decidim.profiles.show.following") %>
+            <h1 class="heading1"><%= profile_user.following_count %></h1>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <% if current_user && current_user != user %>
+    <%= render partial: "decidim/shared/follow_button", locals: { followable: user } %>
+  <% elsif current_user == user %>
+    <div class="text-center">
+      <%= link_to decidim.account_path, class: "button" do %>
+        <span>
+          <%= t(".edit_profile") %>
+        </span>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>

data/app/views/decidim/profiles/_user_follow.erb

@@ -0,0 +1,32 @@
+<% present(user) do |profile_user| %>
+  <div class="column">
+    <article class="card card--member">
+      <div class="card__content">
+        <div class="card__header collapse">
+          <div class="author-data author-data--big">
+            <div class="author-data__main">
+              <div class="author author--flex">
+                <%= link_to profile_user.profile_path, class: "author__avatar" do %>
+                  <%= image_tag profile_user.avatar_url(:thumb) %>
+                <% end %>
+                <div>
+                  <div class="author__name--container">
+                    <%= link_to profile_user.name, profile_user.profile_path, class: "author__name"%>
+                    <% if profile_user.badge.present? %>
+                      <%= icon profile_user.badge, class: "author__verified" %>
+                    <% end %>
+                  </div>
+                  <%= link_to profile_user.nickname, profile_user.profile_path, class: "author__nickname"%>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="card__text card--picture-offset">
+          <p><%= html_truncate profile_user.about.to_s, length: 80 %></p>
+          <%= render partial: "decidim/shared/follow_button.html", locals: { followable: user } %>
+        </div>
+      </div>
+    </article>
+  </div>
+<% end %>

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

@@ -1,64 +1,37 @@
-<% add_decidim_page_title(user.nickname) %>
-
 <main class="wrapper">
-  <% present(user) do |profile_user| %>
-    <div class="user-header row collapse">
-      <div class="columns">
-        <div class="user-header__main">
-          <div class="user-header__avatar">
-            <%= image_tag profile_user.avatar_url(:big) %>
-          </div>
-
-          <h1 class="heading1 user-header__heading">
-            <strong><%= profile_user.name %></strong>
-            <div class="user-nickname">
-              <%= profile_user.nickname %>
-              <% if !current_user || (current_user && current_user != user) %>
-                <span class="user-contact_link">
-                  <%= link_to_current_or_new_conversation_with(user) %>
-                </span>
-              <% end %>
-            </div>
-
-            <% if current_user && current_user != user %>
-              <%= render partial: "decidim/shared/follow_button", locals: { followable: user } %>
-            <% end %>
-          </h1>
-
-        </div>
-      </div>
+  <div class="row">
+    <div class="columns medium-9 medium-offset-3">
+      <ul class="tabs" id="profile-tabs">
+        <% if current_user && current_user == user %>
+          <li class="tabs-title<%= " is-active" if active_content == "notifications" %>">
+            <%= aria_selected_link_to t(".notifications"), profile_notifications_path(nickname: user.nickname), aria_link_type: active_content == "notifications" %>
+          </li>
+        <% end %>
+        <li class="tabs-title<%= " is-active" if active_content == "following" %>">
+          <%= aria_selected_link_to t(".following"), profile_following_path(nickname: user.nickname), aria_link_type: active_content == "following" %>
+        </li>
+        <li class="tabs-title<%= " is-active" if active_content == "followers" %>">
+          <%= aria_selected_link_to t(".followers"), profile_followers_path(nickname: user.nickname), aria_link_type: active_content == "followers" %>
+        </li>
+      </ul>
     </div>
-
-    <% if profile_user.about.present? %>
-      <div class="row">
-        <strong><%= t(".about_me") %></strong>
-        <p><%= profile_user.about %></p>
-      </div>
-    <% end %>
-
-    <% if profile_user.personal_url.present? %>
-      <div class="row">
-        <strong><%= t(".personal_url") %></strong>
-        <p><%= link_to profile_user.personal_url, profile_user.personal_url %></p>
-      </div>
-    <% end %>
-
-    <% if profile_user.officialized? %>
-      <div class="row">
-        <div class="mediumlarge-6 large-6">
-          <div class="card">
-            <div class="badge-card__content">
-              <span>
-                <%= icon "verified-badge" %>
-              </span>
-
-              <span>
-                <%= translated_attribute(profile_user.officialized_as).presence || t("decidim.profiles.default_officialization_text") %>
-              </span>
-            </div>
-          </div>
+  </div>
+  <div class="row">
+    <div class="columns medium-3">
+      <%= render partial: "user", locals: { user: user } %>
+    </div>
+    <div class="columns medium-9">
+      <div class="tabs-content" data-tabs-content="profile-tabs">
+        <div class="tabs-panel is-active">
+          <% if active_content == "notifications" %>
+            <%= cell "decidim/notifications", current_user, context: { current_user: current_user } %>
+          <% elsif active_content == "following" %>
+            <%= cell "decidim/following", user, context: { current_user: current_user } %>
+          <% elsif active_content == "followers" %>
+            <%= cell "decidim/followers", user, context: { current_user: current_user } %>
+          <% end %>
         </div>
       </div>
-    <% end %>
-  <% end %>
+    </div>
+  </div>
 </main>

data/app/views/decidim/searches/_count.html.erb

@@ -0,0 +1 @@
+<%= t("decidim.search.results_found_for_term", count: @results.count, term: term) %>

data/app/views/decidim/searches/_filters.html.erb

@@ -0,0 +1,20 @@
+<%= filter_form_for filter do |form| %>
+  <div class="filters-controls">
+    <div class="filters__section">
+      <div class="filters__search">
+        <div class="input-group">
+          <%= form.search_field :term, label: false, class: "input-group-field", placeholder: t(".search") %>
+          <div class="input-group-button">
+            <button type="submit" class="button button--muted">
+              <%= icon "magnifying-glass", aria_label: t(".search") %>
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+
+      <%= form.collection_radio_buttons :resource_type,searchable_resources_as_options(t("all", scope: "decidim.search.filter")), :first, :last, legend_title: t("component", scope: "decidim.search.filter") %>
+
+      <%= scopes_picker_filter form, :decidim_scope_id %>
+  </div>
+<% end %>

data/app/views/decidim/searches/_filters_small_view.html.erb

@@ -0,0 +1,18 @@
+<div class="filters-controls hide-for-mediumlarge">
+  <button data-open="filter-box" class="filters-controls__trigger">
+    <%= t ".filter" %>
+    <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t(".unfold"), role: "img" %>
+  </button>
+</div>
+
+<div class="reveal" id="filter-box" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="filters">
+    <%= render partial: "filters" %>
+  </div>
+</div>

data/app/views/decidim/searches/_results.html.erb

@@ -0,0 +1,5 @@
+<div class="row small-up-1 medium-up-2 card-grid">
+  <% @results.each do |result| %>
+    <%= card_for result.resource, context: { label: true } %>
+  <% end %>
+</div>