decidim-decidim_awesome 0.6.7 → 0.8.1

data/app/uploaders/decidim/decidim_awesome/image_uploader.rb

@@ -4,27 +4,10 @@ module Decidim
   module DecidimAwesome
     # This class deals with uploading images to a Blueprints.
     class ImageUploader < Decidim::ImageUploader
-      process :validate_size, :validate_dimensions
-
-      version :thumbnail do
-        process resize_to_fit: [nil, 237]
-      end
-
-      # TODO: remove when diching 0.22 support
-      def extension_white_list
-        %w(jpg jpeg png)
-      end
-
-      def extension_whitelist
-        %w(jpg jpeg png)
-      end
-
-      def content_type_whitelist
-        %w(image/jpeg image/png)
-      end
-
-      def max_image_height_or_width
-        8000
+      set_variants do
+        {
+          thumbnail: { resize_to_fit: [nil, 237] }
+        }
       end
     end
   end

data/app/views/decidim/decidim_awesome/admin/checks/index.html.erb

@@ -4,13 +4,23 @@
   </div>
   <div class="card-section">
     <p>
-      <%= t ".decidim_version", version: decidim_version %>
-      <% if decidim_version_valid? %>
-        <%= check :ok %>
-      <% else %>
-        <%= check :ko %>
-      <% end %>
-      </p>
+      <span class="label <%= decidim_version_valid? ? "success" : "alert" %>"><%= t ".decidim_version", version: decidim_version %></span>
+      <%= check decidim_version_valid? %>
+    </p>
+  </div>
+  <div class="card-section">
+    <p><%= t(".images_migrated") %>
+    <% if images_migrated? %>
+      <%= check true %></p>
+    <% else %>
+      <%= check false %></p>
+      <div class="callout alert">
+        <p><%= t(".pending_image_migrations", total: pending_image_migrations).html_safe %></p>
+        <%= link_to t(".start_image_migrations"), migrate_images_path, method: :post, class: "button" %>
+      </div>
+    <% end %>
+  </div>
+  <div class="card-section">
     <ul class="vertical menu">
       <% overrides.each do |group, props| %>
       <li>
@@ -19,11 +29,7 @@
           <% props.files.each do |file, md5| %>
           <li>
             <%= file %>
-            <% if valid?(props.spec, file) %>
-              <%= check :ok %>
-            <% else %>
-              <%= check :ko %>
-            <% end %>
+            <%= check(valid?(props.spec, file)) %>
           </li>
           <% end %>
         </ul>
@@ -36,15 +42,15 @@
         <strong><%= t ".head_tags" %></strong>
         <ul class="vertical menu">
         <% {
-          CSS: "//link[@rel='stylesheet'][contains(@href,'decidim_awesome')]",
-          JavaScript: "//script[contains(@src,'decidim_awesome')]"
+          CSS: "//link[@rel='stylesheet'][contains(@href,'decidim_decidim_awesome')]",
+          JavaScript: "//script[contains(@src,'decidim_decidim_awesome')]"
           }.each do |part, xpath| %>
           <li>
             <%= part %>
-            <% if head.xpath(xpath).count > 0 %>
-              <%= check :ok %>
+            <% if head.xpath(xpath).count.positive? %>
+              <%= check true %>
             <% else %>
-              <%= check :ko %>
+              <%= check false %>
               <p class="help-text"><%= t ".errors.#{part}" %>:</p>
               <code class="help-text code-block"><%= head_addons(part) %></code>
             <% end %>
@@ -56,15 +62,15 @@
         <strong><%= t ".admin_head_tags" %></strong>
         <ul class="vertical menu">
         <% {
-          CSS: "//link[@rel='stylesheet'][contains(@href,'decidim_awesome/admin')]",
-          JavaScript: "//script[contains(@src,'decidim_awesome/admin')]"
+          CSS: "//link[@rel='stylesheet'][contains(@href,'decidim_admin_decidim_awesome')]",
+          JavaScript: "//script[contains(@src,'decidim_admin_decidim_awesome')]"
           }.each do |part, xpath| %>
           <li>
             <%= part %>
-            <% if admin_head.xpath(xpath).count > 0 %>
-              <%= check :ok %>
+            <% if admin_head.xpath(xpath).count.positive? %>
+              <%= check true %>
             <% else %>
-              <%= check :ko %>
+              <%= check false %>
               <p class="help-text"><%= t ".errors.#{part}" %>:</p>
               <code class="help-text code-block"><%= admin_addons(part) %></code>
             <% end %>

data/app/views/decidim/decidim_awesome/admin/config/_autoedit_box_label.html.erb

@@ -0,0 +1,7 @@
+<%= label_tag var do %>
+    <%= t("config.#{var}",
+        scope: "activemodel.attributes",
+        id: "<span class='awesome-auto-edit' data-var='#{var}' data-scope='#{scope}' data-key='#{key}'>#{key}</span>").html_safe %>
+    <%= icon_link_to "pencil", "#", t("edit_label", scope: "decidim.decidim_awesome.admin.config.form"), class: "action-icon--edit awesome-auto-edit", data: { "scope" => "#{scope}" } %>
+    <%= link_to t("remove", scope: "decidim.decidim_awesome.admin.config.form_#{var}"), delete_path, method: :delete, class: "float-right delete-box", data: { confirm: t("sure_to_remove", scope: "decidim.decidim_awesome.admin.config.form_#{var}") } %>
+<% end %>

data/app/views/decidim/decidim_awesome/admin/config/_constraints.html.erb

@@ -11,17 +11,17 @@
     <span class="label warning"><%= t ".always" %></span>
   <% end %>
 
-  <ul class="constraints-list">
+  <ul class="constraints-list<%= " inactive" if constraints&.detect{|c| c.settings["participatory_space_manifest"]=="none" } %>">
     <% constraints&.each do |constraint| %>
         <li>
             <% constraint.settings.reverse_each do |k, val| %>
-              <span class="label <%= k %>"><%= translate_constraint_value constraint, k %></span>
+              <span class="label <%= k %> constraint-<%= val %>"><%= translate_constraint_value constraint, k %></span>
             <% end %>
           <a href="<%= constraint_path(id: constraint.id, key: key) %>" class="edit-condition"><%= t ".edit" %></a>
           <%= link_to t(".delete"), constraint_path(id: constraint.id), remote: true, method: :delete %>
         </li>
       <% end %>
   </ul>
-  <a href="<%= new_constraint_path(key: key) %>" class="add-condition"><%= t ".add_condition" %></a>
+  <a href="<%= new_constraint_path(key: key) %>" class="add-condition" data-open="constraintsModal"><%= t ".add_condition" %></a>
 
 </div>

data/app/views/decidim/decidim_awesome/admin/config/_form_admins.html.erb

@@ -0,0 +1,21 @@
+<div class="row column decidim_awesome-form">
+  <% if config_enabled? :scoped_admins %>
+    <p class="help-text"><%= t("help.scoped_admins", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+
+    <% form.object.scoped_admins&.each do |key, value| %>
+      <div class="scoped_admins_container" data-key="<%= key %>">
+        <%= render(partial: "decidim/decidim_awesome/admin/config/autoedit_box_label", locals: { var: "scoped_admins", key: key, scope: "scoped_admin_#{key}", delete_path: decidim_admin_decidim_awesome.scoped_admin_path(key: key) }) %>
+        <p class="form-error is-visible" id="scoped-admin-error-<%= $key %>"><%= errors[key.to_sym].join("<br>") if errors %></p>
+
+        <%= select_tag "config[scoped_admins][#{key}]", options_from_collection_for_select(users_for(value), :id, :text, proc { true }), { include_blank: false ,  class: "multiusers-select", multiple: true, data: { url: decidim_admin_decidim_awesome.users_path } } %>
+
+        <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: "scoped_admin_#{key}", constraints: constraints_for("scoped_admin_#{key}") }) %>
+      </div>
+    <% end %>
+
+    <%= link_to t("new", scope: "decidim.decidim_awesome.admin.config.form_scoped_admins"), decidim_admin_decidim_awesome.scoped_admins_path, method: :post %>
+
+  <% end %>
+</div>
+
+<%= javascript_pack_tag "decidim_decidim_awesome_admin_form_exit_warn" %>

data/app/views/decidim/decidim_awesome/admin/config/_form_editors.html.erb

@@ -1,5 +1,6 @@
 <div class="row column decidim_awesome-form">
   <p class="help-text"><%= t("help.drag_and_drop_supported", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+  <p class="help-text"><%= t("help.original_editor_override", scope: "decidim.decidim_awesome.admin.config.form") %></p>
 
   <% enabled_configs([:allow_images_in_full_editor, :allow_images_in_small_editor]).each do |key| %>
     <%= form.check_box key %>
@@ -8,13 +9,10 @@
     <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: key, constraints: constraints_for(key) }) %>
   <% end %>
 
-  <h2 class="card-title"><%= t("experimental", scope: "decidim.decidim_awesome.admin.config") %></h2>
-
   <% enabled_configs([:use_markdown_editor, :allow_images_in_markdown_editor]).each do |key| %>
     <%= form.check_box key %>
     <p class="help-text"><%= t("help.#{key}", scope: "decidim.decidim_awesome.admin.config.form") %></p>
 
     <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: key, constraints: constraints_for(key) }) %>
   <% end %>
-
 </div>

data/app/views/decidim/decidim_awesome/admin/config/_form_proposal_custom_fields.html.erb

@@ -0,0 +1,25 @@
+<div class="callout warning"><%= t("caution", scope: "decidim.decidim_awesome.admin.config") %></div>
+<div class="row column decidim_awesome-form">
+  <% if config_enabled? :proposal_custom_fields %>
+    <p class="help-text"><%= t("help.proposal_custom_fields", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+    <p class="help-text"><%= t("help.proposal_custom_fields_example", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+    <p class="help-text"><%= t("help.proposal_custom_fields_translations", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+
+    <% form.object.proposal_custom_fields&.each do |key, value| %>
+      <div class="proposal_custom_fields_container" data-key="<%= key %>">
+        <%= render(partial: "decidim/decidim_awesome/admin/config/autoedit_box_label", locals: { var: "proposal_custom_fields", key: key, scope: "proposal_custom_field_#{key}", delete_path: decidim_admin_decidim_awesome.proposal_custom_field_path(key: key) }) %>
+        <p class="form-error is-visible"><%= errors[key.to_sym].join("<br>") if errors %></p>
+        <%= hidden_field_tag key, value, name: "config[proposal_custom_fields][#{key}]" %>
+        <div class="proposal_custom_fields_editor">
+          <div class="loading-spinner"></div>
+        </div>
+        <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: "proposal_custom_field_#{key}", constraints: constraints_for("proposal_custom_field_#{key}") }) %>
+      </div>
+    <% end %>
+
+    <%= link_to t(".new"), decidim_admin_decidim_awesome.proposal_custom_fields_path, method: :post %>
+
+  <% end %>
+</div>
+
+<%= javascript_pack_tag "decidim_decidim_awesome_admin_form_exit_warn" %>

data/app/views/decidim/decidim_awesome/admin/config/_form_proposals.html.erb

@@ -1,6 +1,4 @@
 <div class="row column decidim_awesome-form">
-  <h2 class="card-title"><%= t("experimental", scope: "decidim.decidim_awesome.admin.config") %></h2>
-
   <% if config_enabled? :allow_images_in_proposals %>
     <p class="text-info"><%= t("rich_text_editor_in_public_views", scope: "decidim.decidim_awesome.admin.config") if current_organization.rich_text_editor_in_public_views %></p>
 

data/app/views/decidim/decidim_awesome/admin/config/_form_styles.html.erb

@@ -1,28 +1,26 @@
 <div class="row column decidim_awesome-form">
   <% if config_enabled? :scoped_styles %>
-    <p class="help-text"><%= t("help.scoped_styles", scope: "decidim.decidim_awesome.admin.config.form") %></p>
-    <p class="help-text">
-      <%= t("help.scoped_styles_variables", scope: "decidim.decidim_awesome.admin.config.form") %><br>
-      <% [:primary, :secondary, :success, :warning, :alert, :highlight, :highlight_alternative].each do |color| %>
-        var(--<%= color %>),
+    <p class="help-text"><%= t("help.scoped_styles", scope: "decidim.decidim_awesome.admin.config.form") %>
+      <%= t("help.scoped_styles_variables", scope: "decidim.decidim_awesome.admin.config.form") %>
+    </p>
+    <p class="help-text" style="white-space: unset">
+      <% ["primary", "secondary", "success", "warning", "alert", "highlight", "highlight_alternative"].each do |color| %>
+        <span class="color-box <%= color %>" style="background-color: <%= current_organization.colors[color] %>"></span> var(--<%= color %>)
       <% end %>
     </p>
 
     <% form.object.scoped_styles&.each do |key, value| %>
-      <div class="scoped-style" data-key="<%= key %>">
-        <%= label_tag :scoped_styles do %>
-          <%= t("config.scoped_styles", scope: "activemodel.attributes", id: key) %>
-          <%= link_to t(".remove"), decidim_admin_decidim_awesome.destroy_scoped_style_path(key: key), method: :post, class: "float-right", data: { confirm: t(".sure_to_remove") } %>
-        <% end %>
-        <p class="form-error is-visible" id="custom-style-error-<%= $key %>"><%= errors[key.to_sym].join("<br>") if errors %></p>
+      <div class="scoped_styles_container" data-key="<%= key %>">
+        <%= render(partial: "decidim/decidim_awesome/admin/config/autoedit_box_label", locals: { var: "scoped_styles", key: key, scope: "scoped_style_#{key}", delete_path: decidim_admin_decidim_awesome.scoped_style_path(key: key) }) %>
+        <p class="form-error is-visible" id="custom-style-error-<%= key %>"><%= errors[key.to_sym].join("<br>") if errors %></p>
         <%= text_area_tag key, value, name: "config[scoped_styles][#{key}]", rows: 5 %>
         <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: "scoped_style_#{key}", constraints: constraints_for("scoped_style_#{key}") }) %>
       </div>
     <% end %>
 
-    <%= link_to t(".new"), decidim_admin_decidim_awesome.new_scoped_style_path, method: :post %>
+    <%= link_to t("new", scope: "decidim.decidim_awesome.admin.config.form_scoped_styles"), decidim_admin_decidim_awesome.scoped_styles_path, method: :post %>
 
   <% end %>
 </div>
 
-<%= javascript_include_tag "decidim/decidim_awesome/admin/form_exit_warn" %>
+<%= javascript_pack_tag "decidim_decidim_awesome_admin_form_exit_warn" %>

data/app/views/decidim/decidim_awesome/admin/config/_modal.html.erb

@@ -1,6 +1,6 @@
 <div class="reveal decidim_awesome modal loading" id="constraintsModal" data-reveal>
   <div class="modal-content">
-
+modal content
   </div>
 
   <div class="spinner"></div>

data/app/views/decidim/decidim_awesome/admin/config/show.html.erb

@@ -1,10 +1,10 @@
-<%= decidim_form_for(@form, method: :patch, url: decidim_admin_decidim_awesome.config_path(params[:var]), html: { class: "awesome-edit-config" }, data: { "safe-path" => decidim_admin_decidim_awesome.config_path(params[:var]) }) do |f| %>
+<%= decidim_form_for(@form, method: :patch, url: decidim_admin_decidim_awesome.config_path(config_var), html: { class: "awesome-edit-config" }, data: { "safe-path" => decidim_admin_decidim_awesome.config_path(config_var) }) do |f| %>
   <div class="card">
     <div class="card-divider">
-      <h2 class="card-title"><%= t(".title", setting: params[:var]) %></h2>
+      <h2 class="card-title"><%= t(".title", setting: config_var) %></h2>
     </div>
     <div class="card-section">
-      <%= render partial: "form_#{params[:var]}", locals: { form: f, errors: defined?(errors) ? errors : nil } %>
+      <%= render partial: "form_#{config_var}", locals: { form: f, errors: defined?(errors) ? errors : nil } %>
     </div>
   </div>
   <div class="button--double form-general-submit">

data/app/views/decidim/decidim_awesome/admin/constraints/new.html.erb

@@ -8,7 +8,7 @@
     </div>
   </div>
   <div class="button--double form-general-submit">
-    <%= f.submit t(".save") %>
+    <button type="submit" class="button" name="commit" data-close><%= t(".save") %></button>
     <button class="button hollow" type="button" data-close><%= t(".cancel") %></button>
   </div>
 <% end %>

data/app/views/decidim/decidim_awesome/admin/custom_redirects/_form.html.erb

@@ -0,0 +1,6 @@
+<div>
+    <%= form.text_field :origin, help_text: t(".origin_help") %>
+    <%= form.text_field :destination, help_text: t(".destination_help") %>
+    <%= form.check_box :active %>
+    <%= form.check_box :pass_query, help_text: t(".pass_query_help").html_safe %>
+</div>

data/app/views/decidim/decidim_awesome/admin/custom_redirects/edit.html.erb

@@ -0,0 +1,13 @@
+<%= decidim_form_for(@form, url: custom_redirect_path, method: :patch, html: { class: :form }) 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/app/views/decidim/decidim_awesome/admin/custom_redirects/index.html.erb

@@ -0,0 +1,37 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+      <%= link_to t(".new"), decidim_admin_decidim_awesome.new_custom_redirect_path, class: "button tiny button--title" %>
+    </h2>
+  </div>
+  <div class="card-section">
+  <p class="help-text"><%= t(".description").html_safe %></p>
+  <div class="row column decidim_awesome-form">
+    <table class="table-list custom-redirections-table">
+      <thead>
+        <tr>
+          <th><%= t("custom_redirect.active", scope: "activemodel.attributes") %></th>
+          <th><%= t("custom_redirect.origin", scope: "activemodel.attributes") %></th>
+          <th><%= t("custom_redirect.destination", scope: "activemodel.attributes") %></th>
+          <th class="redirect-status"><%= link_to(t(".check_redirections"), "#", class: "button small pull-right secondary check-custom-redirections") if current_config.present? %></th>
+          <th class="actions"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% current_config.each do |origin, item| %>
+          <tr class="custom-redirection" data-origin="<%= origin %>" data-item="<%= item.to_json %>">
+            <td><%= check item["active"] %></td>
+            <td><%= link_to origin, origin, target: "_blank" %></td>
+            <td><%= item["destination"] %></td>
+            <td class="redirect-status"></td>
+            <td class="table-list__actions">
+              <%= icon_link_to "pencil", decidim_admin_decidim_awesome.edit_custom_redirect_path(md5(origin)), t(".edit"), class: "action-icon--edit" %>
+              <%= icon_link_to "circle-x", decidim_admin_decidim_awesome.custom_redirect_path(md5(origin)), t(".remove"), method: :delete, class: "action-icon--remove", data: { confirm: t(".confirm_destroy") } %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>

data/app/views/decidim/decidim_awesome/admin/custom_redirects/new.html.erb

@@ -0,0 +1,13 @@
+<%= decidim_form_for(@form, url: custom_redirects_path, html: { class: :form }) 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/app/views/decidim/decidim_awesome/admin/menu_hacks/edit.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, url: menu_hack_path, method: :patch) do |f| %>
+<%= decidim_form_for(@form, url: menu_hack_path, method: :patch, html: { class: :form }) do |f| %>
   <div class="card">
     <div class="card-divider">
       <h2 class="card-title"><%= t ".title" %></h2>

data/app/views/decidim/decidim_awesome/admin/menu_hacks/new.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, url: menu_hacks_path) do |f| %>
+<%= decidim_form_for(@form, url: menu_hacks_path, html: { class: :form }) do |f| %>
   <div class="card">
     <div class="card-divider">
       <h2 class="card-title"><%= t ".title" %></h2>

data/app/views/decidim/decidim_awesome/admin/proposals/_editor.html.erb

@@ -0,0 +1,6 @@
+<%= admin_editor_for_proposal_body(form) %>
+<% unless awesome_proposal_custom_fields.blank? %>
+  <div class="proposal_custom_field">
+    <div class="loading-spinner"></div>
+  </div>
+<% end %>

data/app/views/decidim/decidim_awesome/custom_fields/_form_render.html.erb

@@ -0,0 +1,6 @@
+<div class="proposal_custom_field" id="proposa-custom-field-<%= name %>" data-spec="<%= spec.to_json %>" data-name="<%= "#{form.object_name}[#{name}]" %>">
+  <div class="loading-spinner"></div>
+</div>
+
+<%= form.hidden_field name %>
+<%= form.error_for name %>

data/app/views/decidim/decidim_awesome/iframe_component/iframe/show.html.erb

@@ -1,6 +1,6 @@
 <%= announcement = render(partial: "decidim/shared/component_announcement") %>
 
-<%= stylesheet_link_tag "decidim/decidim_awesome/awesome_iframe/iframe" %>
+<%= stylesheet_pack_tag "decidim_decidim_awesome_iframe" %>
 
 <style rel="stylesheet" type="text/css">
 <% if remove_margins? %>

data/app/views/decidim/decidim_awesome/map_component/map/_api_ready.html.erb

@@ -0,0 +1,3 @@
+<% unless api_ready? %>
+  <%= cell("decidim/announcement", t("api_not_ready", scope: "decidim.decidim_awesome.map_component.map", current_complexity: Decidim::Api::Schema.max_complexity), { callout_class: "alert" }) %>
+<% end %>

data/app/views/decidim/decidim_awesome/map_component/map/_map_template.html.erb

@@ -0,0 +1,68 @@
+<div class="loading-spinner"></div>
+
+<script id="marker-proposal-popup" type="text/x-jsrender">
+  <div class="map-info__content">
+    <h3>{{:title.translation}}</h3>
+    <div id="bodyContent">
+      <div class="description">{{:body.translation}}</div>
+      <div class="map__date-adress">
+        <div class="address card__extra">
+          <div class="address__icon">{{:icon}}</div>
+          <div class="address__details">
+            <span>{{>address}}</span><br>
+          </div>
+        </div>
+      </div>
+      <div class="map-info__button">
+        <a href="{{>link}}" class="button button--sc">
+          <%= t("view_proposal", scope: "decidim.decidim_awesome.map_component.map.show") %>
+        </a>
+      </div>
+    </div>
+  </div>
+</script>
+
+<script id="marker-meeting-popup" type="text/x-jsrender">
+  <div class="map-info__content">
+    <h3>{{:title.translation}}</h3>
+    <div id="bodyContent">
+      <div class="description">{{:body.translation}}</div>
+      <div class="map__date-adress">
+        <div class="card__datetime">
+          <div class="card__datetime__date">
+            {{>startTimeDay}} <span class="card__datetime__month">{{>startTimeMonth}} {{>startTimeYear}}</span>
+          </div>
+          <div class="card__datetime__time">{{>starTime}}</div>
+        </div>
+        <div class="address card__extra">
+          <div class="address__icon">{{:icon}}</div>
+          <div class="address__details">
+            <strong>{{:location.translation}}</strong><br>
+            <span>{{>address}}</span><br>
+            <span>{{:locationHints.translation}}</span>
+          </div>
+        </div>
+      </div>
+      <div class="map-info__button">
+        <a href="{{>link}}" class="button button--sc">
+          <%= t("view_meeting", scope: "decidim.meetings.meetings_map") %>
+        </a>
+      </div>
+    </div>
+  </div>
+</script>
+
+<style type="text/css">
+  #awesome-map .google-map, .wrapper #awesome-map .google-map {
+    height: <%= map_height %>px;
+  }
+  <% current_categories(categories).each do |category| %>
+    .awesome_map-category_<%= category[:id] %> {
+      background-color: <%= category[:color] %> !important;
+    }
+  <% end %>
+</style>
+<script>
+  window.AwesomeMap = window.AwesomeMap || {};
+  window.AwesomeMap.categories = <%= current_categories(categories).to_json.html_safe %>;
+</script>

data/app/views/decidim/decidim_awesome/map_component/map/{error.erb → error.html.erb}

@@ -3,5 +3,7 @@
     <div class="callout alert">
       <p><%= t ".unavailable" %></p>
     </div>
+
+    <%= render partial: "api_ready" %>
   </div>
 </div>

data/app/views/decidim/decidim_awesome/map_component/map/show.html.erb

@@ -1,103 +1,7 @@
 <%= render partial: "decidim/shared/component_announcement" %>
 
-<%= awesome_map_for map_components do %>
-
-  <script id="legacy-marker-proposal-popup" type="text/x-jsrender">
-    <div class="map-info__content">
-      <h3>{{>title}}</h3>
-      <div id="bodyContent">
-        <div class="description">{{:body}}</div>
-        <div class="map__date-adress">
-          <div class="address card__extra">
-            <div class="address__icon">{{:icon}}</div>
-            <div class="address__details">
-              <span>{{>address}}</span><br>
-            </div>
-          </div>
-        </div>
-        <div class="map-info__button">
-          <a href="{{>link}}" class="button button--sc">
-            <%= t(".view_proposal") %>
-          </a>
-        </div>
-      </div>
-    </div>
-  </script>
-
-  <script id="marker-proposal-popup" type="text/x-jsrender">
-    <div class="map-info__content">
-      <h3>{{>title.translation}}</h3>
-      <div id="bodyContent">
-        <div class="description">{{:body.translation}}</div>
-        <div class="map__date-adress">
-          <div class="address card__extra">
-            <div class="address__icon">{{:icon}}</div>
-            <div class="address__details">
-              <span>{{>address}}</span><br>
-            </div>
-          </div>
-        </div>
-        <div class="map-info__button">
-          <a href="{{>link}}" class="button button--sc">
-            <%= t(".view_proposal") %>
-          </a>
-        </div>
-      </div>
-    </div>
-  </script>
+<%= render partial: "api_ready" %>
 
-  <script id="marker-meeting-popup" type="text/x-jsrender">
-    <div class="map-info__content">
-      <h3>{{>title.translation}}</h3>
-      <div id="bodyContent">
-        <div class="description">{{:description.translation}}</div>
-        <div class="map__date-adress">
-          <div class="card__datetime">
-            <div class="card__datetime__date">
-              {{>startTimeDay}} <span class="card__datetime__month">{{>startTimeMonth}} {{>startTimeYear}}</span>
-            </div>
-            <div class="card__datetime__time">{{>starTime}}</div>
-          </div>
-          <div class="address card__extra">
-            <div class="address__icon">{{:icon}}</div>
-            <div class="address__details">
-              <strong>{{:location.translation}}</strong><br>
-              <span>{{>address}}</span><br>
-              <span>{{:locationHints.translation}}</span>
-            </div>
-          </div>
-        </div>
-        <div class="map-info__button">
-          <a href="{{>link}}" class="button button--sc">
-            <%= t("decidim.meetings.meetings_map.view_meeting") %>
-          </a>
-        </div>
-      </div>
-    </div>
-  </script>
-
-  <%= stylesheet_link_tag "decidim/decidim_awesome/awesome_map/map" %>
-  <style type="text/css">
-    #map, .wrapper #map {
-      height: <%= current_component.settings.map_height %>px;
-    }
-    <% current_categories.each do |category| %>
-      /* TODO: remove when diching 0.22 */
-      i.awesome_map-category_<%= category[:id] %> {
-        margin-left: <%= category[:parent] ? "1" : "0" %>em;
-      }
-      .awesome_map-category-<%= category[:id] %> i {
-        background-color: <%= category[:color] %> !important;
-      }
-    <% end %>
-  </style>
-  <script>
-    window.AwesomeMap = window.AwesomeMap || {};
-    window.AwesomeMap.categories = <%= current_categories.to_json.html_safe %>;
-  </script>
-  <% if version_prefix == "v0.23" %>
-    <%= javascript_include_tag "decidim/decidim_awesome/awesome_map/map" %>
-  <% else %>
-    <%= javascript_include_tag "decidim/decidim_awesome/awesome_map/legacy_map" %>
-  <% end %>
+<%= awesome_map_for map_components do %>
+  <%= render partial: "map_template", locals: { categories: current_participatory_space.categories, map_height: current_component.settings.map_height } %>
 <% end %>