decidim 0.0.5 → 0.0.6

data/decidim-meetings/app/models/decidim/meetings/meeting.rb

@@ -8,6 +8,7 @@ module Decidim
       include Decidim::Resourceable
       include Decidim::HasAttachments
       include Decidim::HasFeature
+      include Decidim::HasReference
       include Decidim::HasScope
       include Decidim::HasCategory
 
@@ -15,7 +16,7 @@ module Decidim
 
       validates :title, presence: true
 
-      geocoded_by :address
+      geocoded_by :address, http_headers: lambda { |proposal| { "Referer" => proposal.feature.organization.host } }
 
       def closed?
         closed_at.present?

data/decidim-meetings/app/services/decidim/meetings/meeting_search.rb

@@ -29,11 +29,6 @@ module Decidim
         end
       end
 
-      # Handle the scope_id filter
-      def search_scope_id
-        query.where(decidim_scope_id: scope_id)
-      end
-
       private
 
       # Internal: builds the needed query to search for a text in the organization's

data/decidim-meetings/app/views/decidim/meetings/admin/meetings/_form.html.erb

@@ -26,9 +26,11 @@
   <%= form.datetime_field :end_time %>
 </div>
 
-<div class="field" >
-  <%= form.collection_select :decidim_scope_id, current_organization.scopes, :id, :name, include_blank: true %>
-</div>
+<% if !@form.process_scope %>
+  <div class="field" >
+    <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
+  </div>
+<% end %>
 
 <div class="field" >
   <%= form.categories_select :decidim_category_id, current_participatory_process.categories, prompt: "", disable_parents: false %>

data/decidim-meetings/app/views/decidim/meetings/meetings/_filters.html.erb

@@ -12,10 +12,12 @@
     </div>
   </div>
 
-  <%= form.collection_radio_buttons :date, [["upcoming", t(".upcoming")], ["past", t(".past")]], :first, :last, legend_title: t(".date") %>
+  <% unless @forced_past_meetings %>
+    <%= form.collection_radio_buttons :date, [["upcoming", t(".upcoming")], ["past", t(".past")]], :first, :last, legend_title: t(".date") %>
+  <% end %>
 
-  <% if current_organization.scopes.any? %>
-    <%= form.collection_check_boxes :scope_id, current_organization.scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t(".scopes") %>
+  <% if !current_participatory_process.scope && current_organization.scopes.any? %>
+    <%= form.collection_check_boxes :scope_id, search_organization_scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t(".scopes") %>
   <% end %>
 
   <% if current_feature.categories.any? %>

data/decidim-meetings/app/views/decidim/meetings/meetings/_filters_small_view.html.erb

@@ -7,7 +7,7 @@
 
 <div class="reveal" id="filter-box" data-reveal>
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t ".filter_for" %>:</h3>
+    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
     <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>

data/decidim-meetings/app/views/decidim/meetings/meetings/_meetings.html.erb

@@ -1,3 +1,13 @@
+<% if @forced_past_meetings %>
+  <div class="callout warning">
+    <%= t ".upcoming_meetings_warning" %>
+  </div>
+<% elsif meetings.length == 0 %>
+  <div class="callout warning">
+    <%= t ".no_meetings_warning" %>
+  </div>
+<% end %>
+
 <div class="row small-up-1 medium-up-2 card-grid">
   <% meetings.each do |meeting| %>
     <div class="column">
@@ -13,7 +23,7 @@
             <div class="address__icon">
               <%= icon "meetings", remove_icon_class: true, width: 40, height: 70 %>
             </div>
-            <%= render partial: "address_details", locals: { meeting: meeting } %>
+            <%= render partial: "decidim/shared/address_details", locals: { icon_name: "meetings", geolocalizable: meeting } %>
           </div>
         </div>
       </article>

data/decidim-meetings/app/views/decidim/meetings/meetings/_tags.html.erb

@@ -3,7 +3,7 @@
     <% if meeting.category.present? %>
       <li><%= link_to translated_attribute(meeting.category.name), decidim_meetings.meetings_path(filter: { category_id: meeting.category.id }) %></li>
     <% end %>
-    <% if meeting.scope.present? %>
+    <% if !current_participatory_process.scope && meeting.scope.present? %>
       <li><%= link_to meeting.scope.name, decidim_meetings.meetings_path(filter: { scope_id: [meeting.scope.id] }) %></li>
     <% end %>
   </ul>

data/decidim-meetings/app/views/decidim/meetings/meetings/index.html.erb

@@ -1,40 +1,35 @@
-<% if Decidim.geocoder.present? %>
-  <div class="row column">
-    <div class="google-map" id="meetings-map" data-meetings="<%= meetings_data_for_map(geocoded_meetings).to_json %>" data-here-app-id="<%= Decidim.geocoder[:here_app_id] %>" data-here-app-code="<%= Decidim.geocoder[:here_app_code] %>">
-    </div>
-
-    <template id="meeting-popup">
-      <div class="map-info__content">
-        <h3>${title}</h3>
-        <div id="bodyContent">
-          <p>{{html description}}</p>
-          <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">{{html icon}}</div>
-              <div class="address__details">
-                <strong>{{html location}}</strong><br />
-                <span>${address}</span><br />
-                <span>{{html locationHints}}</span>
-              </div>
+<%= dynamic_map_for meetings_data_for_map(geocoded_meetings) do %>
+  <template id="marker-popup">
+    <div class="map-info__content">
+      <h3>${title}</h3>
+      <div id="bodyContent">
+        <p>{{html description}}</p>
+        <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="map-info__button">
-            <a href="${link}" class="button button--sc">
-              <%= t('.view_meeting') %>
-            </a>
+          <div class="address card__extra">
+            <div class="address__icon">{{html icon}}</div>
+            <div class="address__details">
+              <strong>{{html location}}</strong><br />
+              <span>${address}</span><br />
+              <span>{{html locationHints}}</span>
+            </div>
           </div>
         </div>
+        <div class="map-info__button">
+          <a href="${link}" class="button button--sc">
+            <%= t('.view_meeting') %>
+          </a>
+        </div>
       </div>
-    </template>
-    <%= stylesheet_link_tag "decidim/meetings/map" %>
-    <%= javascript_include_tag "decidim/meetings/map" %>
-  </div>
+    </div>
+  </template>
+  <%= stylesheet_link_tag "decidim/map" %>
+  <%= javascript_include_tag "decidim/map" %>
 <% end %>
 
 <div class="row">

data/decidim-meetings/app/views/decidim/meetings/meetings/index.js.erb

@@ -2,7 +2,7 @@ var $meetings = $('#meetings');
 
 $meetings.html('<%= j(render partial: "meetings") %>');
 
-window.DecidimMeetings.currentMap = window.DecidimMeetings.loadMap(
-  'meetings-map',
+window.Decidim.currentMap = window.Decidim.loadMap(
+  'map',
   JSON.parse('<%= escape_javascript meetings_data_for_map(geocoded_meetings).to_json.html_safe %>')
 );

data/decidim-meetings/app/views/decidim/meetings/meetings/show.html.erb

@@ -45,26 +45,13 @@
           </div>
         </div>
       <% end %>
+    <%= feature_reference(meeting) %>
     <%= render partial: "decidim/shared/share_modal" %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
       <p><%== translated_attribute meeting.description %></p>
-      <div class="card card--secondary">
-        <div class="card__content address">
-          <div class="address__info">
-            <div class="address__icon">
-              <%= icon "meetings", width: 40, height: 70 %>
-            </div>
-            <%= render partial: "address_details", locals: { meeting: meeting } %>
-          </div>
-          <% if Decidim.geocoder.present? %>
-            <div class="address__map">
-              <%= static_map_link(meeting) %>
-            </div>
-          <% end %>
-        </div>
-      </div>
+      <%= render partial: "decidim/shared/static_map", locals: { icon_name: "meetings", geolocalizable: meeting } %>
       <%= render partial: "tags", locals: { meeting: meeting } %>
     </div>
     <% if meeting.closed? %>

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

@@ -2,5 +2,5 @@ base_locale: en
 locales: [en]
 ignore_unused:
 - "decidim.features.meetings.name"
-- "activemodel.attributes.close_meeting.*"
+- "activemodel.attributes.*"
 - "decidim.resource_links.*"

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

@@ -7,6 +7,16 @@ ca:
         closing_report: Informe
         contributions_count: Nombre de contribucions
         proposal_ids: Propostes creades en una trobada
+      meeting:
+        adress: Adreça
+        decidim_category_id: Categoria
+        decidim_scope_id: Àmbit
+        description: Descripció
+        end_time: Hora de finalització
+        location: Ubicació
+        location_hints: Detalls d'ubicació
+        start_time: Hora d'inici
+        title: Editar trobada
   decidim:
     features:
       meetings:
@@ -59,10 +69,13 @@ ca:
         filters_small_view:
           close_modal: Tancar finestra
           filter: Filtra
-          filter_for: Filtra per
+          filter_by: Filtra per
           unfold: Desplegar
         index:
           view_meeting: Veure trobada
+        meetings:
+          no_meetings_warning: No hi ha trobades que coincideixin amb el criteri de cerca o no hi ha cap trobada programada.
+          upcoming_meetings_warning: Actualment no hi ha trobades programades, però pots veure les anteriors trobades.
         show:
           attendees: Nombre d'assistents
           contributions: Nombre d'aportacions
@@ -78,6 +91,8 @@ ca:
             title: Títol
     resource_links:
       meetings_through_proposals:
-        results: 'Resultats relacionats:'
+        meeting_results: 'Resultats relacionats:'
+        result_meetings: 'Trobades relacionades:'
       proposals_from_meeting:
-        proposals: Propostes relacionades
+        meeting_proposals: 'Propostes relacionades:'
+        proposal_meetings: 'Trobades relacionades:'

data/decidim-meetings/config/locales/en.yml

@@ -8,6 +8,16 @@ en:
         closing_report: Report
         contributions_count: Number of contributions
         proposal_ids: Proposals created in the meeting
+      meeting:
+        adress: Adress
+        decidim_category_id: Category
+        decidim_scope_id: Scope
+        description: Description
+        end_time: End Time
+        location: Location
+        location_hints: Location hints
+        start_time: Start Time
+        title: Title
   decidim:
     features:
       meetings:
@@ -60,10 +70,15 @@ en:
         filters_small_view:
           close_modal: Close modal
           filter: Filter
-          filter_for: Filter by
+          filter_by: Filter by
           unfold: Unfold
         index:
           view_meeting: View meeting
+        meetings:
+          no_meetings_warning: No meetings match your search criteria or there isn't
+            any meeting scheduled.
+          upcoming_meetings_warning: Currently, there are no scheduled meetings, but
+            here you can find all the past meetings listed.
         show:
           attendees: Attendees count
           contributions: Contributions count
@@ -79,6 +94,8 @@ en:
             title: Title
     resource_links:
       meetings_through_proposals:
-        results: 'Related results:'
+        meeting_results: 'Related results:'
+        result_meetings: 'Related meetings:'
       proposals_from_meeting:
-        proposals: Related proposals
+        meeting_proposals: 'Related proposals:'
+        proposal_meetings: 'Related meetings:'

data/decidim-meetings/config/locales/es.yml

@@ -7,6 +7,16 @@ es:
         closing_report: Informe
         contributions_count: Número de contribuciones
         proposal_ids: Propuestas creadas en el encuentro
+      meeting:
+        adress: Dirección
+        decidim_category_id: Categoría
+        decidim_scope_id: Ámbito
+        description: Descripción
+        end_time: Hora de finalización
+        location: Ubicación
+        location_hints: Pistas de ubicación
+        start_time: Hora de inicio
+        title: Título
   decidim:
     features:
       meetings:
@@ -59,10 +69,13 @@ es:
         filters_small_view:
           close_modal: Cerrar ventana
           filter: Filtrar
-          filter_for: Filtrar por
+          filter_by: Filtrar por
           unfold: Desplegar
         index:
           view_meeting: Ver encuentro
+        meetings:
+          no_meetings_warning: No hay encuentros que coincidan con el criterio de búsqueda o no hay ningún encuentro programado.
+          upcoming_meetings_warning: Actualmente no hay encuentros programados, pero puedes ver los encuentros anteriores.
         show:
           attendees: Número de asistentes
           contributions: Número de contribuciones
@@ -78,6 +91,8 @@ es:
             title: Título
     resource_links:
       meetings_through_proposals:
-        results: 'Resultados relacionados:'
+        meeting_results: 'Resultados relacionados:'
+        result_meetings: 'Encuentros relacionados:'
       proposals_from_meeting:
-        proposals: Propuestas relacionadas
+        meeting_proposals: 'Propuestas relacionadas:'
+        proposal_meetings: 'Encuentros relacionados:'

data/decidim-meetings/config/locales/eu.yml

@@ -1,5 +1,79 @@
 eu:
+  activemodel:
+    attributes:
+      close_meeting:
+        attendees_count: Bertaratuen kopurua
+        attending_organizations: 'Parte hartu duten erakundeen zerrenda:'
+        closing_report: Txostena
+        contributions_count: Ekarpen-kopurua
+        proposal_ids: Topaketan sortutako proposamenak
   decidim:
+    features:
+      meetings:
+        name: Topaketa-zerrenda
     meetings:
       actions:
-        close: Itxi
+        attachments: Fitxategi erantsiak
+        close: Itxi
+        confirm_destroy: Ziur zaude topaketa hau ezabatu nahi duzula?
+        destroy: Garbitu
+        edit: Editatu
+        new: '%{name} berria'
+        title: Ekintzak
+      admin:
+        meeting_closes:
+          edit:
+            close: Itxi
+            title: Itxi topaketa
+        meetings:
+          close:
+            invalid: Arazo bat izan da topaketa hau ixtean.
+            success: Topaketa ongi itxi da
+          create:
+            invalid: Arazo bat izan da topaketa hau sortzean.
+            success: Topaketa ongi sortu da
+          destroy:
+            success: Topaketa zuzen ezabatu da.
+          edit:
+            title: Editatu topaketa
+            update: Eguneratu topaketa
+          index:
+            title: Topaketa-zerrenda
+          new:
+            create: Sortu topaketa
+            title: Topaketa berria
+          update:
+            invalid: Arazo bat izan da topaketa hau eguneratzean.
+            success: Topaketa zuzen eguneratu da.
+        models:
+          meeting:
+            name: Topaketa
+      meetings:
+        filters:
+          category: Kategoria
+          date: Jaioteguna
+          scopes: Esparruak
+          search: Bilatu
+        filters_small_view:
+          close_modal: Itxi leihoa
+          filter: Iragazi
+          filter_by: 'Iragazi honen arabera:'
+          unfold: Zabaldu
+        index:
+          view_meeting: Ikusi topaketa
+        show:
+          attendees: Bertaratuen kopurua
+          contributions: Ekarpen-kopurua
+          meeting_report: Topaketaren txostena
+          organizations: Bertaratutako erakundeak
+      models:
+        meeting:
+          fields:
+            closed: Itxita
+            end_time: Bukaera-data
+            map: Mapa
+            start_time: Hasiera-data
+            title: Izenburua
+    resource_links:
+      meetings_through_proposals:
+        meeting_results: 'Honekin lotutako emaitzak:'

data/decidim-meetings/config/locales/fi.yml

@@ -0,0 +1,98 @@
+fi:
+  activemodel:
+    attributes:
+      close_meeting:
+        attendees_count: Osallistujien määrä
+        attending_organizations: Osallistuvien organisaatioiden lista
+        closing_report: Raportti
+        contributions_count: Kontribuutioiden määrä
+        proposal_ids: Ehdotusta luotu tapaamisessa
+      meeting:
+        adress: Adressi
+        decidim_category_id: Kategoria
+        decidim_scope_id: Konteksti
+        description: Kuvaus
+        end_time: Lopetusaika
+        location: Paikka
+        location_hints: Paikan tarkemmat tiedot
+        start_time: Aloitusaika
+        title: Otsikko
+  decidim:
+    features:
+      meetings:
+        name: Tapaamiset
+    meetings:
+      actions:
+        attachments: Liitteet
+        close: Sulje
+        confirm_destroy: Haluatko varmasti poistaa tämän tapaamisen?
+        destroy: Poista
+        edit: Muokkaa
+        new: Uusi %{name}
+        title: Toiminnot
+      admin:
+        meeting_closes:
+          edit:
+            close: Lopeta
+            title: Lopeta tapaaminen
+        meetings:
+          close:
+            invalid: Tapaamisen lopettamisessa tapahtui virhe
+            success: Tapaaminen onnistuneesti lopetettu
+          create:
+            invalid: Tapaamisen luonnissa tapahtui virhe
+            success: Tapaaminen onnistuneesti luotu
+          destroy:
+            success: Tapaaminen onnistuneesti poistettu
+          edit:
+            title: Muokkaa tapaamista
+            update: Päivitä tapaaminen
+          index:
+            title: Tapaamiset
+          new:
+            create: Luo tapaaminen
+            title: Uusi tapaaminen
+          update:
+            invalid: Tapaamisen luonnissa tapahtui virhe
+            success: Tapaaminen luotu onnistuneesti
+        models:
+          meeting:
+            name: Tapaaminen
+      meetings:
+        filters:
+          category: Kategoria
+          date: Päivämäärä
+          past: Menneet
+          scopes: Kontekstit
+          search: Etsi
+          upcoming: Tulevat
+        filters_small_view:
+          close_modal: Sulje ikkuna
+          filter: Suodata
+          filter_by: Suodata
+          unfold: Avaa
+        index:
+          view_meeting: Näytä tapaaminen
+        meetings:
+          no_meetings_warning: Yksikään tapaaminen ei vastaa hakukriteerejäsi tai yhtään tapaamista ei ole määritelty
+          upcoming_meetings_warning: Tällä hetkellä tapaamisia ei ole määritelty, mutta täältä löydät kaikki aikaisemmat tapaamiset.
+        show:
+          attendees: Osallistujamäärä
+          contributions: Kontribuutioiden määrä
+          meeting_report: Tapaamisraportti
+          organizations: Osallistuneet organisaatiot
+      models:
+        meeting:
+          fields:
+            closed: Suljettu
+            end_time: Lopetusaika
+            map: Kartta
+            start_time: Aloitusaika
+            title: Otsikko
+    resource_links:
+      meetings_through_proposals:
+        meeting_results: 'Liittyvät tulokset:'
+        result_meetings: 'Liittyvät tapaamiset:'
+      proposals_from_meeting:
+        meeting_proposals: 'Liittyvät ehdotukset:'
+        proposal_meetings: 'Liittyvät tapaamiset:'