decidim-navigation_maps 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e228cc94eee3b96290ccd2f50156f43b1a63b8186dc64e38a25a88489bd121be
-  data.tar.gz: 597e8726199d2363007e79dc4cf6273134e624103f560d9328050a79b12ae638
+  metadata.gz: 3095b1ee4ac0d8128711b37b7a59bcc5eb0b42d4ffebfb0021bcc1b549c80dab
+  data.tar.gz: 468c412868fb61196861df0aeceef155551d8f83e4d58dc556778ecbd2ebed2e
 SHA512:
-  metadata.gz: 7550cf1cb5f185cf3f08be289c16c367cde992a339bff165d590d763aa613763ceb13673da48980c0f1463a17b34180d6fadd086b04f9cfd9702ed5a7494b2cf
-  data.tar.gz: 67288244baeecf271c36951d3b0a1d810723dc3d7f9f761878b7f63e06d8c49062af75ed29cb6953a78bef7bf5d92a5a1f0a001da44bb536bef153a48b200d3e
+  metadata.gz: b440bff8af84241131b5e5c11c0b8567d1667a379d1156ca0d3b49c96992366ec304bc394aa8e7382efd38b05d22908471cdf98daf1a181c6b6de436d13abe9b
+  data.tar.gz: af9064b540070fe4cb45b242a2445d8170f7bfda68457fc4ad5a3eae917d0254afc55c9241c30278bad64115783357c2cbdc645ec97289b5a95380373d42c71f

data/README.md

@@ -15,6 +15,8 @@ homepage only).
 
 👉 [Check the usage guide here!](USAGE.md)
 
+![Homepage](examples/homepage.png)
+
 ![Admin editor](examples/admin.gif)
 
 ## Installation
@@ -22,7 +24,7 @@ homepage only).
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "decidim-navigation_maps", "~> 1.0.0"
+gem "decidim-navigation_maps", "~> 1.1.0"
 ```
 
 And then execute:
@@ -37,7 +39,8 @@ Depending on your Decidim version, choose the corresponding Plugin version to en
 
 | Navigation Maps version | Compatible Decidim versions |
 |---|---|
-| 1.0.x | 0.18.x, 0.21.x |
+| 1.0.x | 0.18.x - 0.21.x |
+| 1.1.x | 0.22.x, 0.23.x |
 
 ## Contributing
 

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

@@ -63,7 +63,7 @@
 
   .tabs-content {
     .map {
-      height: 475px;
+      height: 700px;
     }
     .thumbnail {
       img {

data/app/cells/decidim/navigation_maps/content_blocks/navigation_map/_tabs_content.erb

@@ -2,7 +2,7 @@
 <div class="tabs-content admin" data-tabs-content="navigation_maps-tabs">
   <% tabs.each_with_index do |item, index| %>
     <div class="tabs-panel<%= " is-active" if index.zero? %>" id="map<%= index %>">
-      <%= content_tag(:div, "", id: "navigation_maps-map-#{item.id}", class: "map", data: { id: item.id, image: item.image.url, blueprint: item.blueprint }) %>
+      <%= content_tag(:div, "", id: "navigation_maps-map-#{item.id}", class: "map", style: "height: #{item.height}px", data: { id: item.id, image: item.image.url, blueprint: item.blueprint }) %>
     </div>
   <% end %>
 </div>

data/app/cells/decidim/navigation_maps/content_blocks/navigation_map/_template.erb

@@ -5,7 +5,7 @@
       <p>{{:description}}</p>
       <div class="map-info__button">
         <a href="{{:link}}" class="button button--sc">
-          <%= t(".view") %>
+          <%= t("navigation_map.view", scope: "decidim.navigation_maps.content_blocks") %>
         </a>
       </div>
     </div>

data/app/cells/decidim/navigation_maps/content_blocks/navigation_map_settings_form/_form.erb

@@ -1,15 +1,17 @@
 <ul class="accordion" data-accordion>
   <li class="accordion-item<%= " is-active" unless form.image? %>" data-accordion-item>
-    <a href="#" class="accordion-title"><%= t ".info" %></a>
+    <a href="#" class="accordion-title"><%= t("navigation_map_settings_form.info", scope: "decidim.navigation_maps.content_blocks") %></a>
 
     <div class="accordion-content" data-tab-content>
-      <%= translated_field_tag :text_field_tag, "blueprints[#{form.ident}]", :title, form.title, { tabs_id: "blueprints_#{form.ident}_title", label: t(".title") } %>
+      <%= translated_field_tag :text_field_tag, "blueprints[#{form.ident}]", :title, form.title, { tabs_id: "blueprints_#{form.ident}_title", label: t("navigation_map_settings_form.title", scope: "decidim.navigation_maps.content_blocks") } %>
+      <%= label_tag t("navigation_map_settings_form.height", scope: "decidim.navigation_maps.content_blocks") %>
+      <%= text_field_tag "blueprints[#{form.ident}][height]", form.height, { id: "blueprints_#{form.ident}_height" } %>
 
-      <%= label_tag t(".blueprint_image") %>
+      <%= label_tag t("navigation_map_settings_form.blueprint_image", scope: "decidim.navigation_maps.content_blocks") %>
       <div class="thumbnail">
         <%= image_tag form.image.thumbnail.url if form.image? %>
       </div>
-      <%= file_field_tag "blueprints[#{form.ident}][image]", { id: "blueprints_#{form.ident}_image", label: t(".title") } %>
+      <%= file_field_tag "blueprints[#{form.ident}][image]", { id: "blueprints_#{form.ident}_image", label: t("navigation_map_settings_form.title", scope: "decidim.navigation_maps.content_blocks") } %>
 
       <%= hidden_field_tag "blueprints[#{form.ident}][id]", form.id, { id: "blueprints_#{form.ident}_id" } %>
       <%= hidden_field_tag "blueprints[#{form.ident}][blueprint]", form.blueprint.to_json, { id: "blueprints_#{form.ident}_blueprint" } %>
@@ -17,7 +19,7 @@
       <% if form.id %>
         <label class="delete-tab">
           <%= check_box_tag("blueprints[#{form.ident}][remove]", form.id) %>
-          <%= t(".remove_blueprint") %>
+          <%= t("navigation_map_settings_form.remove_blueprint", scope: "decidim.navigation_maps.content_blocks") %>
         </label>
       <% end %>
   </div>
@@ -25,7 +27,7 @@
 
   <% if form.image? %>
   <li class="accordion-item is-active" data-accordion-item>
-    <a href="#" class="accordion-title"><%= t ".editor" %></a>
+    <a href="#" class="accordion-title"><%= t("navigation_map_settings_form.editor", scope: "decidim.navigation_maps.content_blocks") %></a>
     <div class="accordion-content navigation_maps-content" data-tab-content>
 
       <%= content_tag(:div, "", id: "navigation_maps-map-#{form.ident}", class: "map", data: { id: form.ident, image: form.image.url, blueprint: form.blueprint }) %>

data/app/cells/decidim/navigation_maps/content_blocks/navigation_map_settings_form/_tabs.erb

@@ -2,5 +2,5 @@
   <% tabs.each_with_index do |item, index| %>
     <li class="tabs-title<%= " is-active" if index.zero? %>"><a data-tabs-target="map<%= index %>" href="#map<%= index %>"><%= translated_attribute(item.title).presence || "Tab #{index + 1}" %></a></li>
   <% end %>
-  <li class="tabs-title"><a href="#map-new">+ <%= t ".add" %></a></li>
+  <li class="tabs-title"><a href="#map-new">+ <%= t("navigation_map_settings_form.add", scope: "decidim.navigation_maps.content_blocks") %></a></li>
 </ul>

data/app/cells/decidim/navigation_maps/content_blocks/navigation_map_settings_form/show.erb

@@ -33,3 +33,4 @@
 <%= render partial: "modal" %>
 <%= javascript_include_tag "decidim/navigation_maps/admin/navigation_maps" %>
 <%= stylesheet_link_tag "decidim/navigation_maps/admin/navigation_maps" %>
+      <% console %>

data/app/commands/decidim/navigation_maps/save_blueprints.rb

@@ -48,6 +48,7 @@ module Decidim
       def update_blueprint!(form)
         @blueprint.image = form.image if form.image.present?
         @blueprint.title = form.title
+        @blueprint.height = form.height
         @blueprint.description = form.description
         @blueprint.save!
       end

data/app/forms/decidim/navigation_maps/blueprint_form.rb

@@ -15,9 +15,11 @@ module Decidim
       attribute :image
       translatable_attribute :title, String
       translatable_attribute :description, String
+      attribute :height, Integer
 
       # validate :check_image_or_blueprint
       validates :title, translatable_presence: true
+      validates :height, numericality: { greater_than: 0 }
 
       # def check_image_or_blueprint
       #   return if image.present? || blueprint.present?

data/app/models/decidim/navigation_maps/blueprint.rb

@@ -6,6 +6,8 @@ module Decidim
     class Blueprint < ApplicationRecord
       self.table_name = "decidim_navigation_maps_blueprints"
 
+      attribute :height, :integer, default: 475
+
       belongs_to :organization, foreign_key: :decidim_organization_id, class_name: "Decidim::Organization"
       has_many :areas,
                foreign_key: "decidim_navigation_maps_blueprint_id",
@@ -14,8 +16,8 @@ module Decidim
 
       validates :organization, presence: true
       validates :image,
-                file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
                 file_content_type: { allow: ["image/jpeg", "image/png", "image/svg+xml"] }
+      validates :height, numericality: { greater_than: 0 }
 
       mount_uploader :image, Decidim::NavigationMaps::BlueprintUploader
 

data/config/i18n-tasks.yml

@@ -3,8 +3,19 @@
 base_locale: en
 locales: [en]
 
+# Read and write translations.
+data:
+  yaml:
+    write:
+      # do not wrap lines at 80 characters
+      line_width: -1
+
 ignore_unused:
-  - "decidim.components.navigation_maps.name"
+  - decidim.components.navigation_maps.name
+  - decidim.navigation_maps.content_blocks.name
+  - decidim.navigation_maps.content_blocks.navigation_map_settings_form.*
 
+  # these keys are reused from decidim core
 ignore_missing:
   - decidim.participatory_processes.scopes.global
+  - decidim.content_blocks.html.html_content

data/config/locales/ca.yml

@@ -32,6 +32,7 @@ ca:
           blueprint_image: Imatge del plànol
           description: Descripció
           editor: Editor del mapa
+          height: Alçada (px)
           id: Id
           image_missing: Si us plau, afegeix una imatge del plànol per començar
           info: Informació general

data/config/locales/cs.yml

@@ -32,6 +32,7 @@ cs:
           blueprint_image: Obrázek plánu
           description: Popis
           editor: Editor mapy
+          height: Height (px)
           id: Id
           image_missing: Pro začátek přidejte obrázek plánu
           info: Obecné informace

data/config/locales/en.yml

@@ -33,6 +33,7 @@ en:
           blueprint_image: Blueprint image
           description: Description
           editor: Map Editor
+          height: Height (px)
           id: Id
           image_missing: Please add a blueprint image to start
           info: General info

data/config/locales/es.yml

@@ -24,22 +24,23 @@ es:
             error: Se ha producido un error al guardar el área
             success: Área guardada correctamente
       content_blocks:
-        name: Navigation Maps
+        name: Mapas interactivos
         navigation_map:
-          view: Take part
+          view: Participar
         navigation_map_settings_form:
-          add: Add
-          blueprint_image: Blueprint image
-          description: Description
-          editor: Map Editor
+          add: Añadir
+          blueprint_image: Imagen del plano
+          description: Descripción
+          editor: Editor de Mapa
+          height: Altura (px)
           id: Id
-          image_missing: Please add a blueprint image to start
-          info: General info
-          link: Link
-          remove_blueprint: Delete this blueprint
-          title: Title
-          type: Type
-          upload_image: Upload image
+          image_missing: Por favor, añade una imagen del plano para empezar
+          info: Información general
+          link: Enlace
+          remove_blueprint: Eliminar este plano
+          title: Título
+          type: Tipo
+          upload_image: Subir imagen
       create:
-        error: Error creating blueprint
-        success: Blueprint created successfully
+        error: Error al crear el plano
+        success: Plano creado correctamente

data/db/migrate/20210112135817_add_height_to_navigation_maps_blueprints.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddHeightToNavigationMapsBlueprints < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_navigation_maps_blueprints, :height, :integer, null: false, default: 475
+  end
+end

data/db/seeds.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+if !Rails.env.production? || ENV["SEED"]
+  print "Creating seeds for decidim_navigation maps...\n" unless Rails.env.test?
+
+  require "decidim/faker/localized"
+  seeds_root = File.join(__dir__, "seeds")
+
+  organization = Decidim::Organization.first
+
+  Decidim::ContentBlock.create(
+    decidim_organization_id: organization.id,
+    weight: 1,
+    scope_name: :homepage,
+    manifest_name: :navigation_map,
+    published_at: Time.current,
+    settings: { title: Decidim::Faker::Localized.sentence(5) }
+  )
+
+  blueprint1 = Decidim::NavigationMaps::Blueprint.create(
+    organization: organization,
+    image: File.new(File.join(seeds_root, "antarctica.png")),
+    title: Decidim::Faker::Localized.sentence(2),
+    description: Decidim::Faker::Localized.sentence(10)
+  )
+
+  Decidim::NavigationMaps::Blueprint.create(
+    organization: organization,
+    image: File.new(File.join(seeds_root, "penguins.jpg")),
+    title: Decidim::Faker::Localized.sentence(2),
+    description: Decidim::Faker::Localized.sentence(10)
+  )
+
+  Decidim::NavigationMaps::BlueprintArea.create(
+    blueprint: blueprint1,
+    area_id: "10",
+    area_type: "Feature",
+    area: {
+      type: "Polygon",
+      coordinates: [[
+        [717.21875, 277.162511],
+        [717.21875, 317.104475],
+        [758.029018, 317.104475],
+        [758.029018, 277.162511],
+        [717.21875, 277.162511]
+      ]]
+    },
+    link: "https://en.wikipedia.org/wiki/South_Pole",
+    link_type: "link",
+    color: "#ff2a00",
+    title: { en: "South Pole" },
+    description: { en: "It's cold in here" }
+  )
+
+  Decidim::NavigationMaps::BlueprintArea.create(
+    blueprint: blueprint1,
+    area_id: "11",
+    area_type: "Feature",
+    area: {
+      type: "Polygon",
+      coordinates: [[
+        [376.84375, 516.814296],
+        [384.658482, 464.716082],
+        [411.575893, 432.58885],
+        [438.493304, 416.091082],
+        [425.46875, 402.198225],
+        [436.756696, 383.095546],
+        [428.941964, 375.280814],
+        [448.912946, 358.783046],
+        [462.805804, 367.466082],
+        [486.25, 373.544207],
+        [526.191964, 416.091082],
+        [450.649554, 448.218314],
+        [401.15625, 484.687064],
+        [376.84375, 516.814296]
+      ]]
+    },
+    link: "#map1",
+    link_type: "link",
+    color: "#ffbb00",
+    title: { en: "Penguins" },
+    description: { en: "Penguins are beatiful animals" }
+  )
+
+  Decidim::NavigationMaps::BlueprintArea.create(
+    blueprint: blueprint1,
+    area_id: "12",
+    area_type: "Feature",
+    area: {
+      type: "Polygon",
+      coordinates: [[
+        [1068.013393, 418.695993],
+        [1023.729911, 412.617868],
+        [1025.466518, 343.153582],
+        [1104.482143, 324.050903],
+        [1045.4375, 379.622332],
+        [1068.013393, 418.695993]
+      ]]
+    },
+    link: "#map1",
+    link_type: "direct"
+  )
+end

data/lib/decidim/navigation_maps/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-meetings version.
   module NavigationMaps
-    VERSION = "1.0.1"
-    DECIDIM_VERSION = [">= 0.18.0", "< 0.22"].freeze
+    VERSION = "1.1.0"
+    DECIDIM_VERSION = [">= 0.22", "< 0.24"].freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-navigation_maps
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,60 +16,60 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.22'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.22'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.22'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.22'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.22'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.22'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.24'
 description: Allows to map processes to image parts using maps.
 email:
 - ivan@platoniq.net
@@ -131,6 +131,10 @@ files:
 - db/migrate/20191126045831_add_link_type_to_decidim_navigation_maps_blueprint_areas.rb
 - db/migrate/20191126154019_add_area_id_to_decidim_navigation_maps_blueprint_areas.rb
 - db/migrate/20191127093746_add_color_to_navigation_maps_blueprint_areas.rb
+- db/migrate/20210112135817_add_height_to_navigation_maps_blueprints.rb
+- db/seeds.rb
+- db/seeds/antarctica.png
+- db/seeds/penguins.jpg
 - lib/decidim/navigation_maps.rb
 - lib/decidim/navigation_maps/admin.rb
 - lib/decidim/navigation_maps/admin_engine.rb
@@ -169,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="