decidim-core 0.0.3 → 0.0.5

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

@@ -19,6 +19,11 @@
             creates a sticky footer-->
         <!-- Topbar -->
         <div class="title-bar">
+          <% if current_organization.official_img_header? %>
+            <%= link_to  current_organization.official_url, class: "logo-cityhall" do %>
+              <%= image_tag current_organization.official_img_header.url.to_s , alt: current_organization.name %>
+            <% end %>
+          <% end %>
           <div class="row column topbar">
             <div class="logo-wrapper">
               <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>
@@ -31,7 +36,7 @@
             </div>
             <% if current_user %>
               <div class="topbar__dropmenu topbar__user__logged">
-                <ul class="dropdown menu" data-dropdown-menu>
+                <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
                   <li class="is-dropdown-submenu-parent show-for-medium">
                     <%= link_to current_user.name, decidim.account_path %>
                     <ul class="menu is-dropdown-submenu js-append usermenu-off-canvas">
@@ -59,14 +64,7 @@
         <div class="show-for-medium" data-set="nav-holder">
           <nav class="navbar js-append">
             <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" %>
-                </li>
-                <li>
-                  <%= active_link_to t("menu.processes", scope: "decidim"), decidim.participatory_processes_path, active: :inclusive, class: "main-nav__link", class_active: "main-nav__link--active" %>
-                </li>
-              </ul>
+              <%= render partial: "layouts/decidim/main_nav" %>
             </div>
           </nav>
         </div>

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

@@ -1,11 +1,11 @@
 <div class="topbar__dropmenu language-choose">
-  <ul class="dropdown menu" data-dropdown-menu>
+  <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
     <li class="is-dropdown-submenu-parent">
-      <%= link_to t(current_locale, scope: "locales") %>
+      <%= link_to t("name", scope: "locale") %>
       <% 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>
+            <li><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post%></li>
           <% end %>
         </ul>
       <% end %>

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

@@ -1,5 +1,5 @@
 <% if organization %>
-  <%= link_to root_url(host: organization.host) do %>
+  <%= link_to decidim.root_url(host: organization.host) do %>
     <% if organization.logo.present? %>
       <%= image_tag organization.logo.medium.url %>
     <% else %>

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

@@ -0,0 +1,31 @@
+<% if organization %>
+  <%= link_to decidim.root_url(host: organization.host) do %>
+    <% if organization.logo.present? %>
+      <%= image_tag organization.logo.medium.url, style: "max-height: 50px", alt: "" %>
+    <% 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/_main_nav.html.erb

@@ -0,0 +1,11 @@
+<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" %>
+  </li>
+  <li>
+    <%= active_link_to t("menu.processes", scope: "decidim"), decidim.participatory_processes_path, active: :inclusive, class: "main-nav__link", class_active: "main-nav__link--active" %>
+  </li>
+  <li>
+    <%= active_link_to t("menu.more_information", scope: "decidim"), decidim.pages_path, active: :inclusive, class: "main-nav__link", class_active: "main-nav__link--active" %>
+  </li>
+</ul>

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

@@ -35,19 +35,21 @@
           <ul>
             <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" %>
+                <%= external_icon "decidim/process.svg" %>
                 <%= t ".process_menu_item" %>
               <% end %>
             </li>
 
             <% current_participatory_process.features.each do |feature| %>
-              <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) %>
+              <% if feature.published? || feature == self.try(:current_feature) %>
+                <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) %>
 
-                  <%= translated_attribute(feature.name) %>
-                <% end %>
-              </li>
+                    <%= translated_attribute(feature.name) %>
+                  <% end %>
+                </li>
+              <% end %>
             <% end %>
           </ul>
         </div>

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

@@ -0,0 +1,39 @@
+<div class="medium-4 large-3 column main__footer__social">
+  <ul class="footer-social">
+    <% if current_organization.twitter_handler.present? %>
+      <li>
+        <a class="footer-social__icon" target="_blank" title="Twitter" href="https://twitter.com/<%= current_organization.twitter_handler %>">
+          <%= icon 'twitter', role: 'img', aria_label: 'Twitter' %>
+        </a>
+      </li>
+    <% end %>
+    <% if current_organization.facebook_handler.present? %>
+      <li>
+        <a class="footer-social__icon" target="_blank" title="Facebook" href="https://www.facebook.com/<%= current_organization.facebook_handler %>">
+          <%= icon 'facebook', role: 'img', aria_label: 'Facebook' %>
+        </a>
+      </li>
+    <% end %>
+    <% if current_organization.instagram_handler.present? %>
+      <li>
+        <a class="footer-social__icon" target="_blank" title="Instagram" href="https://www.instagram.com/<%= current_organization.instagram_handler %>">
+          <%= icon 'instagram', role: 'img', aria_label: 'Instagram' %>
+        </a>
+      </li>
+    <% end %>
+    <% if current_organization.youtube_handler.present? %>
+      <li>
+        <a class="footer-social__icon" target="_blank" title="YouTube" href="https://www.youtube.com/<%= current_organization.youtube_handler %>">
+          <%= icon 'youtube', role: 'img', aria_label: 'YouTube' %>
+        </a>
+      </li>
+    <% end %>
+    <% if current_organization.github_handler.present? %>
+      <li>
+        <a class="footer-social__icon" target="_blank" title="GitHub" href="https://www.github.com/<%= current_organization.github_handler %>">
+          <%= icon 'github', role: 'img', aria_label: 'GitHub' %>
+        </a>
+      </li>
+    <% end %>
+  </ul>
+</div>

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

@@ -1,11 +1,11 @@
 <meta name="twitter:card" content="summary_large_image" />
-<meta name="twitter:site" content="@<%= content_for(:twitter_handler) %>" />
-<meta name="twitter:title" content="<%= content_for(:meta_title) %>" />
-<meta name="twitter:description" content="<%= content_for(:meta_description) %>" />
-<meta name="twitter:image" content="<%= content_for(:meta_image_url) %>" />
+<meta name="twitter:site" content="@<%= decidim_meta_twitter_handler %>" />
+<meta name="twitter:title" content="<%= decidim_page_title %>" />
+<meta name="twitter:description" content="<%= decidim_meta_description %>" />
+<meta name="twitter:image" content="<%= decidim_meta_image_url %>" />
 
-<meta property="og:url" content="<%= content_for(:meta_url) %>" />
+<meta property="og:url" content="<%= decidim_meta_url %>" />
 <meta property="og:type" content="article" />
-<meta property="og:title" content="<%= content_for(:meta_title) %>" />
-<meta property="og:description" content="<%= content_for(:meta_description) %>" />
-<meta property="og:image" content="<%= content_for(:meta_image_url) %>" />
+<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 %>" />

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

@@ -1,71 +1,119 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta name="viewport" content="width=device-width" />
-  <%= stylesheet_link_tag "decidim/email" %>
-</head>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <%= stylesheet_link_tag "decidim/email" %>
+  </head>
 
-<body>
-  <!-- <style> -->
-  <table class="body">
-    <tr>
-      <td class="float-center" align="center" valign="top">
-        <center>
-          <table class="container">
-            <tr>
-              <td>
-                <table class="row">
-                  <tr>
-                    <th class="small-12 first columns decidim-bar">
-                      <center class="decidim-logo">
-                        <%= render partial: "layouts/decidim/logo", locals: { organization: @organization } %>
-                      </center>
-                    </th>
-                    <th class="expander"></th>
-                  </tr>
-                </table>
-                <table class="spacer">
-                  <tbody>
+  <body>
+    <!-- <style> -->
+    <table class="body">
+      <tr>
+        <td class="float-center" align="center" valign="top">
+          <center>
+            <table class="main container">
+              <tr>
+                <td class="decidim-bar">
+                  <table class="row collapse">
                     <tr>
-                      <td height="40px" style="font-size:40px;line-height:40px;"> </td>
+                      <th class="small-3 large-3 first columns decidim-bar">
+                        <table>
+                          <tr>
+                            <th>
+                            </th>
+                          </tr>
+                        </table>
+                      </th>
+                      <th class="small-6 large-6 columns decidim-bar">
+                        <table>
+                          <tr>
+                            <th>
+                              <center>
+                                <%= render partial: "layouts/decidim/mailer_logo", locals: { organization: @organization } %>
+                              </center>
+                            </th>
+                          </tr>
+                        </table>
+                      </th>
+                      <th class="small-3 large-3 last columns decidim-bar">
+                        <table>
+                          <tr>
+                            <th>
+                              <% if @organization.official_img_header? %>
+                                <%= link_to @organization.official_url do %>
+                                  <%= image_tag @organization.official_img_header.url.to_s , alt: "", style: "max-height: 50px", class: "float-right" %>
+                                <% end %>
+                              <% end %>
+                            </th>
+                          </tr>
+                        </table>
+                      </th>
+                      <th class="expander"></th>
                     </tr>
-                  </tbody>
-                </table>
+                  </table>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <table class="spacer">
+                    <tbody>
+                      <tr>
+                        <td height="40px" style="font-size:40px;line-height:40px;"> </td>
+                      </tr>
+                    </tbody>
+                  </table>
 
-                <table class="row content">
-                  <tr>
-                  <th class="small-12 first columns">
-                    <%= yield %>
-                  </th>
-                    <th class="expander"></th>
-                  </tr>
-                </table>
+                  <table class="row content">
+                    <tr>
+                      <th class="small-12 first columns">
+                        <%= yield %>
+                      </th>
+                      <th class="expander"></th>
+                    </tr>
+                  </table>
 
-                <table class="row">
-                  <tr>
-                    <th class="small-12 first columns">
-                    </th>
-                    <th class="expander"></th>
-                  </tr>
-                </table>
+                  <table class="row">
+                    <tr>
+                      <th class="small-12 first columns">
+                      </th>
+                      <th class="expander"></th>
+                    </tr>
+                  </table>
+
+                  <table class="row">
+                    <tr>
+                      <th class="expander"></th>
+                      <th class="small-12 first columns cityhall-bar">
+                        <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
+                          <%= link_to @organization.name, decidim.root_url(host: @organization.host) %>
+                        </div>
+                      </th>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+            </table>
 
-                <table class="row">
-                  <tr>
-                    <th class="expander"></th>
-                    <th class="small-12 first columns cityhall-bar">
-                      <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
-                        <%= link_to @organization.name, root_url(host: @organization.host) %>
-                      </div>
-                    </th>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </center>
-      </td>
-    </tr>
-  </table>
-</body>
+            <% if content_for?(:note) %>
+              <table class="container">
+                <tr>
+                  <td>
+                    <table class="row">
+                      <th class="expander"></th>
+                      <th class="small-12 first columns footnote">
+                        <center>
+                          <%= yield(:note) %>
+                        </center>
+                      </th>
+                    </table>
+                  </td>
+                </tr>
+              </table>
+            <% end %>
+          </center>
+        </td>
+      </tr>
+    </table>
+  </body>
 </html>

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

@@ -1,6 +1,9 @@
-<% content_for :meta_image_url do %>
-  <% current_participatory_process.banner_image.url %>
-<% end %>
+<% add_decidim_page_title(translated_attribute(current_feature.name)) if try(:current_feature) %>
+<% add_decidim_page_title(translated_attribute(current_participatory_process.title)) %>
+<% add_decidim_meta_tags(
+  image_url: current_participatory_process.banner_image.url,
+  description: translated_attribute(current_participatory_process.short_description),
+) %>
 
 <%= render "layouts/decidim/application" do %>
   <div class="wrapper">
@@ -17,3 +20,11 @@
     </div>
   <% end %>
 <% end %>
+
+<% if try(:current_feature) %>
+  <% current_feature.manifest.actions.each do |action| %>
+    <%= action_authorization_modal(action) %>
+  <% end %>
+<% end %>
+
+<% provide :meta_image_url, current_participatory_process.banner_image.url %>

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

@@ -12,6 +12,7 @@
             <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 %>
+                <%= user_profile_tab t("notifications_settings", scope: "layouts.decidim.user_profile"), notifications_settings_path %>
                 <% if available_authorization_handlers.any? %>
                   <%= user_profile_tab t("authorizations", scope: "layouts.decidim.user_profile"), authorizations_path %>
                 <% end %>

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

@@ -1,3 +1,8 @@
+<% add_decidim_meta_tags(
+  title: translated_attribute(page.title),
+  description: translated_attribute(page.content)
+) %>
+
 <main class="wrapper">
   <div class="row column">
     <h1 class="heading1 page-title"><%= translated_attribute page.title %></h1>

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

@@ -1,3 +1,5 @@
+<% provide(:meta_title, current_organization.name) %>
+
 <%= render partial: 'pages/home/hero' %>
 
 <% if !translated_attribute(current_organization.description).blank? %>
@@ -11,3 +13,5 @@
 <% if current_organization.show_statistics? %>
   <%= render partial: 'pages/home/statistics' %>
 <% end %>
+
+<%= render partial: 'pages/home/footer_sub_hero' %>

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

@@ -1,7 +1,7 @@
 <section class="extended">
   <div class="wrapper-home home-section">
     <div class="row column text-center">
-      <h3 class="heading2"><%t(".how_to_participate") %></h3>
+      <h3 class="heading2"><%= t(".how_to_participate") %></h3>
     </div>
     <div class="row small-up-1 medium-up-3 home-bullets">
       <div class="column">
@@ -45,4 +45,4 @@
       </div>
     </div>
   </div>
-</section>
+</section>