decidim-admin 0.0.7 → 0.0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5dcba8b9274da7bdc3fe8d9700584b9351f009b
-  data.tar.gz: 87a3f6dddf33cce35d81185d5e06c789f42836a3
+  metadata.gz: 9d431157faf89c91b9188a11cf7b300a290e20ff
+  data.tar.gz: 015526c7b495d558c20f4cdbe72bcfff2585b97e
 SHA512:
-  metadata.gz: 261ba95b4b6d52d7df7bac1dd4a8bd6cd202a686886726b91a5fb4c699dfcd3be0aba7b4ee5aee938322c43b6464370105cbbf0c204b789cd339dec5e214aec1
-  data.tar.gz: 113d19970d41766a6edfbb1efee5f2feb05cb2db0ba22c105a38f513bbabe89a15d3d815f8364688f156ea33b3b8308bad30e430a0f529eb77f661584e959e88
+  metadata.gz: 795021e0de6ca13a939b1ed310563299a72cb89aa771defd41b6d37e5dc8b94283a3dcb6ee751e790648c6e57e120df51aae0956cb1224a267fd830368a7414b
+  data.tar.gz: 11c8d98d61b644db36622cb799b0a141257e71c6eedd31305bbd958059520b936b8d4ab5a4d35086383930676d05e0a920d3194ab00f231ee7b5c4de1b94ab58

data/README.md

@@ -47,7 +47,7 @@ are links to them inside the Decidim framework, see `Decidim::StaticPage` for
 the default list.
 
 ## Contributing
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).
 
 ## License
-See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+See [Decidim](https://github.com/decidim/decidim).

data/app/assets/javascripts/decidim/admin/application.js.es6

@@ -6,14 +6,27 @@
 // = require html.sortable
 // = require ./sort_steps
 // = require ./tab_focus
+// = require ./toggle_nav
 // = require decidim/editor
+// = require foundation-datepicker
+// = require form_datepicker
+// = require moment.min
 // = require_self
 
+window.Decidim = window.Decidim || {};
+
 const pageLoad = () => {
   $(document).foundation();
   sortSteps();
+
+  if (DecidimAdmin) {
+    DecidimAdmin.toggleNav();
+  }
 };
 
 $(() => {
   pageLoad();
+ if (window.Decidim.formDatePicker) {
+    window.Decidim.formDatePicker();
+  }
 });

data/app/assets/javascripts/decidim/admin/toggle_nav.js.es6

@@ -0,0 +1,17 @@
+((exports) => {
+  const showHideNav = (evt) => {
+    const navMenu = document.querySelector(".layout-nav");
+
+    evt.preventDefault();
+    navMenu.classList.toggle("is-nav-open");
+  }
+
+  const toggleNav = () => {
+    const navTrigger = document.querySelector(".menu-trigger");
+
+    navTrigger.addEventListener("click", showHideNav);
+  }
+
+  exports.DecidimAdmin = exports.DecidimAdmin || {};
+  exports.DecidimAdmin.toggleNav = toggleNav;
+})(window);

data/app/assets/stylesheets/decidim/admin/_decidim.scss

@@ -1,4 +1,3 @@
-//@import compass
 @import "variables";
 @import "utils/*";
 

data/app/assets/stylesheets/decidim/admin/modules/_datepicker.scss

@@ -0,0 +1,224 @@
+$calendar-bg-color: $white;
+$calendar-border: 1px solid rgba(0, 0, 0, 0.1);
+$calendar-border-color: rgba(0, 0, 0, 0.1);
+$calendar-active-color: $primary-color;
+$calendar-bg-hover: $light-gray;
+$calendar-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+$calendar-color-old: $medium-gray;
+$calendar-color-disabled: $light-gray;
+$calendar-radius: $global-radius;
+$calendar-font-size: $global-font-size * .9;
+
+.datepicker {
+  display: none;
+  position: absolute;
+  padding: 4px;
+  margin-top: 1px;
+  direction: ltr;
+}
+
+.datepicker.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  float: left;
+  display: none;
+  min-width: 160px;
+  list-style: none;
+  background-color: $calendar-bg-color;
+  border: $calendar-border;
+  border-radius: $calendar-radius;
+  box-shadow: $calendar-shadow;
+  background-clip: padding-box;
+  font-size: $calendar-font-size;
+  line-height: 18px;
+}
+
+.datepicker.dropdown-menu th {
+  padding: 4px 5px;
+}
+
+.datepicker.dropdown-menu td {
+  padding: 6px 9px;
+}
+
+.datepicker table {
+  border: 0;
+  margin: 0;
+  width: auto;
+}
+
+.datepicker table tr td span {
+  display: block;
+  width: 23%;
+  height: 54px;
+  line-height: 54px;
+  float: left;
+  margin: 1%;
+  cursor: pointer;
+}
+
+.datepicker td {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  border: 0;
+  font-size: $calendar-font-size;
+  padding: 4px 8px;
+  background: $calendar-bg-color;
+  cursor: pointer;
+}
+
+.datepicker td.active.day,
+.datepicker td.active.year {
+  background: $calendar-active-color;
+}
+
+.datepicker .day:hover,
+.datepicker .date-switch:hover,
+.datepicker .prev:hover,
+.datepicker .next:hover,
+.datepicker .month:hover,
+.datepicker .year:hover{
+  background-color: $calendar-bg-hover;
+  &.active{
+    background: $calendar-active-color;
+  }
+}
+
+
+.datepicker td.new,
+.datepicker td.old {
+  color: $calendar-color-old;
+}
+
+.datepicker td span.active {
+  background: $calendar-active-color;
+}
+
+.datepicker td.day.disabled {
+  color: $calendar-color-disabled;
+}
+
+.datepicker td span.month.disabled,
+.datepicker td span.year.disabled {
+  color: $calendar-color-disabled;
+}
+
+.datepicker th {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  border: 0;
+  font-size: $calendar-font-size;
+  padding: 4px 8px;
+  background: $calendar-bg-color;
+  cursor: pointer;
+}
+
+.datepicker th.active.day,
+.datepicker th.active.year {
+  background: $calendar-active-color;
+}
+
+.datepicker th.date-switch {
+  width: 145px;
+}
+
+.datepicker th span.active {
+  background: $calendar-active-color;
+}
+
+.datepicker .cw {
+  font-size: 10px;
+  width: 12px;
+  padding: 0 2px 0 5px;
+  vertical-align: middle;
+}
+
+.datepicker.days div.datepicker-days {
+  display: block;
+}
+
+.datepicker.months div.datepicker-months {
+  display: block;
+}
+
+.datepicker.years div.datepicker-years {
+  display: block;
+}
+
+.datepicker thead tr:first-child th {
+  cursor: pointer;
+}
+
+.datepicker thead tr:first-child th.cw {
+  cursor: default;
+  background-color: transparent;
+}
+
+.datepicker tfoot tr:first-child th {
+  cursor: pointer;
+}
+
+.datepicker-inline {
+  width: 220px;
+}
+
+.datepicker-rtl {
+  direction: rtl;
+}
+
+.datepicker-rtl table tr td span {
+  float: right;
+}
+
+.datepicker-dropdown {
+  top: 0;
+  left: 0;
+}
+
+.datepicker-dropdown:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-bottom-color: $calendar-border-color;
+  position: absolute;
+  top: -7px;
+  left: 6px;
+}
+
+.datepicker-dropdown:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid $calendar-bg-color;
+  position: absolute;
+  top: -6px;
+  left: 7px;
+}
+
+.datepicker > div,
+.datepicker-dropdown::after,
+.datepicker-dropdown::before {
+  display: none;
+}
+
+.datepicker-close {
+  position: absolute;
+  top: -30px;
+  right: 0;
+  width: 15px;
+  height: 30px;
+  padding: 0;
+  display: none;
+}
+
+.table-striped .datepicker table tr td,
+.table-striped .datepicker table tr th {
+  background-color: transparent;
+}

data/app/assets/stylesheets/decidim/admin/modules/_modules.scss

@@ -11,6 +11,7 @@
 @import "user-login";
 @import "main-nav";
 @import "secondary-nav";
+@import "datepicker";
 
 //Process
 @import "process-header";

data/app/controllers/decidim/admin/newsletters_controller.rb

@@ -28,7 +28,7 @@ module Decidim
         email = NewsletterMailer.newsletter(current_user, @newsletter)
         Premailer::Rails::Hook.perform(email)
 
-        render html: email.html_part.body.decoded
+        render html: email.html_part.body.decoded.html_safe
       end
 
       def create

data/app/forms/decidim/admin/participatory_process_user_role_form.rb

@@ -14,6 +14,15 @@ module Decidim
       validates :email, :role, presence: true
       validates :name, presence: true
       validates :role, inclusion: { in: ParticipatoryProcessUserRole::ROLES }
+
+      def roles
+        Decidim::Admin::ParticipatoryProcessUserRole::ROLES.map do |role|
+          [
+            I18n.t(role, scope: "decidim.admin.models.participatory_process_user_role.roles"),
+            role
+          ]
+        end
+      end
     end
   end
 end

data/app/helpers/decidim/admin/application_helper.rb

@@ -22,6 +22,12 @@ module Decidim
           end
         end
       end
+
+      def foundation_datepicker_locale_tag
+        if I18n.locale != :en
+          javascript_include_tag "datepicker-locales/foundation-datepicker.#{I18n.locale}.js"
+        end
+      end
     end
   end
 end

data/app/views/decidim/admin/categories/index.html.erb

@@ -14,7 +14,7 @@
         <table class="table-list">
           <thead>
             <tr>
-              <th><%= t("models.category.fields.name", scope: "decidim.admin") %></th>
+              <th><%= t("activemodel.attributes.category.name") %></th>
               <th class="actions"></th>
             </tr>
           </thead>

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

@@ -18,7 +18,7 @@
           <% collection.each do |group| %>
             <tr>
               <td>
-                <%= link_to translated_attribute(group.name), group %><br />
+                <%= link_to translated_attribute(group.name), ['edit', group] %><br />
               </td>
               <td class="table-list__actions">
                 <% if can? :update, group %>

data/app/views/decidim/admin/participatory_process_user_roles/_form.html.erb

@@ -15,9 +15,8 @@
       </div>
       <div class="columns xlarge-4">
         <%= form.label :role %>
-        <%= select :participatory_process_user_role, :role, Decidim::Admin::ParticipatoryProcessUserRole::ROLES, include_blank: false %>
+        <%= select :participatory_process_user_role, :role, @form.roles, include_blank: false %>
       </div>
     </div>
-
   </div>
-</div>
+</div>

data/app/views/decidim/admin/participatory_process_user_roles/index.html.erb

@@ -29,7 +29,7 @@
                 <%= role.user.email %><br />
               </td>
               <td>
-                <%= t(".#{role.role}", scope: "decidim.admin") %><br />
+                <%= t("#{role.role}", scope: "decidim.admin.models.participatory_process_user_role.roles") %><br />
               </td>
               <td class="table-list__actions">
                 <% if can? :update, role %>

data/app/views/decidim/admin/static_pages/index.html.erb

@@ -1,6 +1,6 @@
 <div class="card">
   <div class="card-divider">
-    <h2 class="card-title"><%= t "decidim.admin.titles.static_pages" %> <%= link_to t("static_pages.new.title", scope: "decidim.admin"), ['new', 'static_page'], class: 'button tiny button--title new' %></h2>
+    <h2 class="card-title"><%= t "decidim.admin.titles.static_pages" %> <%= link_to t("static_pages.new.create", scope: "decidim.admin"), ['new', 'static_page'], class: 'button tiny button--title new' %></h2>
   </div>
   <div class="card-section">
     <div class="table-scroll">
@@ -16,7 +16,7 @@
           <% @pages.each do |page| %>
             <tr>
               <td>
-                <%= link_to translated_attribute(page.title), page %><br />
+                <%= link_to translated_attribute(page.title), ['edit', page] %><br />
               </td>
               <td>
                 <%= l page.created_at, format: :short %>

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

@@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html lang="<%= I18n.locale %>">
   <head>
     <meta charset="utf-8">
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
@@ -9,6 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><%= title %></title>
     <%= render partial: 'layouts/decidim/admin/header' %>
+    <%= foundation_datepicker_locale_tag %>
   </head>
   <body>
     <%= render partial: 'layouts/decidim/admin/template_top' %>

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

@@ -4,7 +4,7 @@
       <%= 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' %>
+      <%= link_to t("static_pages.new.create", scope: "decidim.admin"), ['new', 'static_page'], class: 'button expanded small new' %>
     </div>
   </div>
 <% end %>

data/config/i18n-tasks.yml

@@ -96,6 +96,8 @@ ignore_unused:
  - decidim.admin.participatory_process_steps.default_title
  - activemodel.errors.messages.*
  - actions.confirm_destroy
+ - time.formats.*
+
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'

data/config/locales/ca.yml

@@ -10,7 +10,7 @@ ca:
       category:
         description: Descripció
         name: Nom
-        parent: Pare
+        parent_id: Superior
       feature:
         name: Nom
         weight: Pes
@@ -97,6 +97,9 @@ ca:
         subtitle: Subtítol
         target: A qui va dirigit?
         title: Títol
+      decidim/participatory_process_step:
+        end_date: Data de finalització
+        start_date: Data d'inici
       decidim/static_page:
         content: Contingut
         slug: Nom curt d'URL
@@ -111,7 +114,7 @@ ca:
         destroy: Eliminar
         edit: Editar
         manage: Gestionar
-        new: Nou %{name}
+        new: Nou/va
         permissions: Permisos
         preview: Previsualitzar
         publish: Publicar
@@ -126,7 +129,7 @@ ca:
           success: L'adjunt s'ha eliminat correctament.
         edit:
           title: Edita arxiu adjunt
-          update: Actualitza adjunt
+          update: Actualitzar
         form:
           current_file: Fitxer actual
           url: URL
@@ -145,7 +148,7 @@ ca:
           success: Categoria eliminada correctament.
         edit:
           title: Edita categoria
-          update: Actualitza la categoria
+          update: Actualitzar
         new:
           create: Crea una categoria
           title: Nova categoria
@@ -168,8 +171,6 @@ ca:
               steps_title: Fases
           participatory_process_user_roles:
             index:
-              admin: Administrador
-              collaborator: Col·laborador
               process_admins_title: Usuaris del procés participatiu
       feature_permissions:
         edit:
@@ -234,8 +235,6 @@ ca:
             title: Títol
           name: Arxiu adjunt
         category:
-          fields:
-            name: Nom
           name: Categoria
         newsletter:
           fields:
@@ -267,6 +266,9 @@ ca:
             name: Nom
             role: Rol
           name: Usuari del procés
+          roles:
+            admin: Administrador
+            collaborator: Col·laborador
         scope:
           fields:
             created_at: Data de creació
@@ -326,7 +328,7 @@ ca:
       organization:
         edit:
           title: Edita organització
-          update: Actualitza organització
+          update: Actualitzar
         form:
           current_image: Imatge actual
           facebook: Facebook
@@ -374,9 +376,9 @@ ca:
           success: La fase de procés participatiu s'ha eliminat correctament.
         edit:
           title: Editar fase de procés participatiu
-          update: Actualitzar fase de procés participatiu
+          update: Actualitzar
         new:
-          create: Crear fase de procés participatiu
+          create: Crear
           title: Nova fase de procés participatiu
         ordering:
           error: S'ha produït un error en la reordenació de les fases d'aquest procés participatiu.
@@ -405,7 +407,7 @@ ca:
         destroy:
           success: El procés participatiu s'ha eliminat correctament.
         edit:
-          update: Actualitzar procés participatiu
+          update: Actualitzar
         form:
           current_image: imatge actual
           title: Informació general
@@ -414,7 +416,7 @@ ca:
           not_published: No publicat
           published: Publicat
         new:
-          create: Crear procés participatiu
+          create: Crear
           title: Nou procés participatiu
         update:
           error: S'ha produït un error en l'actualització d'aquest procés participatiu.
@@ -431,7 +433,7 @@ ca:
           success: Àmbit eliminat amb èxit
         edit:
           title: Edita àmbit
-          update: Actualitza àmbit
+          update: Actualitzar
         new:
           create: Crea àmbit
           title: Nou àmbit
@@ -448,9 +450,9 @@ ca:
           success: La pàgina s'ha eliminat correctament.
         edit:
           title: Editar pàgina
-          update: Actualitzar pàgina
+          update: Actualitzar
         new:
-          create: Crear pàgina
+          create: Nova
           title: Nova pàgina
         update:
           error: S'ha produït un error en l'actualització d'aquests pàgina.
@@ -516,4 +518,7 @@ ca:
         settings:
           title: Configuració
         users:
-          title: Usuaris
+          title: Usuaris
+  time:
+    formats:
+      timepicker: "%d / %m / %Y %H:%M"