decidim 0.0.6 → 0.0.7

data/decidim-admin/app/views/decidim/admin/newsletters/_form.html.erb

@@ -1,5 +1,11 @@
-<div class="field">
+<div class="row column">
   <%= form.translated :text_field, :subject %>
+</div>
+
+<div class="row column">
   <%= form.translated :editor, :body %>
+</div>
+
+<div class="row column">
   <%= t('.interpolations_hint') %>
 </div>

data/decidim-admin/app/views/decidim/admin/newsletters/edit.html.erb

@@ -1,11 +1,13 @@
-<% provide :title do %>
-  <h2><%= t ".title" %></h2>
-<% end %>
-
-<%= decidim_form_for(@form) do |f| %>
-  <%= render partial: 'form', object: f %>
-
-  <div class="actions">
+<%= decidim_form_for(@form, html: { class: "form edit_newsletter" }) do |f| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t ".title" %></h2>
+    </div>
+    <div class="card-section">
+      <%= render partial: 'form', object: f %>
+    </div>
+  </div>
+  <div class="button--double form-general-submit">
     <%= f.submit t(".save_and_preview") %>
   </div>
 <% end %>

data/decidim-admin/app/views/decidim/admin/newsletters/index.html.erb

@@ -1,47 +1,54 @@
-<div id="newsletters">
-  <% provide :title do %>
-    <h2><%= t ".title" %></h2>
-  <% end %>
-
-  <div class="actions title">
-    <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.newsletter.name", scope: "decidim.admin").downcase), ['new', 'newsletter'], class: 'new' %>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t ".title" %>
+      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.newsletter.name", scope: "decidim.admin").downcase), ['new', 'newsletter'], class: 'button tiny button--title new' %>
+    </h2>
   </div>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.newsletter.fields.subject", scope: "decidim.admin") %></th>
+            <th><%= t("models.newsletter.fields.created_at", scope: "decidim.admin") %></th>
+            <th><%= t("models.newsletter.fields.sent_at", scope: "decidim.admin") %></th>
+            <th><%= t("models.newsletter.fields.progress", scope: "decidim.admin") %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @newsletters.each do |newsletter| %>
+            <tr data-newsletter-id="<%= newsletter.id %>">
+              <td><%= translated_attribute newsletter.subject %></td>
+              <td><%= l newsletter.created_at, format: :long if newsletter.created_at %></td>
+              <td><%= l newsletter.sent_at, format: :long if newsletter.sent_at %></td>
+              <td>
+                <% if newsletter.sent? %>
+                  <%= "#{newsletter.total_deliveries} / #{newsletter.total_recipients}" %>
+                <% end %>
+              </td>
+              <td class="table-list__actions">
+                <% if can?(:update, newsletter) && !newsletter.sent? %>
+                  <%= link_to decidim_admin.edit_newsletter_path(newsletter), data: { tooltip: true, disable_hover: false }, :'aria-haspopup' => true, title: t("actions.edit", scope: "decidim.admin"), class: "action-icon edit" do %>
+                    <%= icon "pencil" %>
+                  <% end %>
+                <% end %>
 
+                <%= link_to decidim_admin.newsletter_path(newsletter), data: { tooltip: true, disable_hover: false }, :'aria-haspopup' => true, title: t("actions.preview", scope: "decidim.admin"), class: "action-icon preview" do %>
+                  <%= icon "eye" %>
+                <% end %>
 
-  <table class="stack newsletters">
-    <thead>
-      <tr>
-        <th><%= t("models.newsletter.fields.subject", scope: "decidim.admin") %></th>
-        <th><%= t("models.newsletter.fields.created_at", scope: "decidim.admin") %></th>
-        <th><%= t("models.newsletter.fields.sent_at", scope: "decidim.admin") %></th>
-        <th><%= t("models.newsletter.fields.progress", scope: "decidim.admin") %></th>
-        <th class="actions"><%= t("actions.title", scope: "decidim.admin") %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @newsletters.each do |newsletter| %>
-        <tr data-newsletter-id="<%= newsletter.id %>">
-          <td><%= translated_attribute newsletter.subject %></td>
-          <td><%= l newsletter.created_at, format: :long if newsletter.created_at %></td>
-          <td><%= l newsletter.sent_at, format: :long if newsletter.sent_at %></td>
-          <td>
-            <% if newsletter.sent? %>
-              <%= "#{newsletter.total_deliveries} / #{newsletter.total_recipients}" %>
-            <% end %>
-          </td>
-          <td class="actions">
-            <%= link_to t("actions.preview", scope: "decidim.admin"), decidim_admin.newsletter_path(newsletter) %>
-
-            <% if can?(:update, newsletter) && !newsletter.sent? %>
-              <%= link_to t("actions.edit", scope: "decidim.admin"), decidim_admin.edit_newsletter_path(newsletter) %>
-            <% end %>
-
-            <% if can?(:destroy, newsletter) && !newsletter.sent? %>
-              <%= link_to t("actions.destroy", scope: "decidim.admin"), decidim_admin.newsletter_path(newsletter), method: :delete, class: "button", data: { confirm: t(".confirm_delete") } %>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
+                <% if can?(:destroy, newsletter) && !newsletter.sent? %>
+                  <%= link_to decidim_admin.newsletter_path(newsletter), method: :delete, data: { confirm: t(".confirm_delete"), tooltip: true, disable_hover: false }, :'aria-haspopup' => true, title: t("actions.destroy", scope: "decidim.admin"), class: "action-icon action-icon--remove" do %>
+                    <%= icon "circle-x" %>
+                  <% end %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
 </div>

data/decidim-admin/app/views/decidim/admin/newsletters/new.html.erb

@@ -1,11 +1,13 @@
-<% provide :title do %>
-  <h2><%= t ".title" %></h2>
-<% end %>
-
-<%= decidim_form_for(@form) do |f| %>
-  <%= render partial: 'form', object: f %>
-
-  <div class="actions">
+<%= decidim_form_for(@form, html: { class: "form new_newsletter" }) do |f| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t ".title" %></h2>
+    </div>
+    <div class="card-section">
+      <%= render partial: 'form', object: f %>
+    </div>
+  </div>
+  <div class="button--double form-general-submit">
     <%= f.submit t(".save") %>
   </div>
 <% end %>

data/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb

@@ -1,14 +1,22 @@
-<h3><%= t ".preview" %></h3>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t ".preview" %></h2>
+  </div>
+  <div class="card-section">
+    <dl>
+      <dt><%= t ".subject" %></dt>
+      <dd><%= @email.subject %></dd>
+    </dl>
 
-<dl>
-  <dt><%= t ".subject" %></dt>
-  <dd><%= @email.subject %></dd>
-</dl>
-
-<iframe src="<%= preview_newsletter_path(@newsletter) %>" class="email-preview">
-</iframe>
-
-<div class="actions">
-  <%= link_to t("actions.edit", scope: "decidim.admin"), ['edit', @newsletter] %>
-  <%= link_to t(".deliver"), deliver_newsletter_path(@newsletter), method: :post, class: "button", data: { confirm: t(".confirm_deliver") } %>
+    <iframe src="<%= preview_newsletter_path(@newsletter) %>" class="email-preview">
+    </iframe>
+  </div>
+</div>
+<div class="button--double form-general-submit">
+  <% if can?(:update, @newsletter) && !@newsletter.sent? %>
+    <%= link_to t("actions.edit", scope: "decidim.admin"), ['edit', @newsletter], class: "button" %>
+  <% end %>
+  <% unless @newsletter.sent? %>
+    <%= link_to t(".deliver"), deliver_newsletter_path(@newsletter), method: :post, class: "button alert", data: { confirm: t(".confirm_deliver") } %>
+  <% end %>
 </div>

data/decidim-admin/app/views/decidim/admin/organization/_form.html.erb

@@ -1,73 +1,109 @@
-<div class="field">
-  <%= form.text_field :name %>
-</div>
-
-<div class="field">
-  <%= form.text_field :reference_prefix %>
-</div>
-
-<div class="field">
-  <%= form.text_field :twitter_handler %>
-</div>
-
-<div class="field">
-  <%= form.text_field :facebook_handler %>
-</div>
-
-<div class="field">
-  <%= form.text_field :instagram_handler %>
-</div>
-
-<div class="field">
-  <%= form.text_field :youtube_handler %>
-</div>
-
-<div class="field">
-  <%= form.text_field :github_handler %>
-</div>
-
-<div class="field">
+<div class="row">
+  <div class="columns xlarge-6">
+    <%= form.text_field :name %>
+  </div>
+
+  <div class="columns xlarge-6">
+    <div class="label--tabs">
+      <label for="organization_social_handlers">
+        <%= t('.social_handlers') %>
+      </label>
+      <ul class="tabs tabs--lang" data-tabs id="organization_social_handlers">
+        <% Decidim::Organization::SOCIAL_HANDLERS.each do |handler| %>
+          <li class="tabs-title <% if handler == Decidim::Organization::SOCIAL_HANDLERS.first %> is-active <% end %>">
+            <a href="#<%= handler %>" <% if handler == Decidim::Organization::SOCIAL_HANDLERS.first %> aria-selected="true" <% end %>>
+              <%= t(".#{handler}") %>
+            </a>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+    <div class="tabs-content" data-tabs-content="organization_social_handlers">
+      <% Decidim::Organization::SOCIAL_HANDLERS.each do |handler| %>
+        <div class="tabs-panel <% if handler == Decidim::Organization::SOCIAL_HANDLERS.first %> is-active <% end %>" id="<%= handler %>">
+          <%= form.text_field "#{handler}_handler", label: false %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
+
+<div class="row column">
   <%= form.translated :editor, :description %>
 </div>
 
-<div class="field">
+<div class="row column">
   <%= form.translated :text_area, :welcome_text %>
 </div>
 
-<div class="field">
+<div class="row column">
   <%= form.collection_select :default_locale, localized_locales(current_organization.available_locales), :id, :name %>
 </div>
 
-<div class="field">
-  <%= form.file_field :homepage_image %>
-</div>
-
-<div class="field">
-  <%= form.file_field :logo %>
-</div>
-
-<div class="field">
-  <%= form.file_field :favicon %>
-</div>
-
-<div class="field">
-  <%= form.text_field :official_url %>
-</div>
-
-<div class="field">
-  <%= form.file_field :official_img_header %>
-  <% if current_organization.official_img_header? %>
-      <%= image_tag current_organization.official_img_header.url.to_s %>
-  <% end %>
-</div>
-
-<div class="field">
-  <%= form.file_field :official_img_footer %>
-  <% if current_organization.official_img_footer? %>
-      <%= image_tag current_organization.official_img_footer.url.to_s %>
-  <% end %>
-</div>
-
-<div class="field">
+<div class="row">
+  <div class="columns xlarge-4">
+    <%= form.file_field :homepage_image %>
+    <% if current_organization.homepage_image.present? %>
+      <label><%= t('.current_image') %></label>
+      <%= image_tag current_organization.homepage_image.big.url %>
+      <label><%= t('.url') %></label>
+      <%= link_to current_organization.homepage_image.file.filename, current_organization.homepage_image.url, target: "_blank" %>
+    <% end %>
+  </div>
+
+  <div class="columns xlarge-4">
+    <%= form.file_field :logo %>
+    <% if current_organization.logo.present? %>
+      <label><%= t('.current_image') %></label>
+      <%= image_tag current_organization.logo.medium.url %>
+      <label><%= t('.url') %></label>
+      <%= link_to current_organization.logo.file.filename, current_organization.logo.url, target: "_blank" %>
+    <% end %>
+  </div>
+
+  <div class="columns xlarge-4">
+    <%= form.file_field :favicon %>
+    <% if current_organization.favicon.present? %>
+      <label><%= t('.current_image') %></label>
+      <%= image_tag current_organization.favicon.big.url %>
+      <label><%= t('.url') %></label>
+      <%= link_to current_organization.favicon.file.filename, current_organization.favicon.url, target: "_blank" %>
+    <% end %>
+  </div>
+</div>
+
+<div class="row">
+  <div class="columns xlarge-6">
+    <%= form.file_field :official_img_header %>
+    <% if current_organization.official_img_header.present? %>
+      <label><%= t('.current_image') %></label>
+      <%= image_tag current_organization.official_img_header.url %>
+      <label><%= t('.url') %></label>
+      <%= link_to current_organization.official_img_header.file.filename, current_organization.official_img_header.url, target: "_blank" %>
+    <% end %>
+  </div>
+
+  <div class="columns xlarge-6">
+    <%= form.file_field :official_img_footer %>
+    <% if current_organization.official_img_footer.present? %>
+      <label><%= t('.current_image') %></label>
+      <%= image_tag current_organization.official_img_footer.url %>
+      <label><%= t('.url') %></label>
+      <%= link_to current_organization.official_img_footer.file.filename, current_organization.official_img_footer.url, target: "_blank" %>
+    <% end %>
+  </div>
+</div>
+
+<div class="row">
+  <div class="columns xlarge-6">
+    <%= form.text_field :reference_prefix %>
+  </div>
+
+  <div class="columns xlarge-6">
+    <%= form.text_field :official_url %>
+  </div>
+</div>
+
+<div class="row column">
   <%= form.check_box :show_statistics %>
 </div>

data/decidim-admin/app/views/decidim/admin/organization/edit.html.erb

@@ -1,11 +1,14 @@
-<% provide :title do %>
-  <h2><%= t ".title" %></h2>
-<% end %>
-
-<%= decidim_form_for(@form, url: organization_path) do |f| %>
-  <%= render partial: 'form', object: f %>
-
-  <div class="actions">
+<%= decidim_form_for(@form, html: { class: "form eidt_organitzation" }, url: organization_path) do |f| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t ".title" %></h2>
+    </div>
+    <div class="card-section">
+      <%= render partial: 'form', object: f %>
+    </div>
+  </div>
+  <div class="button--double form-general-submit">
     <%= f.submit t(".update") %>
   </div>
 <% end %>
+

data/decidim-admin/app/views/decidim/admin/participatory_process_groups/_form.html.erb

@@ -1,17 +1,17 @@
-<div class="field">
+<div class="row column">
   <%= form.translated :text_field, :name, autofocus: true %>
 </div>
 
-<div class="field">
+<div class="row column">
   <%= form.translated :editor, :description, toolbar: :full, lines: 25 %>
 </div>
 
-<div class="field">
+<div class="row column">
   <% if processes_for_select %>
     <%= form.select :participatory_process_ids, processes_for_select, {}, { multiple: true, class: "chosen-select" } %>
   <% end %>
 </div>
 
-<div class="field">
+<div class="row column">
   <%= form.file_field :hero_image %>
 </div>

data/decidim-admin/app/views/decidim/admin/participatory_process_groups/edit.html.erb

@@ -1,13 +1,19 @@
-<div class="actions">
-  <% if can? :destroy, participatory_process_group %>
-    <%= link_to t("decidim.admin.actions.destroy"), participatory_process_group, method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } %>
-  <% end %>
-</div>
 
-<%= decidim_form_for(@form) do |f| %>
-  <%= render partial: 'form', object: f %>
-
-  <div class="actions">
+<%= decidim_form_for(@form, html: { class: "form edit_participatory_process_group" }) do |f| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title">
+        <%= t ".title" %>
+        <% if can? :destroy, participatory_process_group %>
+          <%= link_to t("decidim.admin.actions.destroy"), participatory_process_group, method: :delete, class: 'button alert tiny button--title destroy', data: { confirm: t("decidim.admin.actions.confirm_destroy") } %>
+        <% end %>
+      </h2>
+    </div>
+    <div class="card-section">
+      <%= render partial: 'form', object: f %>
+    </div>
+  </div>
+  <div class="button--double form-general-submit">
     <%= f.submit t(".update") %>
   </div>
 <% end %>

data/decidim-admin/app/views/decidim/admin/participatory_process_groups/index.html.erb

@@ -1,38 +1,40 @@
-<% provide :title do %>
-  <h2><%= t "decidim.admin.titles.participatory_process_groups" %></h2>
-<% end %>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t "decidim.admin.titles.participatory_process_groups" %>
+      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_group.name", scope: "decidim.admin")), ['new', 'participatory_process_group'], class: 'button tiny button--title new' if can? :create, Decidim::ParticipatoryProcessGroup %>
+    </h2>
+  </div>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.participatory_process_group.fields.name", scope: "decidim.admin") %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% collection.each do |group| %>
+            <tr>
+              <td>
+                <%= link_to translated_attribute(group.name), group %><br />
+              </td>
+              <td class="table-list__actions">
+                <% if can? :update, group %>
+                  <%= icon_link_to "pencil", ['edit', group], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                <% end %>
 
-<div class="actions title">
-  <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_group.name", scope: "decidim.admin")), ['new', 'participatory_process_group'], class: 'new' if can? :create, Decidim::ParticipatoryProcessGroup %>
-</div>
-
-<table class="stack">
-  <thead>
-    <tr>
-      <th><%= t("models.participatory_process_group.fields.name", scope: "decidim.admin") %></th>
-      <th class="actions"><%= t("actions.title", scope: "decidim.admin") %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% collection.each do |group| %>
-      <tr>
-        <td>
-          <%= link_to translated_attribute(group.name), group %><br />
-        </td>
-        <td class="actions">
-          <% if can? :preview, group %>
-            <%= link_to t("actions.preview", scope: "decidim.admin"), decidim.participatory_process_group_path(group) %>
-          <% end %>
+                <%= icon_link_to "eye", decidim.participatory_process_group_path(group), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview" %>
 
-          <% if can? :update, group %>
-            <%= link_to t("actions.edit", scope: "decidim.admin"), ['edit', group], class: "small button secondary" %>
+                <% if can? :destroy, group %>
+                  <%= icon_link_to "circle-x", group, t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                <% end %>
+              </td>
+            </tr>
           <% end %>
-
-          <% if can? :destroy, group %>
-            <%= link_to t("actions.destroy", scope: "decidim.admin"), group, method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
-          <% end %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>