decidim-budgets 0.25.0.rc4 → 0.26.0.rc1

data/app/packs/stylesheets/decidim/budgets/budget/_budget-list.scss

@@ -19,6 +19,26 @@
       border-bottom-right-radius: $card-border-radius;
       border-bottom: $border;
     }
+
+    &-cell{
+      display: grid;
+      grid-template-columns: 1fr 40px;
+
+      .budget-list__data{
+        grid-column: span 2;
+        background: none;
+      }
+
+      @include breakpoint(medium){
+        grid-template-columns: 1fr 40px 15em;
+        grid-template-rows: 1fr;
+
+        .budget-list__data{
+          background: $card-secondary-bg;
+          grid-column: 3;
+        }
+      }
+    }
   }
 
   &__image{
@@ -54,6 +74,11 @@
       padding: $card-padding;
       display: flex;
       align-items: center;
+
+      &.flex-horizontal{
+        flex-direction: column;
+        align-items: flex-start;
+      }
     }
 
     .card__text--status{
@@ -79,10 +104,19 @@
       min-width: 7rem;
       flex-direction: row;
       justify-content: flex-end;
-      flex-basis: 12rem;
+      flex-basis: 14rem;
       padding: 1rem $card-padding;
     }
 
+    .loading-spinner{
+      margin: 0 !important;
+      position: relative;
+
+      &::before{
+        position: absolute;
+      }
+    }
+
     &:last-child{
       margin-bottom: 0;
     }

data/app/views/decidim/budgets/admin/projects/index.html.erb

@@ -15,24 +15,36 @@
     </h2>
   </div>
 
+  <%= admin_filter_selector(:projects) %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
         <thead>
           <tr>
-            <th><%= t("models.project.fields.title", scope: "decidim.budgets") %></th>
-            <th><%= t("index.confirmed_orders_count") %></th>
-            <th><%= t(".selected") %></th>
-            <%= th_resource_scope_label %>
+            <th><%= sort_link(query, :id, t("models.project.fields.id", scope: "decidim.budgets"), default_order: :desc) %>
+            <th><%= sort_link(query, :title, t("models.project.fields.title", scope: "decidim.budgets")) %></th>
+            <th><%= sort_link(query, :category_name, t("models.project.fields.category", scope: "decidim.budgets") ) %></th>
+            <%= th_scope_sort_link %>
+            <th><%= sort_link(query, :confirmed_orders_count, t("index.confirmed_orders_count")) %></th>
+            <th><%= sort_link(query, :selected, t(".selected")) %></th>
             <th class="actions"><%= t("actions.title", scope: "decidim.budgets") %></th>
           </tr>
         </thead>
         <tbody>
           <% projects.each do |project| %>
             <tr data-id="<%= project.id %>">
+              <td>
+                <%= project.id %><br>
+              </td>
               <td>
                 <%= translated_attribute(project.title) %><br>
               </td>
+              <td>
+                <% if project.category %>
+                  <%= translated_attribute project.category.name %>
+                <% end %>
+              </td>
+              <%= td_resource_scope_for(project.scope) %>
               <td>
                <%= project.confirmed_orders_count %>
               </td>
@@ -43,7 +55,6 @@
                   <%= content_tag :span, "×", class: "text-muted" %>
                 <% end %>
               </td>
-              <%= td_resource_scope_for(project.scope) %>
               <td class="table-list__actions">
                 <%= icon_link_to "eye", resource_locator([budget, project]).path, t("actions.preview", scope: "decidim.budgets"), target: :blank, class: "action-icon--preview" %>
 

data/app/views/decidim/budgets/projects/_exit_modal.html.erb

@@ -0,0 +1,22 @@
+<% if current_user && current_component.current_settings.votes == "enabled" && !current_workflow.voted?(budget) %>
+  <div class="reveal" data-reveal id="exit-notification" role="dialog" aria-modal="true" aria-labelledby="exit-notification-label" aria-live="polite">
+    <div class="reveal__header">
+      <h3 id="exit-notification-label" class="reveal__title"><%= t(".title") %></h3>
+      <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
+        <span aria-hidden="true">&times;</span>
+      </button>
+    </div>
+    <div class="static__content text-center">
+      <p><%= t(".message") %></p>
+    </div>
+
+    <div class="row">
+      <div class="columns medium-8 medium-offset-2">
+        <button class="button primary expanded" data-close type="button">
+          <%= t(".cancel") %>
+        </button>
+        <%= link_to t(".exit"), budget_projects_path, id: "exit-notification-link", class: "button primary hollow expanded" %>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/decidim/budgets/projects/_filters_small_view.html.erb

@@ -1,13 +1,13 @@
 <div class="filters-controls hide-for-mediumlarge">
-  <button data-open="filter-box" class="filters-controls__trigger">
+  <button data-open="filter-box" class="filters-controls__trigger" aria-controls="filter-box" aria-haspopup="dialog">
     <%= t ".filter" %>
     <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t(".unfold"), role: "img" %>
   </button>
 </div>
 
-<div class="reveal" id="filter-box" data-reveal>
+<div class="reveal" id="filter-box" data-reveal role="dialog" aria-modal="true" aria-labelledby="filter-box-label">
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
+    <h3 id="filter-box-label" 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/app/views/decidim/budgets/projects/_project_budget_button.html.erb

@@ -1,40 +1,19 @@
-<div id="project-<%= project.id %>-budget-button">
-  <% if voted_for?(project) %>
-    <%= action_authorized_button_to(
-          "vote",
-          t(".added"),
-          budget_order_line_item_path(budget, project_id: project),
-          method: :delete,
-          remote: true,
-          data: {
-            disable: true,
-            budget: project.budget_amount,
-            "redirect-url": budget_project_path(budget, project)
-          },
-          disabled: !can_have_order? || current_order_checked_out?,
-          class: "button expanded button--sc success",
-          "aria-label": t(".added_descriptive", resource_name: translated_attribute(project.title))
-        ) %>
-  <% elsif current_user.present? %>
-    <%= action_authorized_button_to(
-          "vote",
-          t(".add"),
-          budget_order_line_item_path(budget, project_id: project),
-          method: :post,
-          remote: true,
-          data: {
-            disable: true,
-            budget: project.budget_amount,
-            add: true,
-            "redirect-url": budget_project_path(budget, project)
-          },
-          disabled: !can_have_order? || current_order_checked_out?,
-          class: "button expanded button--sc",
-          "aria-label": t(".add_descriptive", resource_name: translated_attribute(project.title))
-        ) %>
-  <% else %>
-    <button class="button expanded button--sc" data-toggle="loginModal">
+<% if current_user.blank? %>
+  <div id="project-<%= project.id %>-budget-button">
+    <button class="button expanded primary button--sc"
+            data-toggle="loginModal"
+            aria-label="<%= t(".added_descriptive", resource_name: translated_attribute(project.title)) %>">
       <%= t(".add") %>
     </button>
-  <% end %>
-</div>
+  </div>
+<% else %>
+  <div id="project-<%= project.id %>-budget-button"
+       class="<%= "added" if voted_for?(project) %> button expanded primary button--sc budget-vote-button budget-list__data"
+       aria-label="<%= t(".#{voted_for?(project) ? ".added" : ".add"}_descriptive", resource_name: translated_attribute(project.title)) %>">
+    <span>
+      <%= t(voted_for?(project) ? ".added" : ".add") %>
+    </span>
+
+    <%= cell("decidim/budgets/project_vote_button", project) %>
+  </div>
+<% end %>

data/app/views/decidim/budgets/projects/index.html.erb

@@ -1,32 +1,35 @@
 <%= render partial: "decidim/shared/component_announcement" %>
+<%= render partial: "exit_modal" %>
 
 <%= cell("decidim/budgets/limit_announcement", budget) %>
 
-<div class="row columns">
-  <% if voting_finished? %>
-    <h2 class="heading2">
-      <%= t("decidim.budgets.projects.projects_for", name: translated_attribute(budget.title)) %>
-    </h2>
-  <% else %>
-    <%= render partial: "budget_summary", locals: { include_heading: true } %>
-  <% end %>
-</div>
+<div class="voting-wrapper">
+  <div class="row columns">
+    <% if voting_finished? %>
+      <h2 class="heading2">
+        <%= t("decidim.budgets.projects.projects_for", name: translated_attribute(budget.title)) %>
+      </h2>
+    <% else %>
+      <%= render partial: "budget_summary", locals: { include_heading: true } %>
+    <% end %>
+  </div>
 
-<div class="row columns">
-  <h3 class="section-heading">
-    <%= render partial: "count" %>
-  </h3>
-</div>
+  <div class="row columns">
+    <h3 class="section-heading">
+      <%= render partial: "count" %>
+    </h3>
+  </div>
 
-<div class="row">
-  <div class="columns mediumlarge-4 large-3">
-    <%= render partial: "filters_small_view" %>
-    <div class="card card--secondary show-for-mediumlarge">
-      <%= render partial: "filters" %>
+  <div class="row">
+    <div class="columns mediumlarge-4 large-3">
+      <%= render partial: "filters_small_view" %>
+      <div class="card card--secondary show-for-mediumlarge">
+        <%= render partial: "filters" %>
+      </div>
+    </div>
+    <div id="projects" class="columns mediumlarge-8 large-9" aria-live="polite">
+      <%= render partial: "projects" %>
     </div>
-  </div>
-  <div id="projects" class="columns mediumlarge-8 large-9" aria-live="polite">
-    <%= render partial: "projects" %>
   </div>
 </div>
 

data/app/views/decidim/budgets/projects/show.html.erb

@@ -12,57 +12,60 @@ edit_link(
 )
 %>
 
+<%= render partial: "exit_modal" %>
 <%= cell("decidim/budgets/limit_announcement", budget) %>
 
-<div class="row column view-header">
-  <% unless voting_finished? %>
-    <%= render partial: "budget_summary", locals: { include_heading: false } %>
-  <% end %>
-
-  <div class="m-bottom">
-    <%= link_to resource_locator(budget).path(filter_link_params), class: "muted-link" do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-      <%= t(".view_all_projects") %>
+<div class="voting-wrapper">
+  <div class="row column view-header">
+    <% unless voting_finished? %>
+      <%= render partial: "budget_summary", locals: { include_heading: false } %>
     <% end %>
+
+    <div class="m-bottom">
+      <%= link_to resource_locator(budget).path(filter_link_params), class: "muted-link" do %>
+        <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+        <%= t(".view_all_projects") %>
+      <% end %>
+    </div>
+    <h2 class="heading2"><%= translated_attribute project.title %></h2>
   </div>
-  <h2 class="heading2"><%= translated_attribute project.title %></h2>
-</div>
-<div class="row">
-  <div id="project" class="columns section view-side mediumlarge-4 mediumlarge-push-8
-    large-3 large-push-9">
-    <div class="card extra">
-      <div class="card__content">
-        <div class="m-bottom">
-          <span class="definition-data__title"><%= t(".budget") %></span>
-          <span class="definition-data__number"><%= budget_to_currency project.budget_amount %></span>
-        </div>
+  <div class="row">
+    <div id="project" class="columns section view-side mediumlarge-4 mediumlarge-push-8
+      large-3 large-push-9">
+      <div class="card extra">
+        <div class="card__content">
+          <div class="m-bottom">
+            <span class="definition-data__title"><%= t(".budget") %></span>
+            <span class="definition-data__number"><%= budget_to_currency project.budget_amount %></span>
+          </div>
 
-        <%= cell("decidim/budgets/project_votes_count", project, layout: :one_line, class: "display-block") %>
+          <%= cell("decidim/budgets/project_votes_count", project, layout: :one_line, class: "display-block") %>
 
-        <% if voting_finished? %>
-          <%= cell("decidim/budgets/project_voted_hint", project, class: "display-block") %>
-        <% elsif voting_open? %>
-          <%= render partial: "project_budget_button", locals: { project: project } %>
-        <% end %>
+          <% if voting_finished? %>
+            <%= cell("decidim/budgets/project_voted_hint", project, class: "display-block") %>
+          <% elsif voting_open? %>
+            <%= render partial: "project_budget_button", locals: { project: project } %>
+          <% end %>
 
-        <%= render partial: "decidim/shared/follow_button", locals: { followable: project, large: false  } %>
+          <%= render partial: "decidim/shared/follow_button", locals: { followable: project, large: false  } %>
+        </div>
       </div>
+      <%= resource_reference(project) %>
+      <%= render partial: "decidim/shared/share_modal" %>
     </div>
-    <%= resource_reference(project) %>
-    <%= render partial: "decidim/shared/share_modal" %>
-  </div>
-  <div class="columns mediumlarge-8 mediumlarge-pull-4">
-    <div class="section">
-      <%= cell("decidim/budgets/project_selected_status", project, as_label: true) %>
-      <%= decidim_sanitize translated_attribute project.description %>
-      <%= cell "decidim/budgets/project_tags", project, context: { extra_classes: ["tags--project"] } %>
+    <div class="columns mediumlarge-8 mediumlarge-pull-4">
+      <div class="section">
+        <%= cell("decidim/budgets/project_selected_status", project, as_label: true) %>
+        <%= decidim_sanitize_editor translated_attribute project.description %>
+        <%= cell "decidim/budgets/project_tags", project, context: { extra_classes: ["tags--project"] } %>
+      </div>
+      <%= attachments_for project %>
+      <%= linked_resources_for project, :proposals, "included_proposals" %>
+      <%= linked_resources_for project, :results, "included_projects" %>
     </div>
-    <%= attachments_for project %>
-    <%= linked_resources_for project, :proposals, "included_proposals" %>
-    <%= linked_resources_for project, :results, "included_projects" %>
   </div>
 </div>
 
-<%= comments_for project %>
+<%= comments_for project, polymorphic: [project.budget] %>
 
 <%= javascript_pack_tag("decidim_budgets") %>

data/config/locales/ca.yml

@@ -119,6 +119,9 @@ ca:
         highlighted_cta: Votar a %{name}
         if_change_opinion: Si has canviat d'opinió, pots
         my_budgets: Els meus pressupostos
+        progress: Acaba la votació
+        show: Mostra els projectes
+        vote: Vota
         voted_on: Has votat a %{links}
       limit_announcement:
         cant_vote: No pots votar a aquests pressupostos. <a href="%{landing_path}"> Prova amb un altre pressupost </a>.
@@ -233,6 +236,7 @@ ca:
     components:
       budgets:
         actions:
+          comment: Comentar
           vote: Vota
         name: Pressupostos
         settings:

data/config/locales/cs.yml

@@ -23,6 +23,18 @@ cs:
         many: Projekty
         other: Projekty
   decidim:
+    admin:
+      filters:
+        projects:
+          category_id_eq:
+            label: Kategorie
+          scope_id_eq:
+            label: Oblast působnosti
+          selected_at_null:
+            label: Vybráno
+            values:
+              'false': Vybráno pro implementaci
+              'true': Nevybráno pro implementaci
     budgets:
       actions:
         attachment_collections: Složky
@@ -121,6 +133,9 @@ cs:
         highlighted_cta: Hlasovat na %{name}
         if_change_opinion: Pokud jste změnili názor, můžete
         my_budgets: Mé rozpočty
+        progress: Dokončit hlasování
+        show: Zobrazit projekty
+        vote: Hlasovat
         voted_on: Hlasovali jste pro %{links}
       limit_announcement:
         cant_vote: O tomto rozpočtu nelze hlasovat. <a href="%{landing_path}">Zkuste jiný rozpočet</a>.
@@ -133,6 +148,8 @@ cs:
             total_budget: Celkový rozpočet
         project:
           fields:
+            category: Kategorie
+            id: ID
             title: Titul
       order_summary_mailer:
         order_summary:
@@ -187,6 +204,12 @@ cs:
             few: "%{count} projektů"
             many: "%{count} projektů"
             other: "%{count} projektů"
+        exit_modal:
+          cancel: Návrat k hlasování
+          close_modal: Zavřít modal
+          exit: Ukončit hlasování
+          message: Váš hlas nebyl zaregistrován, protože jste ještě nedokončili proces hlasování. Opravdu chcete ukončit hlasování?
+          title: Zatím jste nehlasovali
         filters:
           category: Kategorie
           scope: Oblast působnosti
@@ -241,6 +264,7 @@ cs:
     components:
       budgets:
         actions:
+          comment: Komentář
           vote: Hlasovat
         name: Rozpočty
         settings:

data/config/locales/de.yml

@@ -119,6 +119,9 @@ de:
         highlighted_cta: Über %{name} abstimmen
         if_change_opinion: Wenn sie ihr Meinung geändert haben, können sie
         my_budgets: Meine Budgets
+        progress: Abstimmung beenden
+        show: Projekte ansehen
+        vote: Abstimmen
         voted_on: Sie haben über %{links} abgestimmt
       limit_announcement:
         cant_vote: Sie können nicht über dieses Budget abstimmen. <a href="%{landing_path}">Versuchen Sie es mit einem anderen Budget</a>.
@@ -183,6 +186,12 @@ de:
           projects_count:
             one: 1 Projekt
             other: "%{count} Projekte"
+        exit_modal:
+          cancel: Zurück zur Abstimmung
+          close_modal: Dialog schließen
+          exit: Abstimmung verlassen
+          message: Ihre Stimme wurde nicht registriert, weil Sie den Abstimmungsprozess noch nicht abgeschlossen haben. Sind Sie sicher, dass Sie die Abstimmung beenden möchten?
+          title: Sie haben noch nicht abgestimmt
         filters:
           category: Kategorie
           scope: Umfang
@@ -233,6 +242,7 @@ de:
     components:
       budgets:
         actions:
+          comment: Kommentieren
           vote: Abstimmen
         name: Budgets
         settings: