decidim 0.0.6 → 0.0.7

data/decidim-dev/lib/decidim/dev/test/rspec_support/translation_helpers.rb

@@ -23,7 +23,7 @@ module TranslationHelpers
   #
   # field - the name of the field that should be filled, without the
   #   locale-related part (e.g. `:participatory_process_title`)
-  # tab_slector - a String representing the ID of the HTML element that holds
+  # tab_selector - a String representing the ID of the HTML element that holds
   #   the tabs for this input. It ususally is `"#<attribute_name>-tabs" (e.g.
   #   "#title-tabs")
   # localized_values - a Hash where the keys are the locales IDs and the values

data/decidim-dev/lib/generators/decidim/dummy_generator.rb

@@ -58,6 +58,11 @@ module Decidim
         template "autoprefixer_initializer.rb", "#{dummy_path}/config/initializers/autoprefixer.rb"
       end
 
+      def test_env
+        gsub_file "#{dummy_path}/config/environments/test.rb",
+          /allow_forgery_protection = (.*)/, 'allow_forgery_protection = true'
+      end
+
       private
 
       def dummy_path

data/decidim-meetings/app/controllers/decidim/meetings/admin/application_controller.rb

@@ -11,7 +11,7 @@ module Decidim
         helper_method :meetings, :meeting
 
         def meetings
-          @meetings ||= Meeting.where(feature: current_feature)
+          @meetings ||= Meeting.where(feature: current_feature).page(params[:page]).per(15)
         end
 
         def meeting

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

@@ -1,23 +1,34 @@
-<div class="field">
-  <%= form.translated :text_area, :closing_report, autofocus: true, rows: 15 %>
-</div>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= title %></h2>
+  </div>
 
-<div class="field">
-  <%= form.text_area :attending_organizations, rows: 5 %>
-</div>
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_area, :closing_report, autofocus: true, rows: 15 %>
+    </div>
 
-<div class="field">
-  <%= form.number_field :attendees_count, min: 0 %>
-</div>
+    <div class="row column">
+      <%= form.text_area :attending_organizations, rows: 5 %>
+    </div>
 
-<div class="field">
-  <%= form.number_field :contributions_count, min: 0 %>
-</div>
+    <div class="row">
+      <div class="columns xlarge-6">
+        <%= form.number_field :attendees_count, min: 0 %>
+      </div>
 
-<% if @form.proposals %>
-  <%= form.select :proposal_ids,
-                  @form.proposals.order("title ASC").pluck(:title, :id),
-                  { include_blank: true },
-                  { multiple: true, class: "chosen-select" }
-  %>
-<% end %>
+      <div class="columns xlarge-6">
+        <%= form.number_field :contributions_count, min: 0 %>
+      </div>
+    </div>
+    <div class="row column">
+      <% if @form.proposals %>
+        <%= form.select :proposal_ids,
+                        @form.proposals.order("title ASC").pluck(:title, :id),
+                        { include_blank: true },
+                        { multiple: true, class: "chosen-select" }
+        %>
+      <% end %>
+    </div>
+  </div>
+</div>

data/decidim-meetings/app/views/decidim/meetings/admin/meeting_closes/edit.html.erb

@@ -1,9 +1,7 @@
-<h3><%= t ".title" %></h3>
+<%=  decidim_form_for(@form, url: meeting_meeting_close_path(meeting, @form), html: { class: "form edit_close_meeting" }) do |f| %>
+  <%= render partial: 'form', object: f, locals: { title: t('.title') }  %>
 
-<%=  decidim_form_for(@form, url: meeting_meeting_close_path(meeting, @form)) do |f| %>
-  <%= render partial: 'form', object: f %>
-
-  <div class="actions">
+  <div class="button--double form-general-submit">
     <%= f.submit t(".close") %>
   </div>
 <% end %>

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

@@ -1,37 +1,48 @@
-<div class="field" >
-  <%= form.translated :text_field, :title, autofocus: true %>
-</div>
-
-<div class="field" >
-  <%= form.translated :editor, :description %>
-</div>
-
-<div class="field" >
-  <%= form.text_field :address %>
-</div>
-
-<div class="field" >
-  <%= form.translated :text_area, :location %>
-</div>
-
-<div class="field" >
-  <%= form.translated :text_area, :location_hints %>
-</div>
-
-<div class="field" >
-  <%= form.datetime_field :start_time %>
-</div>
-
-<div class="field" >
-  <%= form.datetime_field :end_time %>
-</div>
-
-<% if !@form.process_scope %>
-  <div class="field" >
-    <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= title %></h2>
   </div>
-<% end %>
 
-<div class="field" >
-  <%= form.categories_select :decidim_category_id, current_participatory_process.categories, prompt: "", disable_parents: false %>
-</div>
+  <div class="card-section">
+    <div class="row column" >
+      <%= form.translated :text_field, :title, autofocus: true %>
+    </div>
+
+    <div class="row column" >
+      <%= form.translated :editor, :description %>
+    </div>
+
+    <div class="row column" >
+      <%= form.text_field :address %>
+    </div>
+
+    <div class="row column" >
+      <%= form.translated :text_area, :location %>
+    </div>
+
+    <div class="row column" >
+      <%= form.translated :text_area, :location_hints %>
+    </div>
+
+    <div class="row" >
+      <div class="columns xlarge-6" >
+        <%= form.datetime_field :start_time %>
+      </div>
+
+      <div class="columns xlarge-6" >
+        <%= form.datetime_field :end_time %>
+      </div>
+    </div>
+    <div class="row" >
+      <% if !@form.process_scope %>
+        <div class="columns xlarge-6" >
+          <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
+        </div>
+      <% end %>
+
+      <div class="columns xlarge-6" >
+        <%= form.categories_select :decidim_category_id, current_participatory_process.categories, prompt: "", disable_parents: false %>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -1,9 +1,8 @@
-<h3><%= t ".title" %></h3>
-
-<%=  decidim_form_for(@form) do |f| %>
+<%=  decidim_form_for(@form, html: { class: "form edit_meeting" })  do |f| %>
   <%= render partial: 'form', object: f %>
 
-  <div class="actions">
-    <%= f.submit t(".update") %>
-  </div>
+    <div class="button--double form-general-submit">
+      <%= f.submit t(".update") %>
+    </div>
 <% end %>
+

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

@@ -1,53 +1,74 @@
-<h2><%= t(".title") %></h2>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+      <%= link_to t("actions.new", scope: "decidim.meetings", name: t("models.meeting.name", scope: "decidim.meetings.admin")), new_meeting_path, class: 'button tiny button--title' if can? :manage, current_feature %>
+    </h2>
+  </div>
 
-<div class="actions title">
-  <%= link_to t("actions.new", scope: "decidim.meetings", name: t("models.meeting.name", scope: "decidim.meetings.admin")), new_meeting_path, class: 'new' if can? :manage, current_feature %>
-</div>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.meeting.fields.title", scope: "decidim.meetings") %></th>
+            <th><%= t("models.meeting.fields.start_time", scope: "decidim.meetings") %></th>
+            <th><%= t("models.meeting.fields.end_time", scope: "decidim.meetings") %></th>
+            <th><%= t("models.meeting.fields.closed", scope: "decidim.meetings") %></th>
+            <% if Decidim.geocoder.present? %>
+              <th><%= t("models.meeting.fields.map", scope: "decidim.meetings") %></th>
+            <% end %>
+            <th class="actions"><%= t("actions.title", scope: "decidim.meetings") %></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% meetings.each do |meeting| %>
+            <tr data-id="<%= meeting.id %>">
+              <td>
+                <%= translated_attribute(meeting.title) %><br />
+              </td>
+              <td>
+                <% if meeting.start_time %>
+                  <%= l meeting.start_time, format: :long %>
+                <%  end%>
+              </td>
+              <td>
+                <% if meeting.end_time %>
+                  <%= l meeting.end_time, format: :long %>
+                <%  end%>
+              </td>
+              <td>
+                <%= humanize_boolean meeting.closed? %>
+              </td>
+              <% if Decidim.geocoder.present? %>
+                <td>
+                  <%= static_map_link(meeting) %>
+                </td>
+              <% end %>
+              <td class="table-list__actions">
+                <%= icon_link_to "eye", decidim_meetings.meeting_path(id: meeting, feature_id: current_feature, participatory_process_id: current_participatory_process), t("actions.preview", scope: "decidim.meetings"), class: "action-icon--preview", target: :blank %>
 
-<table class="stack">
-  <thead>
-    <tr>
-      <th><%= t("models.meeting.fields.title", scope: "decidim.meetings") %></th>
-      <th><%= t("models.meeting.fields.start_time", scope: "decidim.meetings") %></th>
-      <th><%= t("models.meeting.fields.end_time", scope: "decidim.meetings") %></th>
-      <th><%= t("models.meeting.fields.closed", scope: "decidim.meetings") %></th>
-      <% if Decidim.geocoder.present? %>
-        <th><%= t("models.meeting.fields.map", scope: "decidim.meetings") %></th>
-      <% end %>
-      <th class="actions"><%= t("actions.title", scope: "decidim.meetings") %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% meetings.each do |meeting| %>
-      <tr data-id="<%= meeting.id %>">
-        <td>
-          <%= link_to translated_attribute(meeting.title), decidim_meetings.meeting_path(id: meeting, feature_id: current_feature, participatory_process_id: current_participatory_process), target: :blank %><br />
-        </td>
-        <td>
-          <% if meeting.start_time %>
-            <%= l meeting.start_time, format: :long %>
-          <%  end%>
-        </td>
-        <td>
-          <% if meeting.end_time %>
-            <%= l meeting.end_time, format: :long %>
-          <%  end%>
-        </td>
-        <td>
-          <%= humanize_boolean meeting.closed? %>
-        </td>
-        <% if Decidim.geocoder.present? %>
-          <td>
-            <%= static_map_link(meeting) %>
-          </td>
-        <% end %>
-        <td class="actions">
-          <%= link_to t("actions.edit", scope: "decidim.meetings"), edit_meeting_path(meeting) if can? :update, current_feature %>
-          <%= link_to t("actions.close", scope: "decidim.meetings"), edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id) if can? :update, current_feature %>
-          <%= link_to t("actions.attachments", scope: "decidim.meetings"), meeting_attachments_path(meeting) if can? :update, current_feature %>
-          <%= link_to t("actions.destroy", scope: "decidim.meetings"), meeting_path(meeting), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.meetings") } if can? :destroy, current_feature %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+                <% if can? :update, current_feature %>
+                  <%= icon_link_to "pencil", edit_meeting_path(meeting), t("actions.edit", scope: "decidim.meetings"), class: "action-icon--edit" %>
+                <% end %>
+
+                <% if can? :update, current_feature %>
+                  <%= icon_link_to "lock-locked", edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), t("actions.close", scope: "decidim.meetings"), class: "action-icon--close" %>
+                <% end %>
+
+                <% if can? :update, current_feature %>
+                  <%= icon_link_to "paperclip", meeting_attachments_path(meeting), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
+                <% end %>
+
+                <% if can? :destroy, current_feature %>
+                  <%= icon_link_to "circle-x", meeting_path(meeting), t("actions.destroy", scope: "decidim.meetings"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.meetings") } %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+      <%= paginate meetings, theme: "decidim" %>
+    </div>
+  </div>
+<div>

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

@@ -1,9 +1,7 @@
-<h3><%= t ".title" %></h3>
+<%=  decidim_form_for(@form, html: { class: "form new_meeting" }) do |f| %>
+  <%= render partial: 'form', object: f, locals: { title: t('.title') }  %>
 
-<%=  decidim_form_for(@form) do |f| %>
-  <%= render partial: 'form', object: f %>
-
-  <div class="actions">
-    <%= f.submit t(".create") %>
+  <div class="button--double form-general-submit">
+      <%= f.submit t(".create") %>
   </div>
 <% end %>

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

@@ -21,6 +21,6 @@
   <% end %>
 
   <% if current_feature.categories.any? %>
-    <%= form.categories_select :category_id, current_feature.categories, legend_title: t(".category"), disable_parents: false, label: false, include_blank: true %>
+    <%= form.categories_select :category_id, current_feature.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t('.category_prompt') %>
   <% end %>
 <% end %>

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

@@ -29,6 +29,7 @@ ca:
         destroy: Esborra
         edit: Edita
         new: Nou/va %{name}
+        preview: Previsualitzar
         title: Accions
       admin:
         meeting_closes:
@@ -45,7 +46,6 @@ ca:
           destroy:
             success: La trobada s'ha eliminat correctament
           edit:
-            title: Edita trobada
             update: Actualitzar trobada
           index:
             title: Trobades
@@ -61,6 +61,7 @@ ca:
       meetings:
         filters:
           category: Categoria
+          category_prompt: Selecciona una categoria
           date: Data
           past: Passades
           scopes: Àmbits

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

@@ -30,6 +30,7 @@ en:
         destroy: Delete
         edit: Edit
         new: New %{name}
+        preview: Preview
         title: Actions
       admin:
         meeting_closes:
@@ -46,7 +47,6 @@ en:
           destroy:
             success: Meeting successfully deleted
           edit:
-            title: Edit meeting
             update: Update meeting
           index:
             title: Meetings
@@ -62,6 +62,7 @@ en:
       meetings:
         filters:
           category: Category
+          category_prompt: Select a category
           date: Date
           past: Past
           scopes: Scopes

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

@@ -29,6 +29,7 @@ es:
         destroy: Borrar
         edit: Editar
         new: Nuevo/a %{name}
+        preview: Previsualizar
         title: Acciones
       admin:
         meeting_closes:
@@ -45,7 +46,6 @@ es:
           destroy:
             success: El encuentro se ha eliminado correctamente
           edit:
-            title: Editar encuentro
             update: Actualizar encuentro
           index:
             title: Lista de encuentros
@@ -61,6 +61,7 @@ es:
       meetings:
         filters:
           category: Categoría
+          category_prompt: Selecciona una categoría
           date: Fecha
           past: Pasadas
           scopes: Ámbitos

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

@@ -7,18 +7,29 @@ eu:
         closing_report: Txostena
         contributions_count: Ekarpen-kopurua
         proposal_ids: Topaketan sortutako proposamenak
+      meeting:
+        adress: Helbidea
+        decidim_category_id: Kategoria
+        decidim_scope_id: Esparrua
+        description: Deskribapena
+        end_time: Amaiera-ordua
+        location: Kokapena
+        location_hints: Kokapen-argibideak
+        start_time: Hasiera-ordua
+        title: Izenburua
   decidim:
     features:
       meetings:
         name: Topaketa-zerrenda
     meetings:
       actions:
-        attachments: Fitxategi erantsiak
+        attachments: Eranskinak
         close: Itxi
         confirm_destroy: Ziur zaude topaketa hau ezabatu nahi duzula?
-        destroy: Garbitu
+        destroy: Ezabatu
         edit: Editatu
         new: '%{name} berria'
+        preview: Aurreikusi
         title: Ekintzak
       admin:
         meeting_closes:
@@ -35,7 +46,6 @@ eu:
           destroy:
             success: Topaketa zuzen ezabatu da.
           edit:
-            title: Editatu topaketa
             update: Eguneratu topaketa
           index:
             title: Topaketa-zerrenda
@@ -51,9 +61,12 @@ eu:
       meetings:
         filters:
           category: Kategoria
-          date: Jaioteguna
+          category_prompt: Aukeratu kategoria bat
+          date: Data
+          past: Aurrekoak
           scopes: Esparruak
           search: Bilatu
+          upcoming: Hurrengoak
         filters_small_view:
           close_modal: Itxi leihoa
           filter: Iragazi
@@ -61,6 +74,9 @@ eu:
           unfold: Zabaldu
         index:
           view_meeting: Ikusi topaketa
+        meetings:
+          no_meetings_warning: Ez dago bilaketa-irizpidearekin bat datorren topaketarik, edo ez dago ezein topaketarik programaturik.
+          upcoming_meetings_warning: Orain ez dago topaketarik programaturik, baina aurreko topaketak ikus ditzakezu.
         show:
           attendees: Bertaratuen kopurua
           contributions: Ekarpen-kopurua
@@ -76,4 +92,8 @@ eu:
             title: Izenburua
     resource_links:
       meetings_through_proposals:
-        meeting_results: 'Honekin lotutako emaitzak:'
+        meeting_results: 'Topaketaren emaitzak:'
+        result_meetings: 'Proposamenarekin lotutako topaketak:'
+      proposals_from_meeting:
+        meeting_proposals: 'Topaketari dagozkion proposamenak:'
+        proposal_meetings: 'Proposamenarekin lotutako topaketak:'