decidim 0.0.8.1 → 0.1.0

data/decidim-admin/app/assets/stylesheets/decidim/admin/vendor/mathsass/functions/_ldexp.scss

@@ -0,0 +1,17 @@
+// Returns $x * 2^$exp
+// @param {Number} $x
+// @param {Number} $exp
+@function ldexp ($x, $exp) {
+    $b: if($exp >= 0, 2, 1 / 2);
+    @if $exp < 0 {
+        $exp: $exp * -1;
+    }
+    @while $exp > 0 {
+        @if $exp % 2 == 1 {
+            $x: $x * $b;
+        }
+        $b: $b * $b;
+        $exp: floor($exp * 0.5);
+    }
+    @return $x;
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/vendor/mathsass/functions/_log.scss

@@ -0,0 +1,34 @@
+// Returns the natural logarithm of a number.
+// @param {Number} $x
+// @param {Number} $b The base number
+// @example
+//     log(2)     // 0.69315
+//     log(10)    // 2.30259
+//     log(2, 10) // 0.30103
+@function log ($x, $b: null) {
+    @if $b == null {
+        @return _log($x);
+    } @else {
+        @return _log($x) / _log($b);
+    }
+}
+
+@function _log ($x) {
+    @if $x <= 0 {
+        @return 0 / 0;
+    }
+    $k: nth(frexp($x / $SQRT2), 2);
+    $x: $x / ldexp(1, $k);
+    $x: ($x - 1) / ($x + 1);
+    $x2: $x * $x;
+    $i: 1;
+    $s: $x;
+    $sp: null;
+    @while $sp != $s {
+        $x: $x * $x2;
+        $i: $i + 2;
+        $sp: $s;
+        $s: $s + $x / $i;
+    }
+    @return $LN2 * $k + 2 * $s;
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/vendor/mathsass/functions/_pow.scss

@@ -0,0 +1,28 @@
+// Returns base to the exponent power.
+// @param {Number} $base The base number
+// @param {Number} $exp The exponent to which to raise base
+// @return {Number}
+// @example
+//     pow(4, 2)   // 16
+//     pow(4, -2)  // 0.0625
+//     pow(4, 0.2) // 1.31951
+@function pow ($base, $exp) {
+    @if $exp == floor($exp) {
+        $r: 1;
+        $s: 0;
+        @if $exp < 0 {
+            $exp: $exp * -1;
+            $s: 1;
+        }
+        @while $exp > 0 {
+            @if $exp % 2 == 1 {
+                $r: $r * $base;
+            }
+            $exp: floor($exp * 0.5);
+            $base: $base * $base;
+        }
+        @return if($s != 0, 1 / $r, $r);
+    } @else {
+        @return exp(log($base) * $exp);
+    }
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/vendor/mathsass/functions/_sec.scss

@@ -0,0 +1,9 @@
+// Returns the secant of a number.
+// @param {Number} $x A number in rad or deg. Assuming unitless number to be in rad.
+// @example
+//     sec(0.7854) // 1.41422
+//     sec(45deg)  // 1.41422
+@function sec ($x) {
+    $x: unitless-rad($x);
+    @return 1 / cos($x);
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/vendor/mathsass/functions/_sin.scss

@@ -0,0 +1,9 @@
+// Returns the sine of a number.
+// @param {Number} $x A number in rad or deg. Assuming unitless number to be in rad.
+// @example
+//     sin(1.0472) // 0.86603
+//     sin(60deg)  // 0.86603
+@function sin ($x) {
+    $x: unitless-rad($x);
+    @return cos($x - $PI / 2);
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/vendor/mathsass/functions/_sqrt.scss

@@ -0,0 +1,16 @@
+// Returns the square root of a number.
+// @param {Number} $x
+// @example
+//     sqrt(2) // 1.41421
+//     sqrt(5) // 2.23607
+@function sqrt ($x) {
+    @if $x < 0 {
+        @warn "Argument for `sqrt()` must be a positive number.";
+        @return null;
+    }
+    $ret: 1;
+    @for $i from 1 through 24 {
+        $ret: $ret - (pow($ret, 2) - $x) / (2 * $ret);
+    }
+    @return $ret;
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/vendor/mathsass/functions/_tan.scss

@@ -0,0 +1,9 @@
+// Returns the tangent of a number.
+// @param {Number} $x A number in rad or deg. Assuming unitless number to be in rad.
+// @example
+//     tan(0.5236) // 0.57735
+//     tan(30deg)  // 0.57735
+@function tan ($x) {
+    $x: unitless-rad($x);
+    @return sin($x) / cos($x);
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/vendor/mathsass/helpers/_deg-to-rad.scss

@@ -0,0 +1,4 @@
+// Convert deg to rad
+@function deg-to-rad ($deg, $unit: true) {
+    @return strip-unit($deg) * $PI / 180 * if($unit, 1rad, 1);
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/vendor/mathsass/helpers/_rad-to-deg.scss

@@ -0,0 +1,4 @@
+// Convert rad to deg
+@function rad-to-deg ($rad, $unit: true) {
+    @return strip-unit($rad) * 180 / $PI * if($unit, 1deg, 1);
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/vendor/mathsass/helpers/_strip-unit.scss

@@ -0,0 +1,8 @@
+// Strip unit from a number
+@function strip-unit ($number) {
+    @if unitless($number) {
+        @return $number;
+    } @else {
+        @return $number / ($number * 0 + 1);
+    }
+}

data/decidim-admin/app/assets/stylesheets/decidim/admin/vendor/mathsass/helpers/_unitless-rad.scss

@@ -0,0 +1,13 @@
+// Convert to unitless rad
+@function unitless-rad ($angle) {
+    @if unitless($angle) {
+        @return $angle;
+    } @else if unit($angle) == rad {
+        @return $angle / 1rad;
+    } @else if unit($angle) == deg {
+        @return deg-to-rad($angle, false);
+    } @else if type-of($angle) != number or not unitless($angle) {
+        @warn "#{ $angle } is not a valid number.";
+        @return $angle;
+    }
+}

data/decidim-admin/app/commands/decidim/admin/create_participatory_process.rb

@@ -35,24 +35,30 @@ module Decidim
       attr_reader :form
 
       def create_participatory_process
-        transaction do
-          process = ParticipatoryProcess.new(
-            title: form.title,
-            subtitle: form.subtitle,
-            slug: form.slug,
-            hashtag: form.hashtag,
-            description: form.description,
-            short_description: form.short_description,
-            hero_image: form.hero_image,
-            banner_image: form.banner_image,
-            promoted: form.promoted,
-            meta_scope: form.meta_scope,
-            scope: form.scope,
-            organization: form.current_organization,
-            participatory_process_group: form.participatory_process_group
-          )
+        process = ParticipatoryProcess.new(
+          organization: form.current_organization,
+          title: form.title,
+          subtitle: form.subtitle,
+          slug: form.slug,
+          hashtag: form.hashtag,
+          description: form.description,
+          short_description: form.short_description,
+          hero_image: form.hero_image,
+          banner_image: form.banner_image,
+          promoted: form.promoted,
+          scope: form.scope,
+          developer_group: form.developer_group,
+          local_area: form.local_area,
+          target: form.target,
+          participatory_scope: form.participatory_scope,
+          participatory_structure: form.participatory_structure,
+          meta_scope: form.meta_scope,
+          end_date: form.end_date,
+          participatory_process_group: form.participatory_process_group
+        )
 
-          return process unless process.valid?
+        return process unless process.valid?
+        transaction do
           process.save!
 
           process.steps.create!(

data/decidim-admin/app/commands/decidim/admin/create_participatory_process_group.rb

@@ -36,7 +36,7 @@ module Decidim
 
       def create_participatory_process_group
         transaction do
-          group = ParticipatoryProcessGroup.create(
+          ParticipatoryProcessGroup.create(
             name: form.name,
             description: form.description,
             hero_image: form.hero_image,

data/decidim-admin/app/controllers/decidim/admin/moderations_controller.rb

@@ -48,10 +48,10 @@ module Decidim
       def moderations
         @moderations ||= begin
           moderations = Decidim::Moderation.where(participatory_process: participatory_process)
-          moderations = if params[:hidden]
-                          moderations.where.not(hidden_at: nil)
-                        else
-                          moderations.where(hidden_at: nil)
+          if params[:hidden]
+            moderations.where.not(hidden_at: nil)
+          else
+            moderations.where(hidden_at: nil)
           end
         end
       end

data/decidim-admin/app/controllers/decidim/admin/participatory_processes_controller.rb

@@ -26,7 +26,7 @@ module Decidim
         CreateParticipatoryProcess.call(@form) do
           on(:ok) do |participatory_process|
             flash[:notice] = I18n.t("participatory_processes.create.success", scope: "decidim.admin")
-            redirect_to participatory_process_path(participatory_process)
+            redirect_to edit_participatory_process_path(participatory_process)
           end
 
           on(:invalid) do

data/decidim-admin/app/forms/decidim/admin/organization_form.rb

@@ -32,8 +32,12 @@ module Decidim
       validates :default_locale, presence: true
       validates :default_locale, inclusion: { in: :available_locales }
 
-      validates :official_img_header, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
-      validates :official_img_footer, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
+      validates :official_img_header,
+                file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
+                file_content_type: { allow: ["image/jpeg", "image/png"] }
+      validates :official_img_footer,
+                file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
+                file_content_type: { allow: ["image/jpeg", "image/png"] }
 
       private
 

data/decidim-admin/app/forms/decidim/admin/participatory_process_form.rb

@@ -38,6 +38,11 @@ module Decidim
       validates :hero_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
       validates :banner_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
 
+      def map_model(model)
+        self.scope_id = model.decidim_scope_id
+        self.participatory_process_group_id = model.decidim_participatory_process_group_id
+      end
+
       def scope
         @scope ||= current_organization.scopes.where(id: scope_id).first
       end

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

@@ -15,7 +15,7 @@ module Decidim
         current_organization.name
       end
 
-      def admin_menu_item_to(name, url, options={})
+      def admin_menu_item_to(name, url, options = {})
         content_tag :li, class: options[:active_class] || active_link_to_class(url, active: options[:active], class_active: "is-active") do
           active_link_to url, active: options[:active], class_active: "is-active" do
             icon(options[:icon_name] || name) + I18n.t("menu.#{name}", scope: "decidim.admin")

data/decidim-admin/app/helpers/decidim/admin/attributes_display_helper.rb

@@ -6,7 +6,7 @@ module Decidim
     module AttributesDisplayHelper
       # Displays the given attributes list in a list. This is a simple
       # `show_for` alternative, so there's no way to modify how an attribute is
-      # shown and there is no intention on adding this. It is intnded to be
+      # shown and there is no intention on adding this. It is intended to be
       # used inside a `dl` HTML tag, so you can customize how a specific
       # attribute has to be shown directly:
       #

data/decidim-admin/app/views/decidim/admin/features/_feature.html.erb

@@ -25,7 +25,11 @@
     <% end %>
 
     <% if can? :update, feature %>
-      <%= icon_link_to "key", edit_participatory_process_feature_permissions_path(feature_id: feature), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
+      <% if feature.manifest.actions.empty? %>
+        <%= icon "key", class: "action-icon action-icon--disabled" %>
+      <% else %>
+        <%= icon_link_to "key", edit_participatory_process_feature_permissions_path(feature_id: feature), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
+      <% end %>
     <% end %>
 
     <%= icon_link_to "circle-x", url_for(action: :destroy, id: feature, controller: "features"), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete %>

data/decidim-admin/app/views/decidim/admin/moderations/_report.html.erb

@@ -0,0 +1,11 @@
+<% if report.details.blank? %>
+  <%= report.reason %>
+<% else %>
+  <span
+    data-tooltip
+    aria-haspopup="true"
+    class="has-tip"
+    title="<%= report.details %>">
+      <%= report.reason %>
+  </span>
+<% end %>

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

@@ -20,7 +20,9 @@
             <th><%= t("models.moderation.fields.reported_content", scope: "decidim.moderations") %></th>
             <th><%= t("models.moderation.fields.reports", scope: "decidim.moderations") %></th>
             <th><%= t("models.moderation.fields.report_count", scope: "decidim.moderations") %></th>
-            <th><%= t("models.moderation.fields.hidden_at", scope: "decidim.moderations") %></th>
+            <% if params[:hidden] %>
+              <th><%= t("models.moderation.fields.hidden_at", scope: "decidim.moderations") %></th>
+            <% end %>
             <th class="actions"><%= t("actions.title", scope: "decidim.moderations") %></th>
           </tr>
         </thead>
@@ -28,42 +30,38 @@
           <% moderations.each do |moderation| %>
             <tr data-id="<%= moderation.id %>">
               <td>
-                <%= moderation.reportable.class.name %>
+                <%= moderation.reportable.class.name.demodulize %>
               </td>
               <td>
                 <%= moderation.reportable.reported_content %>
               </td>
               <td>
-                <ul>
-                  <% moderation.reports.each do |report| %>
-                    <li>
-                      <% if report.details.blank? %>
-                        <%= report.reason %>
-                      <% else %>
-                        <span
-                          data-tooltip
-                          aria-haspopup="true"
-                          class="has-tip"
-                          title="<%= report.details %>">
-                            <%= report.reason %>
-                        </span>
-                      <% end %>
-                    </li>
-                  <% end %>
-                </ul>
+                <% reports = moderation.reports.map { |report| render 'report', report: report } %>
+                <%= safe_join(reports, ',') %>
               </td>
               <td>
                 <%= moderation.report_count %>
               </td>
-              <td>
-                <%= l moderation.hidden_at if moderation.hidden_at.present? %>
-              </td>
+              <% if params[:hidden] %>
+                <td>
+                  <%= l(moderation.hidden_at, format: :long) if moderation.hidden_at.present? %>
+                </td>
+              <% end %>
               <td class="actions">
+
                 <% if can? :unreport, moderation %>
-                  <%= link_to t("actions.unreport", scope: "decidim.moderations"), decidim_admin.unreport_participatory_process_moderation_path(id: moderation), method: :put, class: "button" %>
+                  <%= icon_link_to "action-undo",
+                                   decidim_admin.unreport_participatory_process_moderation_path(id: moderation),
+                                   t("actions.unreport", scope: "decidim.moderations"),
+                                   class: "action-icon--unreport",
+                                   method: :put %>
                 <% end %>
                 <% if !moderation.reportable.hidden? && can?(:hide, moderation) %>
-                  | <%= link_to t("actions.hide", scope: "decidim.moderations"), decidim_admin.hide_participatory_process_moderation_path(id: moderation), method: :put, class: "button" %>
+                  <%= icon_link_to "eye",
+                                   decidim_admin.hide_participatory_process_moderation_path(id: moderation),
+                                   t("actions.hide", scope: "decidim.moderations"),
+                                   class: "action-icon--hide",
+                                   method: :put %>
                 <% end %>
               </td>
             </tr>

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

@@ -20,6 +20,9 @@
                 <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 %>
+                    <% if feature.primary_stat.present? %>
+                      <span class="component-counter <%= "component-counter--off" if feature.primary_stat.zero? %>"><%= feature.primary_stat %></span>
+                    <% end %>
                   <% end %>
                 </li>
               <% end %>

data/decidim-admin/config/i18n-tasks.yml

@@ -97,6 +97,7 @@ ignore_unused:
  - activemodel.errors.messages.*
  - actions.confirm_destroy
  - time.formats.*
+ - date.formats.*
 
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'

data/decidim-admin/config/locales/ca.yml

@@ -104,6 +104,9 @@ ca:
         content: Contingut
         slug: Nom curt d'URL
         title: Títol
+  date:
+    formats:
+      datepicker: "%m/%d/%Y"
   decidim:
     admin:
       actions:
@@ -489,7 +492,7 @@ ca:
         hidden: Ocults
         hide: Amagar
         not_hidden: No ocult
-        title: Moderacions
+        title: Accions
         unreport: Desfer denúncia
       admin:
         reportable:
@@ -503,7 +506,7 @@ ca:
         moderation:
           fields:
             hidden_at: Data d'ocultació
-            report_count: Número de denúncies
+            report_count: Recompte
             reportable: Tipus
             reported_content: Contingut
             reports: Denúncies
@@ -521,4 +524,5 @@ ca:
           title: Usuaris
   time:
     formats:
-      timepicker: "%d / %m / %Y %H:%M"
+      datepicker: "%m/%d/%Y"
+      timepicker: "%d/%m/%Y %H:%M"