decidim 0.0.6 → 0.0.7

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

@@ -45,7 +45,6 @@ fi:
           destroy:
             success: Tapaaminen onnistuneesti poistettu
           edit:
-            title: Muokkaa tapaamista
             update: Päivitä tapaaminen
           index:
             title: Tapaamiset

data/decidim-meetings/spec/shared/manage_attachments_examples.rb

@@ -9,7 +9,7 @@ RSpec.shared_examples "manage meetings attachments" do
     visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
     within find("tr", text: translated(meeting.title)) do
 
-      click_link "Attachments"
+      find("a.action-icon--attachments").click
     end
   end
 

data/decidim-meetings/spec/shared/manage_meetings_examples.rb

@@ -13,7 +13,7 @@ RSpec.shared_examples "manage meetings" do
 
   it "updates a meeting" do
     within find("tr", text: translated(meeting.title)) do
-      click_link "Edit"
+      page.find('a.action-icon--edit').click
     end
 
     within ".edit_meeting" do
@@ -29,7 +29,7 @@ RSpec.shared_examples "manage meetings" do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
@@ -40,9 +40,11 @@ RSpec.shared_examples "manage meetings" do
 
   context "previewing meetings" do
     it "allows the user to preview the meeting" do
-      new_window = window_opened_by { click_link translated(meeting.title) }
+      within find("tr", text: translated(meeting.title)) do
+        @new_window = window_opened_by { find("a.action-icon--preview").click }
+      end
 
-      within_window new_window do
+      within_window @new_window do
         expect(current_path).to eq decidim_meetings.meeting_path(id: meeting.id, participatory_process_id: participatory_process.id, feature_id: current_feature.id)
         expect(page).to have_content(translated(meeting.title))
       end
@@ -50,7 +52,7 @@ RSpec.shared_examples "manage meetings" do
   end
 
   it "creates a new meeting" do
-    find(".actions .new").click
+    click_link "New Meeting"
 
     within ".new_meeting" do
       fill_in_i18n(
@@ -92,7 +94,7 @@ RSpec.shared_examples "manage meetings" do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
@@ -110,10 +112,10 @@ RSpec.shared_examples "manage meetings" do
 
     it "deletes a meeting" do
       within find("tr", text: translated(meeting2.title)) do
-        click_link "Delete"
+        page.find('a.action-icon--remove').click
       end
 
-      within ".flash" do
+      within ".callout-wrapper" do
         expect(page).to have_content("successfully")
       end
 
@@ -130,7 +132,7 @@ RSpec.shared_examples "manage meetings" do
 
     it "updates a meeting" do
       within find("tr", text: translated(meeting.title)) do
-        click_link "Edit"
+        page.find('a.action-icon--edit').click
       end
 
       within ".edit_meeting" do
@@ -146,7 +148,7 @@ RSpec.shared_examples "manage meetings" do
         find("*[type=submit]").click
       end
 
-      within ".flash" do
+      within ".callout-wrapper" do
         expect(page).to have_content("successfully")
       end
 
@@ -156,7 +158,7 @@ RSpec.shared_examples "manage meetings" do
     end
 
     it "creates a new meeting" do
-      find(".actions .new").click
+      click_link "New Meeting"
 
       within ".new_meeting" do
         fill_in_i18n(
@@ -198,7 +200,7 @@ RSpec.shared_examples "manage meetings" do
         find("*[type=submit]").click
       end
 
-      within ".flash" do
+      within ".callout-wrapper" do
         expect(page).to have_content("successfully")
       end
 
@@ -216,7 +218,7 @@ RSpec.shared_examples "manage meetings" do
 
     it "closes a meeting with a report" do
       within find("tr", text: translated(meeting.title)) do
-        click_link "Close"
+        page.find('a.action-icon--close').click
       end
 
       within ".edit_close_meeting" do
@@ -234,7 +236,7 @@ RSpec.shared_examples "manage meetings" do
         click_button "Close"
       end
 
-      within ".flash" do
+      within ".callout-wrapper" do
         expect(page).to have_content("Meeting successfully closed")
       end
 
@@ -250,7 +252,7 @@ RSpec.shared_examples "manage meetings" do
 
       it "can update the information" do
         within find("tr", text: translated(meeting.title)) do
-          click_link "Close"
+          page.find('a.action-icon--close').click
         end
 
         within ".edit_close_meeting" do
@@ -258,7 +260,7 @@ RSpec.shared_examples "manage meetings" do
           click_button "Close"
         end
 
-        within ".flash" do
+        within ".callout-wrapper" do
           expect(page).to have_content("Meeting successfully closed")
         end
       end

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

@@ -1,3 +1,10 @@
-<div class="field">
-  <%= form.translated :editor, :body, toolbar: :full, lines: 30, label: t("models.components.body", scope: "decidim.pages.admin")  %>
-</div>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= title %></h2>
+  </div>
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :editor, :body, toolbar: :full, lines: 30, label: t("models.components.body", scope: "decidim.pages.admin")  %>
+    </div>
+  </div>
+</div>

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

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

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

@@ -2,10 +2,12 @@ eu:
   decidim:
     features:
       pages:
-        name: Orrialdea
+        name: Orria
         settings:
           global:
-            comments_enabled: Iruzkin gaituak
+            comments_enabled: Iruzkinak gaituta
+          step:
+            comments_blocked: Iruzkinak blokeatuta
     pages:
       admin:
         models:

data/decidim-pages/spec/features/admin_spec.rb

@@ -33,7 +33,7 @@ describe "Edit a page", type: :feature do
         find("*[type=submit]").click
       end
 
-      within_flash_messages do
+      within ".callout-wrapper" do
         expect(page).to have_content("successfully")
       end
 

data/decidim-proposals/app/controllers/decidim/proposals/admin/proposals_controller.rb

@@ -32,7 +32,7 @@ module Decidim
         private
 
         def proposals
-          @proposals ||= Proposal.where(feature: current_feature)
+          @proposals ||= Proposal.where(feature: current_feature).page(params[:page]).per(15)
         end
 
         def proposal

data/decidim-proposals/app/views/decidim/proposals/admin/proposal_answers/edit.html.erb

@@ -1,15 +1,21 @@
-<h3><%= t ".title", title: proposal.title %></h3>
+<%=  decidim_form_for(@form, url: proposal_proposal_answer_path(proposal, @form), html: { class: "form edit_proposal_answer" }) do |f| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t ".title", title: proposal.title %></h2>
+    </div>
 
-<%=  decidim_form_for(@form, url: proposal_proposal_answer_path(proposal, @form)) do |f| %>
-  <div class="field">
-    <%= f.collection_radio_buttons :state, [["accepted", t('.accepted')], ["rejected", t('.rejected')]], :first, :last, prompt: true %>
-  </div>
+    <div class="card-section">
+      <div class="row column">
+        <%= f.collection_radio_buttons :state, [["accepted", t('.accepted')], ["rejected", t('.rejected')]], :first, :last, prompt: true %>
+      </div>
 
-  <div class="field">
-    <%= f.translated :editor, :answer, autofocus: true, rows: 15 %>
+      <div class="row column">
+        <%= f.translated :editor, :answer, autofocus: true, rows: 15 %>
+      </div>
+    </div>
   </div>
 
-  <div class="actions">
+  <div class="button--double form-general-submit">
     <%= f.submit t(".answer_proposal") %>
   </div>
 <% end %>

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

@@ -1,25 +1,33 @@
-<div class="field">
-  <%= form.text_field :title %>
-</div>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= title %></h2>
+  </div>
 
-<div class="field">
-  <%= form.text_area :body, rows: 10 %>
-</div>
+  <div class="card-section">
+    <div class="row column">
+      <%= form.text_field :title %>
+    </div>
 
-<% if feature_settings.geocoding_enabled? %>
-  <div class="field">
-    <%= form.text_field :address %>
-  </div>
-<% end %>
+    <div class="row column">
+      <%= form.text_area :body, rows: 10 %>
+    </div>
 
-<% if @form.categories&.any? %>
-  <div class="field">
-    <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
-  </div>
-<% end %>
+    <% if feature_settings.geocoding_enabled? %>
+      <div class="row column">
+        <%= form.text_field :address %>
+      </div>
+    <% end %>
+
+    <% if @form.categories&.any? %>
+      <div class="row column">
+        <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
+      </div>
+    <% end %>
 
-<% if !@form.process_scope %>
-  <div class="field">
-    <%= form.collection_select :scope_id, organization_scopes, :id, :name %>
+    <% if !@form.process_scope %>
+      <div class="row column">
+        <%= form.collection_select :scope_id, organization_scopes, :id, :name %>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,46 +1,63 @@
-<h2><%= t(".title") %></h2>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
 
-<div class="actions title">
-  <% if feature_settings.official_proposals_enabled %>
-    <%= link_to t("actions.new", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposal_path, class: 'new' if can? :manage, current_feature %>
-  <% end %>
-</div>
+      <% if feature_settings.official_proposals_enabled %>
+        <%= link_to t("actions.new", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposal_path, class: 'button tiny button--title' if can? :manage, current_feature %>
+      <% end %>
+    </h2>
+  </div>
 
-<table class="stack">
-  <thead>
-    <tr>
-      <th><%= t("models.proposal.fields.title", scope: "decidim.proposals") %></th>
-      <th><%= t("models.proposal.fields.category", scope: "decidim.proposals") %></th>
-      <th><%= t("models.proposal.fields.scope", scope: "decidim.proposals") %></th>
-      <th><%= t("models.proposal.fields.state", scope: "decidim.proposals") %></th>
-      <th class="actions"><%= t("actions.title", scope: "decidim.proposals") %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% proposals.each do |proposal| %>
-      <tr data-id="<%= proposal.id %>">
-        <td>
-          <%= link_to proposal.title, decidim_proposals.proposal_path(id: proposal, feature_id: current_feature, participatory_process_id: current_participatory_process), target: :blank %><br />
-        </td>
-        <td>
-          <% if proposal.category %>
-            <%= translated_attribute proposal.category.name %>
-          <% end %>
-        </td>
-        <td>
-          <% if proposal.scope %>
-            <%= proposal.scope.name %>
-          <% else %>
-            <%= t("decidim.participatory_processes.scopes.global") %>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.proposal.fields.title", scope: "decidim.proposals") %></th>
+            <th><%= t("models.proposal.fields.category", scope: "decidim.proposals") %></th>
+            <th><%= t("models.proposal.fields.scope", scope: "decidim.proposals") %></th>
+            <th><%= t("models.proposal.fields.state", scope: "decidim.proposals") %></th>
+            <th class="actions"><%= t("actions.title", scope: "decidim.proposals") %></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% proposals.each do |proposal| %>
+            <tr data-id="<%= proposal.id %>">
+              <td>
+                <%= proposal.title %><br />
+              </td>
+              <td>
+                <% if proposal.category %>
+                  <%= translated_attribute proposal.category.name %>
+                <% end %>
+              </td>
+              <td>
+                <% if proposal.scope %>
+                  <%= proposal.scope.name %>
+                <% else %>
+                  <%= t("decidim.participatory_processes.scopes.global") %>
+                <% end %>
+              </td>
+              <td>
+                <% if proposal.state.nil? %>
+                  <% if can? :update, proposal %>
+                    <%= link_to t("actions.answer", scope: "decidim.proposals"), edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id), class: "button tiny" %>
+                  <% end %>
+                <% else %>
+                  <strong class="<%= proposal.state == 'accepted' ? 'text-success' : 'text-alert' %>">
+                    <%= humanize_proposal_state proposal.state %>
+                  </strong>
+                <% end %>
+              </td>
+              <td class="table-list__actions">
+                <%= icon_link_to "eye", decidim_proposals.proposal_path(id: proposal, feature_id: current_feature, participatory_process_id: current_participatory_process), t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank %>
+              </td>
+            </tr>
           <% end %>
-        </td>
-        <td>
-          <%= humanize_proposal_state proposal.state %>
-        </td>
-        <td class="actions">
-          <%= link_to t("actions.answer", scope: "decidim.proposals"), edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id) if can? :update, proposal %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+        </tbody>
+      </table>
+      <%= paginate proposals, theme: "decidim" %>
+    </div>
+  </div>
+</div>

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

@@ -1,9 +1,7 @@
-<h3><%= t ".title" %></h3>
+<%=  decidim_form_for(@form, html: { class: "form new_proposal" }) 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">
+  <div class="button--double form-general-submit">
     <%= f.submit t(".create") %>
   </div>
 <% end %>

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

@@ -33,7 +33,7 @@
   <% 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 %>
 
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>

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

@@ -35,6 +35,8 @@ ca:
         new: Nova proposta
         title: Accions
       admin:
+        actions:
+          preview: Previsualitzar
         models:
           proposal:
             name: Proposta
@@ -83,6 +85,7 @@ ca:
           activity: Activitat
           all: Tots
           category: Categoria
+          category_prompt: Selecciona una categoria
           citizenship: Ciutadania
           official: Oficial
           origin: Origen

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

@@ -33,9 +33,11 @@ en:
     proposals:
       actions:
         answer: Answer
-        new: New proposal
+        new: New Proposal
         title: Actions
       admin:
+        actions:
+          preview: Preview
         models:
           proposal:
             name: Proposal
@@ -84,6 +86,7 @@ en:
           activity: Activity
           all: All
           category: Category
+          category_prompt: Select a category
           citizenship: Citizenship
           official: Official
           origin: Origin