decidim 0.0.6 → 0.0.7

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

@@ -1,6 +1,7 @@
-<div class="field">
-  <%= form.text_field :name %>
+<div class="row column">
+  <%= form.text_field :name, label: t('.name') %>
 </div>
-<div class="field">
-  <%= form.email_field :email %>
+
+<div class="row column">
+  <%= form.email_field :email, label: t('.email') %>
 </div>

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

@@ -1,54 +1,59 @@
-<% provide :title do %>
-  <h2><%= t "decidim.admin.titles.users" %></h2>
-<% end %>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t "decidim.admin.titles.users" %>
+      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.user.name", scope: "decidim.admin")), ['new', 'user'], class: 'button tiny button--title' %>
+    </h2>
+  </div>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.user.fields.name", scope: "decidim.admin") %></th>
+            <th><%= t("models.user.fields.email", scope: "decidim.admin") %></th>
+            <th><%= t("models.user.fields.invitation_sent_at", scope: "decidim.admin") %></th>
+            <th><%= t("models.user.fields.invitation_accepted_at", scope: "decidim.admin") %></th>
+            <th><%= t("models.user.fields.last_sign_in_at", scope: "decidim.admin") %></th>
+            <th><%= t("models.user.fields.created_at", scope: "decidim.admin") %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @users.each do |user| %>
+            <tr data-user-id="<%= user.id %>">
+              <td><%= user.name %></td>
+              <td><%= user.email %></td>
+              <td>
+                <% if user.invitation_sent_at %>
+                  <%= l user.invitation_sent_at, format: :short %>
+                <% end %>
+              </td>
+              <td>
+                <% if user.invitation_accepted_at %>
+                  <%= l user.invitation_accepted_at, format: :short %>
+                <% end %>
+              </td>
+              <td>
+                <% if user.last_sign_in_at %>
+                  <%= l user.last_sign_in_at, format: :short %>
+                <% end %>
+              </td>
+              <td><%= l user.created_at, format: :short %></td>
+              <td class="table-list__actions">
+                <% if can?(:invite, user) && user.invited_to_sign_up? %>
+                  <%= icon_link_to "reload", ['resend_invitation', user], t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
+                <% end %>
 
-<div class="actions title">
-  <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.user.name", scope: "decidim.admin")), ['new', 'user'], class: 'new' %>
-</div>
-
-<table class="stack">
-  <thead>
-    <tr>
-      <th><%= t("models.user.fields.name", scope: "decidim.admin") %></th>
-      <th><%= t("models.user.fields.email", scope: "decidim.admin") %></th>
-      <th><%= t("models.user.fields.invitation_sent_at", scope: "decidim.admin") %></th>
-      <th><%= t("models.user.fields.invitation_accepted_at", scope: "decidim.admin") %></th>
-      <th><%= t("models.user.fields.last_sign_in_at", scope: "decidim.admin") %></th>
-      <th><%= t("models.user.fields.created_at", scope: "decidim.admin") %></th>
-      <th class="actions"><%= t("actions.title", scope: "decidim.admin") %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @users.each do |user| %>
-      <tr data-user-id="<%= user.id %>">
-        <td><%= user.name %></td>
-        <td><%= user.email %></td>
-        <td>
-          <% if user.invitation_sent_at %>
-            <%= l user.invitation_sent_at, format: :short %>
-          <% end %>
-        </td>
-        <td>
-          <% if user.invitation_accepted_at %>
-            <%= l user.invitation_accepted_at, format: :short %>
-          <% end %>
-        </td>
-        <td>
-          <% if user.last_sign_in_at %>
-            <%= l user.last_sign_in_at, format: :short %>
+                <% if can? :destroy, user %>
+                  <%= icon_link_to "circle-x", user, 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 %>
-        </td>
-        <td><%= l user.created_at, format: :short %></td>
-        <td class="actions">
-          <% if can?(:invite, user) && user.invited_to_sign_up? %>
-            <%= link_to t("actions.resend_invitation", scope: "decidim.admin"), ['resend_invitation', user], method: :post %>
-          <% end %>
-
-          <% if can? :destroy, user %>
-            <%= link_to t("actions.destroy", scope: "decidim.admin"), user, method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
-          <% end %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+        </tbody>
+      </table>
+      <%= paginate @users, theme: "decidim" %>
+    </div>
+  </div>
+</div>

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

@@ -1,11 +1,14 @@
-<% provide :title do %>
-  <h2><%= t ".title" %></h2>
-<% end %>
-
-<%= decidim_form_for(@form) do |f| %>
-  <%= render partial: 'form', object: f %>
+<%= decidim_form_for(@form, html: { class: "form new_user" }) 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="actions">
+  <div class="button--double form-general-submit">
     <%= f.submit t(".create") %>
   </div>
 <% end %>

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

@@ -1,40 +1,27 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
-<head>
-<title>Decidim - admin</title>
-<%= render partial: 'layouts/decidim/admin/header' %>
-</head>
-
-<body>
-  <div class="off-canvas-wrapper">
-    <div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>
-      <div class="off-canvas position-left reveal-for-large" id="my-info" data-off-canvas data-position="left">
-        <div class="sidebar">
-          <%= render partial: 'layouts/decidim/admin/sidebar' %>
-        </div>
-      </div>
-
-      <div class="off-canvas-content" data-off-canvas-content>
-        <div class="title-bar hide-for-large">
-          <div class="title-bar-left">
-            <button class="menu-icon" type="button" data-open="my-info"></button>
-            <span class="title-bar-title"><%= title %></span>
-          </div>
-        </div>
-        <div class="row main-content">
-          <div class="small-12 column">
-            <% if content_for?(:title) %>
-              <section class="page-title">
-                <%= content_for :title %>
-              </section>
-            <% end %>
-
-            <%= display_flash_messages %>
-            <%= yield %>
-          </div>
-        </div>
+  <head>
+    <meta charset="utf-8">
+    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+    <meta name="author" content="">
+    <meta name="copyright" content="">
+    <meta name="description" content="" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title><%= title %></title>
+    <%= render partial: 'layouts/decidim/admin/header' %>
+  </head>
+  <body>
+    <%= render partial: 'layouts/decidim/admin/template_top' %>
+    <div class="layout-nav">
+      <%= render partial: 'layouts/decidim/admin/main_nav' %>
+      <%= yield :secondary_nav if content_for? :secondary_nav %>
+    </div>
+    <div class="layout-content">
+      <%= render partial: 'layouts/decidim/admin/callouts_full' %>
+      <div class="container">
+        <%= yield %>
       </div>
     </div>
-  </div>
-</body>
+    <%= render partial: 'layouts/decidim/admin/template_bottom' %>
+  </body>
 </html>

data/decidim-admin/app/views/layouts/decidim/admin/_callouts_full.html.erb

@@ -0,0 +1,10 @@
+<div class="callout-wrapper">
+  <% flash.each do |key, value| %>
+    <div class="callout <%= FoundationRailsHelper::FlashHelper::DEFAULT_KEY_MATCHING[key.to_sym] %> callout--full" data-closable>
+      <%= value %>
+      <button class="close-button" aria-label="Dismiss alert" type="button" data-close>
+        <span aria-hidden="true">&times;</span>
+      </button>
+    </div>
+  <% end %>
+</div>

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

@@ -1,14 +1,14 @@
-<div class="session-box">
-  <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
-    <li class="is-dropdown-submenu-parent">
-      <%= link_to t("name", scope: "locale") %>
-      <% if available_locales.length > 1 %>
+<% if available_locales.length > 1 %>
+  <div class="session-box">
+    <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
+      <li class="is-dropdown-submenu-parent">
+        <%= link_to t("name", scope: "locale") %>
         <ul class="menu is-dropdown-submenu">
           <% (available_locales - [I18n.locale.to_s]).each do |locale| %>
             <li><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post%></li>
           <% end %>
         </ul>
-      <% end %>
-    </li>
-  </ul>
-</div>
+      </li>
+    </ul>
+  </div>
+<% end %>

data/decidim-admin/app/views/layouts/decidim/admin/_main_nav.html.erb

@@ -0,0 +1,11 @@
+<div class="main-nav">
+  <ul>
+    <%= admin_menu_item_to "dashboard", decidim_admin.root_path, active: :exact %>
+    <%= admin_menu_item_to "participatory_processes", decidim_admin.participatory_processes_path, icon_name: "target", active: :inclusive %>
+    <%= admin_menu_item_to "participatory_process_groups", decidim_admin.participatory_process_groups_path, icon_name: "layers", active: :inclusive %>
+    <%= admin_menu_item_to "static_pages", decidim_admin.static_pages_path, icon_name: "book", active: :inclusive if can? :read, Decidim::StaticPage %>
+    <%= admin_menu_item_to "users", decidim_admin.users_path, icon_name: "person", active: :inclusive, active_class: is_active_link?(decidim_admin.users_path) || is_active_link?(decidim_admin.user_groups_path) ? "is-active" : "" if can? :read, :admin_users %>
+    <%= admin_menu_item_to "newsletters", decidim_admin.newsletters_path, icon_name: "envelope-closed", active: :inclusive if can? :index, Decidim::Newsletter %>
+    <%= admin_menu_item_to "settings", decidim_admin.edit_organization_path, icon_name: "wrench", active: :inclusive, active_class: is_active_link?(decidim_admin.edit_organization_path) || is_active_link?(decidim_admin.scopes_path) ? "is-active" : "" if can? :read, current_organization %>
+  </ul>
+</div>

data/decidim-admin/app/views/layouts/decidim/admin/_template_bottom.html.erb

@@ -0,0 +1,2 @@
+  </div><!--/.layout-wrapper-->
+</main>

data/decidim-admin/app/views/layouts/decidim/admin/_template_top.html.erb

@@ -0,0 +1,3 @@
+<%= render partial: 'layouts/decidim/admin/title_bar' %>
+<main class="main">
+  <div class="layout-wrapper">

data/decidim-admin/app/views/layouts/decidim/admin/_title_bar.html.erb

@@ -0,0 +1,20 @@
+<div class="title-bar">
+  <a href="#menu" class="menu-trigger"><%= icon "menu" %></a>
+  <%= link_to root_path, class: "logo" do %>
+    <% if current_organization.logo.present? %>
+      <%= image_tag current_organization.logo.url, alt: title %>
+    <% else %>
+      <%= title %>
+    <% end %>
+  <% end %>
+  <div class="user-login">
+    <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
+      <li class="is-dropdown-submenu-parent">
+        <a href="#"><%= current_user.email %></a>
+        <ul class="menu is-dropdown-submenu">
+          <li><%= link_to('Logout', decidim.destroy_user_session_path, method: :delete) %></li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+</div>

data/decidim-admin/app/views/layouts/decidim/admin/newsletters.erb

@@ -0,0 +1,14 @@
+<% content_for :secondary_nav do %>
+  <div class="secondary-nav">
+    <div class="secondary-nav__title">
+      <%= t ".title" %>
+    </div>
+    <div class="secondary-nav__actions">
+      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.newsletter.name", scope: "decidim.admin")), ['new', 'newsletter'], class: 'button expanded small new' %>
+    </div>
+  </div>
+<% end %>
+
+<%= render "layouts/decidim/admin/application" do %>
+  <%= yield %>
+<% end %>

data/decidim-admin/app/views/layouts/decidim/admin/pages.html.erb

@@ -0,0 +1,14 @@
+<% content_for :secondary_nav do %>
+  <div class="secondary-nav">
+    <div class="secondary-nav__title">
+      <%= t "decidim.admin.titles.static_pages" %>
+    </div>
+    <div class="secondary-nav__actions">
+      <%= link_to t("static_pages.new.title", scope: "decidim.admin"), ['new', 'static_page'], class: 'button expanded small new' %>
+    </div>
+  </div>
+<% end %>
+
+<%= render "layouts/decidim/admin/application" do %>
+  <%= yield %>
+<% end %>

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

@@ -1,59 +1,61 @@
-<% provide :title do %>
-  <h2><%= link_to translated_attribute(participatory_process.title), decidim_admin.participatory_process_path(participatory_process) %></h2>
-  <h3 class="subheader"><%= translated_attribute(participatory_process.subtitle) %></h3>
+<% content_for :secondary_nav do %>
+  <div class="secondary-nav secondary-nav--subnav">
+    <ul>
+      <% if can? :update, participatory_process %>
+        <li <% if is_active_link?(decidim_admin.edit_participatory_process_path(participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.edit_participatory_process_path(participatory_process) %>
+        </li>
+      <% end %>
+      <% if can? :read, Decidim::ParticipatoryProcessStep %>
+        <li <% if is_active_link?(decidim_admin.participatory_process_steps_path(participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("steps", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_steps_path(participatory_process) %>
+        </li>
+      <% end %>
+      <% if can? :read, Decidim::Feature %>
+        <li <% if is_active_link?(decidim_admin.participatory_process_features_path(participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("features", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_features_path(participatory_process) %>
+          <ul>
+            <% participatory_process.features.each do |feature| %>
+              <% if feature.manifest.admin_engine %>
+                <li <% if is_active_link?(decidim_admin.manage_feature_path(participatory_process, feature)) %> class="is-active" <% end %>>
+                  <%= link_to decidim_admin.manage_feature_path(participatory_process, feature) do %>
+                    <%= translated_attribute feature.name %>
+                  <% end %>
+                </li>
+              <% end %>
+            <% end %>
+          </ul>
+        </li>
+      <% end %>
+      <% if can? :read, Decidim::Category %>
+        <li <% if is_active_link?(decidim_admin.participatory_process_categories_path(participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("categories", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_categories_path(participatory_process) %>
+        </li>
+      <% end %>
+      <% if can? :read, Decidim::Attachment %>
+        <li <% if is_active_link?(decidim_admin.participatory_process_attachments_path(participatory_process.id)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("attachments", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_attachments_path(participatory_process.id) %>
+        </li>
+      <% end %>
+      <% if can? :read, Decidim::Admin::ParticipatoryProcessUserRole %>
+        <li <% if is_active_link?(decidim_admin.participatory_process_user_roles_path(participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("process_admins", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_user_roles_path(participatory_process) %>
+        </li>
+      <% end %>
+      <% if can? :read, Decidim::Moderation %>
+        <li <% if is_active_link?(decidim_admin.participatory_process_moderations_path(participatory_process.id)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_moderations_path(participatory_process.id) %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>
-  <hr />
-  <div class="row">
-    <div class="medium-3 columns">
-      <ul class="tabs vertical" id="example-vert-tabs">
-        <li class="tabs-title is-active">
-          <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_path(participatory_process), aria_link_type: :exclusive %>
-        </li>
-        <% if can? :read, Decidim::ParticipatoryProcessStep %>
-          <li class="tabs-title">
-            <%= aria_selected_link_to t("steps", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_steps_path(participatory_process) %>
-          </li>
-        <% end %>
-        <% if can? :read, Decidim::Feature %>
-          <li class="tabs-title">
-            <%= aria_selected_link_to t("features", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_features_path(participatory_process) %>
-          </li>
-        <% end %>
-        <% if can? :read, Decidim::Moderation %>
-          <li class="tabs-title">
-            <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_moderations_path(participatory_process) %>
-          </li>
-        <% end %>
-        <% if can? :read, Decidim::Category %>
-          <li class="tabs-title">
-            <%= aria_selected_link_to t("categories", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_categories_path(participatory_process) %>
-          </li>
-        <% end %>
-        <% if can? :read, Decidim::Admin::ParticipatoryProcessUserRole %>
-          <li class="tabs-title">
-            <%= aria_selected_link_to t("process_admins", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_user_roles_path(participatory_process) %>
-          </li>
-        <% end %>
-        <% if can? :read, Decidim::Attachment %>
-          <li class="tabs-title">
-            <%= aria_selected_link_to t("attachments", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_attachments_path(participatory_process.id) %>
-          </li>
-        <% end %>
-        <% if can? :update, participatory_process %>
-          <li class="tabs-title">
-            <%= aria_selected_link_to t("settings", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.edit_participatory_process_path(participatory_process) %>
-          </li>
-        <% end %>
-      </ul>
-    </div>
-    <div class="medium-9 columns">
-      <div class="tabs-content vertical">
-        <div class="tabs-panel" aria-hidden="false">
-          <%= yield %>
-        </div>
-      </div>
+  <div class="process-title">
+    <div class="process-title-content">
+      <%= translated_attribute(participatory_process.title) %>
     </div>
   </div>
+  <%= yield %>
 <% end %>

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

@@ -0,0 +1,14 @@
+<% content_for :secondary_nav do %>
+  <div class="secondary-nav">
+    <div class="secondary-nav__title">
+      <%= t "decidim.admin.titles.participatory_process_groups" %>
+    </div>
+    <div class="secondary-nav__actions">
+      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_group.name", scope: "decidim.admin")), ['new', 'participatory_process_group'], class: 'button expanded small new' if can? :create, Decidim::ParticipatoryProcessGroup %>
+    </div>
+  </div>
+<% end %>
+
+<%= render "layouts/decidim/admin/application" do %>
+  <%= yield %>
+<% end %>