decidim 0.0.7 → 0.0.8.1

data/Rakefile

@@ -4,6 +4,9 @@ require "rspec/core/rake_task"
 require_relative "lib/generators/decidim/app_generator"
 require_relative "lib/generators/decidim/docker_generator"
 
+load "decidim-core/lib/tasks/decidim_tasks.rake"
+load "decidim-dev/lib/tasks/test_app.rake"
+
 DECIDIM_GEMS = %w(core system admin api pages meetings proposals comments results budgets dev).freeze
 
 RSpec::Core::RakeTask.new(:spec)
@@ -11,7 +14,7 @@ RSpec::Core::RakeTask.new(:spec)
 task default: :spec
 
 desc "Runs all tests in all Decidim engines"
-task :test_all do
+task test_all: ['decidim:generate_test_app'] do
   DECIDIM_GEMS.each do |gem_name|
     Dir.chdir("#{File.dirname(__FILE__)}/decidim-#{gem_name}") do
       sh "rake"
@@ -19,15 +22,6 @@ task :test_all do
   end
 end
 
-desc "Generates test apps for all the engines"
-task :generate_all do
-  DECIDIM_GEMS.each do |gem_name|
-    Dir.chdir("#{File.dirname(__FILE__)}/decidim-#{gem_name}") do
-      sh "rake generate_test_app"
-    end
-  end
-end
-
 desc "Pushes a new build for each gem."
 task release_all: [:webpack] do
   sh "rake release"
@@ -49,9 +43,11 @@ task :development_app do
   )
 
   Dir.chdir("#{File.dirname(__FILE__)}/development_app") do
-    sh "bundle exec spring stop"
-    sh "bundle exec rake db:drop db:create db:migrate db:seed"
-    sh "bundle exec rails generate decidim:demo"
+    Bundler.with_clean_env do
+      sh "bundle exec spring stop"
+      sh "bundle exec rake db:drop db:create db:migrate db:seed"
+      sh "bundle exec rails generate decidim:demo"
+    end
   end
 end
 

data/decidim-admin/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/decidim-admin/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/decidim-admin/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/decidim-admin/app/assets/stylesheets/decidim/admin/_decidim.scss

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

data/decidim-admin/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/decidim-admin/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/decidim-admin/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/decidim-admin/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/decidim-admin/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/decidim-admin/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/decidim-admin/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/decidim-admin/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/decidim-admin/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/decidim-admin/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 %>