RubyGems - decidim - Versions diffs - 0.0.6 → 0.0.7 - Mend

decidim 0.0.6 → 0.0.7

Potentially problematic release.

This version of decidim might be problematic. Click here for more details.

Files changed (308) hide show

data/decidim-admin/app/views/decidim/admin/attachments/new.html.erb CHANGED

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

data/decidim-admin/app/views/decidim/admin/categories/_form.html.erb CHANGED

@@ -1,12 +1,20 @@
-<div class="field">
-  <%= form.translated :text_field, :name, autofocus: true %>
-</div>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= title %></h2>
+  </div>
-<div class="field">
-  <%= form.translated :editor, :description %>
-</div>
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :name, autofocus: true %>
+    </div>
-<div class="field">
-  <%= form.label :parent_id %>
-  <%= select :category, :parent_id, @form.parent_categories.collect { |c| [c.name[current_organization.default_locale], c.id] }, include_blank: true %>
-</div>
+    <div class="row column">
+      <%= form.translated :editor, :description %>
+    </div>
+    <div class="row column">
+      <%= form.label :parent_id %>
+      <%= select :category, :parent_id, @form.parent_categories.collect { |c| [c.name[current_organization.default_locale], c.id] }, include_blank: true %>
+    </div>
+  </div>
+</div>

data/decidim-admin/app/views/decidim/admin/categories/edit.html.erb CHANGED

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

data/decidim-admin/app/views/decidim/admin/categories/index.html.erb CHANGED

@@ -1,44 +1,59 @@
-<section id="categories">
-  <h4><%= t(".categories_title", scope: "decidim.admin") %></h4>
+<div class="card" id="categories">
+  <div class="card-divider">
+    <h2 class='card-title'>
+      <%= t(".categories_title", scope: "decidim.admin") %>
+      <% if can? :create, Decidim::Category %>
+        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.category.name", scope: "decidim.admin")), new_participatory_process_category_path(participatory_process), class: 'button tiny button--title new' %>
+      <% end %>
+    </h2>
+  </div>
-  <% if can? :create, Decidim::Category %>
-    <div class="actions title">
-      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.category.name", scope: "decidim.admin")), new_participatory_process_category_path(participatory_process), class: 'new' %>
-    </div>
-  <% end %>
-  <% if participatory_process.categories.any? %>
-    <table class="stack">
-      <thead>
-        <tr>
-          <th><%= t("models.category.fields.name", scope: "decidim.admin") %></th>
-          <th class="actions"><%= t("actions.title", scope: "decidim.admin") %></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% participatory_process.categories.first_class.each do |category| %>
-          <tr>
-            <td>
-              <%= link_to translated_attribute(category.name), participatory_process_category_path(participatory_process, category) %><br />
-            </td>
-            <td class="actions">
-              <%= link_to t("actions.edit", scope: "decidim.admin"), edit_participatory_process_category_path(participatory_process, category) if can? :update, category %>
-              <%= link_to t("actions.destroy", scope: "decidim.admin"), participatory_process_category_path(participatory_process, category), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } if can? :destroy, category %>
-            </td>
-          </tr>
-          <% category.subcategories.each do |subcategory| %>
-            <tr class="subcategory">
-              <td>
-                <%= link_to translated_attribute(subcategory.name), participatory_process_category_path(participatory_process, subcategory) %><br />
-              </td>
-              <td class="actions">
-                <%= link_to t("actions.edit", scope: "decidim.admin"), edit_participatory_process_category_path(participatory_process, subcategory) if can? :update, subcategory %>
-                <%= link_to t("actions.destroy", scope: "decidim.admin"), participatory_process_category_path(participatory_process, subcategory), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } if can? :destroy, subcategory %>
-              </td>
+  <div class="card-section">
+     <% if participatory_process.categories.any? %>
+      <div class="table-scroll">
+        <table class="table-list">
+          <thead>
+            <tr>
+              <th><%= t("models.category.fields.name", scope: "decidim.admin") %></th>
+              <th class="actions"></th>
             </tr>
-          <% end %>
-        <% end %>
-      </tbody>
-    </table>
-  <% end %>
-</section>
+          </thead>
+          <tbody>
+            <% participatory_process.categories.first_class.each do |category| %>
+              <tr>
+                <td>
+                  <%= link_to translated_attribute(category.name), edit_participatory_process_category_path(participatory_process, category) %><br />
+                </td>
+                <td class="table-list__actions">
+                  <% if can? :update, category %>
+                    <%= icon_link_to "pencil", edit_participatory_process_category_path(participatory_process, category), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                  <% end %>
+                  <% if can? :destroy, category %>
+                    <%= icon_link_to "circle-x", participatory_process_category_path(participatory_process, category), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                  <% end %>
+                </td>
+              </tr>
+              <% category.subcategories.each do |subcategory| %>
+                <tr class="extra__table-list__subcategory">
+                  <td>
+                    <%= link_to translated_attribute(subcategory.name), edit_participatory_process_category_path(participatory_process, subcategory) %><br />
+                  </td>
+                  <td class="table-list__actions">
+                  <% if can? :update, subcategory %>
+                    <%= icon_link_to "pencil", edit_participatory_process_category_path(participatory_process, subcategory), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                  <% end %>
+                  <% if can? :destroy, subcategory %>
+                    <%= icon_link_to "circle-x", participatory_process_category_path(participatory_process, subcategory), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                  <% end %>
+                  </td>
+                </tr>
+              <% end %>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+    <% end %>
+  </div>
+</div>

data/decidim-admin/app/views/decidim/admin/categories/new.html.erb CHANGED

@@ -1,9 +1,7 @@
-<h3><%= t ".title" %></h3>
+<%= decidim_form_for(@form, url: participatory_process_categories_path(participatory_process), html: { class: "form new_participatory_process_category" }) do |f| %>
+  <%= render partial: 'form', object: f, locals: { title: t('.title') } %>
-<%= decidim_form_for(@form, url: participatory_process_categories_path(participatory_process)) 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-admin/app/views/decidim/admin/dashboard/show.html.erb CHANGED

@@ -1,3 +1,6 @@
-<% provide :title do %>
-  <h2><%= t("decidim.admin.titles.dashboard") %></h2>
-<% end %>
+<h2 class="card-title">
+  <%= t "decidim.admin.titles.dashboard" %>
+</h2>
+<div class="content">
+  <p><%= t ".welcome" %></p>
+</div>

data/decidim-admin/app/views/decidim/admin/features/_feature.html.erb CHANGED

@@ -2,32 +2,32 @@
   <td>
     <%= link_to decidim.feature_path(participatory_process, feature), target: "_blank" do %>
       <%= translated_attribute feature.name %>
-      <%= icon "external-link" %>
     <% end %>
   </td>
   <td>
     <%= t "decidim.features.#{feature.manifest.name}.name" %>
   </td>
-  <td class="actions">
+  <td class="table-list__actions">
     <% if feature.manifest.admin_engine %>
-      <%= link_to manage_feature_path(participatory_process, feature), class: "button small" do %>
-        <%= t "actions.manage", scope: "decidim.admin" %>
-      <% end %>
+      <%= icon_link_to "pencil", manage_feature_path(participatory_process, feature), t("actions.manage", scope: "decidim.admin"), class: "action-icon--manage" %>
     <% end %>
     <% if can?(:update, feature) %>
       <% if feature.published? %>
-        <%= link_to t("actions.unpublish", scope: "decidim.admin"), url_for(action: :unpublish, id: feature, controller: "features"), class: "small button", method: :put %>
+        <%= icon_link_to "x", url_for(action: :unpublish, id: feature, controller: "features"), t("actions.unpublish", scope: "decidim.admin"), class: "action-icon--unpublish", method: :put %>
       <% else %>
-        <%= link_to t("actions.publish", scope: "decidim.admin"), url_for(action: :publish, id: feature, controller: "features"), class: "small button", method: :put %>
+        <%= icon_link_to "check", url_for(action: :publish, id: feature, controller: "features"), t("actions.publish", scope: "decidim.admin"), class: "action-icon--publish", method: :put %>
       <% end %>
     <% end %>
-    <%= link_to t("actions.configure", scope: "decidim.admin"), url_for(action: :edit, id: feature, controller: "features"), class: "small button" if can? :update, feature %>
+    <% if can? :update, feature %>
+      <%= icon_link_to "cog", url_for(action: :edit, id: feature, controller: "features"), t("actions.configure", scope: "decidim.admin"), class: "action-icon--configure" %>
+    <% end %>
-    <%= link_to t("actions.permissions", scope: "decidim.admin"), edit_participatory_process_feature_permissions_path(feature_id: feature), class: "small button" if can? :update, feature %>
+    <% if can? :update, feature %>
+      <%= icon_link_to "key", edit_participatory_process_feature_permissions_path(feature_id: feature), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
+    <% end %>
-    <%= link_to t("actions.destroy", scope: "decidim.admin"), url_for(action: :destroy, id: feature, controller: "features"), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } if can? :destroy, feature %>
+    <%= icon_link_to "circle-x", url_for(action: :destroy, id: feature, controller: "features"), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete %>
   </td>
 </tr>

data/decidim-admin/app/views/decidim/admin/features/_form.html.erb CHANGED

@@ -1,53 +1,61 @@
-<div class="field">
-  <%= form.translated :text_field, :name, autofocus: true %>
-  <%= form.number_field :weight %>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= title %></h2>
+  </div>
-  <% if form.object.settings? %>
-    <fieldset class="global-settings">
-      <div class="card">
-        <div class="card-divider">
-          <legend><%= t ".global_settings" %></legend>
-        </div>
-        <div class="card-section">
-          <%= form.fields_for :settings, form.object.settings do |settings_fields| %>
-            <%= render partial: "decidim/admin/features/settings_fields",
-                       locals: {
-                         form: settings_fields,
-                         feature: @feature,
-                         settings_name: "global"
-                       } %>
-          <% end %>
-        </div>
-      </div>
-    </fieldset>
-  <% end %>
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :name, autofocus: true %>
+      <%= form.number_field :weight %>
-  <% if form.object.step_settings? %>
-    <fieldset class="step-settings">
-      <div class="card">
-        <div class="card-divider">
-          <legend><%= t ".step_settings" %></legend>
-        </div>
-        <div class="card-section">
-          <% participatory_process.steps.each do |step| %>
-            <fieldset class="step-settings-<%= step.id %>">
-              <legend><%= step.position + 1 %>. <%= translated_attribute step.title %></legend>
-              <% step_settings = form.object.step_settings[step.id.to_s] %>
+      <% if form.object.settings? %>
+        <fieldset class="global-settings">
+          <div class="card">
+            <div class="card-divider">
+              <legend><%= t ".global_settings" %></legend>
+            </div>
+            <div class="card-section">
+              <%= form.fields_for :settings, form.object.settings do |settings_fields| %>
+                <%= render partial: "decidim/admin/features/settings_fields",
+                          locals: {
+                            form: settings_fields,
+                            feature: @feature,
+                            settings_name: "global"
+                          } %>
+              <% end %>
+            </div>
+          </div>
+        </fieldset>
+      <% end %>
+      <% if form.object.step_settings? %>
+        <fieldset class="step-settings">
+          <div class="card">
+            <div class="card-divider">
+              <legend><%= t ".step_settings" %></legend>
+            </div>
+            <div class="card-section">
+              <% participatory_process.steps.each do |step| %>
+                <fieldset class="step-settings-<%= step.id %>">
+                  <legend><%= step.position + 1 %>. <%= translated_attribute step.title %></legend>
+                  <% step_settings = form.object.step_settings[step.id.to_s] %>
-              <%= form.fields_for "step_settings", nil do |settings_fields| %>
-                <%= settings_fields.fields_for step.id.to_s, step_settings do |settings_fields| %>
-                  <%= render partial: "decidim/admin/features/settings_fields",
-                  locals: {
-                    form: settings_fields,
-                    feature: feature,
-                    settings_name: "step"
-                  } %>
-                <% end %>
+                  <%= form.fields_for "step_settings", nil do |settings_fields| %>
+                    <%= settings_fields.fields_for step.id.to_s, step_settings do |settings_fields| %>
+                      <%= render partial: "decidim/admin/features/settings_fields",
+                      locals: {
+                        form: settings_fields,
+                        feature: feature,
+                        settings_name: "step"
+                      } %>
+                    <% end %>
+                  <% end %>
+                </fieldset>
               <% end %>
-            </fieldset>
-          <% end %>
-        </div>
-      </div>
-    </fieldset>
-  <% end %>
+            </div>
+          </div>
+        </fieldset>
+      <% end %>
+    </div>
+  </div>
 </div>

data/decidim-admin/app/views/decidim/admin/features/edit.html.erb CHANGED

@@ -1,9 +1,7 @@
-<h3><%= t ".title", name: t("#{@feature.manifest.name}.name", scope: "decidim.features") %></h3>
+<%= decidim_form_for([participatory_process, @form], url: participatory_process_feature_path(participatory_process, @feature), method: "put", html: { class: "form edit_feature" }) do |form| %>
+  <%= render partial: 'form', object: form, locals: { feature: @feature, title: t(".title", name: t("#{@feature.manifest.name}.name", scope: "decidim.features"))} %>
-<%= decidim_form_for([participatory_process, @form], url: participatory_process_feature_path(participatory_process, @feature), method: "put") do |form| %>
-  <%= render partial: 'form', object: form, locals: { feature: @feature } %>
-  <div class="actions">
+  <div class="button--double form-general-submit">
     <%= form.submit t(".update") %>
   </div>
 <% end %>

data/decidim-admin/app/views/decidim/admin/features/index.html.erb CHANGED

@@ -1,10 +1,8 @@
-<section id="features">
-  <div class="row">
-    <div class="columns">
-      <h3><%= t("features.title", scope: "decidim.admin") %></h3>
-    </div>
-    <div class="small-4 columns text-right">
-      <button class="dropdown button" data-toggle="add-feature-dropdown"><%= t "features.index.add", scope: "decidim.admin" %></button>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t("features.title", scope: "decidim.admin") %>
+      <button class="dropdown tiny button button--title" data-toggle="add-feature-dropdown"><%= t "features.index.add", scope: "decidim.admin" %></button>
       <div class="dropdown-pane" id="add-feature-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
         <ul class="vertical menu add-features">
           <% @manifests.each do |manifest| %>
@@ -12,18 +10,22 @@
           <% end %>
         </ul>
       </div>
-    </div>
+    </h2>
   </div>
-  <table>
-    <thead>
-      <th><%= t(".headers.name") %></th>
-      <th><%= t(".headers.type") %></th>
-      <th><%= t(".headers.actions") %></th>
-    </thead>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <th><%= t(".headers.name") %></th>
+          <th><%= t(".headers.type") %></th>
+          <th><%= t(".headers.actions") %></th>
+        </thead>
-    <tbody>
-      <%= render partial: "feature", collection: @features %>
-    </tbody>
-  </table>
-</section>
+        <tbody>
+          <%= render partial: "feature", collection: @features %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

data/decidim-admin/app/views/decidim/admin/features/new.html.erb CHANGED

@@ -1,9 +1,8 @@
-<h3><%= t ".title", name: t("#{manifest.name}.name", scope: "decidim.features") %></h3>
-<%= decidim_form_for([participatory_process, @form], url: participatory_process_features_path(type: params[:type]), method: "post") do |form| %>
-  <%= render partial: 'form', object: form, locals: { feature: @feature } %>
+<%= decidim_form_for([participatory_process, @form], url: participatory_process_features_path(type: params[:type]), method: "post", html: { class: "form new_feature" }) do |form| %>
+  <%= render partial: 'form', object: form, locals: { feature: @feature, title: t(".title", name: t("#{manifest.name}.name", scope: "decidim.features"))} %>
-  <div class="actions">
+  <div class="button--double form-general-submit">
     <%= form.submit t(".add") %>
   </div>
 <% end %>

data/decidim-admin/app/views/decidim/admin/moderations/index.html.erb CHANGED

@@ -1,65 +1,75 @@
-<h2><%= t(".title") %></h2>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
-<div class="actions title">
-  <%= link_to t("actions.not_hidden", scope: "decidim.moderations"), decidim_admin.participatory_process_moderations_path %>
-  |
-  <%= link_to t("actions.hidden", scope: "decidim.moderations"), decidim_admin.participatory_process_moderations_path(hidden: true) %>
-</div>
+      <div class="card__filter">
+        <%= link_to t("actions.not_hidden", scope: "decidim.moderations"), decidim_admin.participatory_process_moderations_path %>
+        |
+        <%= link_to t("actions.hidden", scope: "decidim.moderations"), decidim_admin.participatory_process_moderations_path(hidden: true) %>
+      </div>
+    </h2>
+  </div>
-<table class="stack">
-  <thead>
-    <tr>
-      <th><%= t("models.moderation.fields.reportable", scope: "decidim.moderations") %></th>
-      <th><%= t("models.moderation.fields.reported_content", scope: "decidim.moderations") %></th>
-      <th><%= t("models.moderation.fields.reports", scope: "decidim.moderations") %></th>
-      <th><%= t("models.moderation.fields.report_count", scope: "decidim.moderations") %></th>
-      <th><%= t("models.moderation.fields.hidden_at", scope: "decidim.moderations") %></th>
-      <th class="actions"><%= t("actions.title", scope: "decidim.moderations") %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% moderations.each do |moderation| %>
-      <tr data-id="<%= moderation.id %>">
-        <td>
-          <%= moderation.reportable.class.name %>
-        </td>
-        <td>
-          <%= moderation.reportable.reported_content %>
-        </td>
-        <td>
-          <ul>
-            <% moderation.reports.each do |report| %>
-              <li>
-                <% if report.details.blank? %>
-                  <%= report.reason %>
-                <% else %>
-                  <span
-                    data-tooltip
-                    aria-haspopup="true"
-                    class="has-tip"
-                    title="<%= report.details %>">
-                      <%= report.reason %>
-                  </span>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.moderation.fields.reportable", scope: "decidim.moderations") %></th>
+            <th><%= t("models.moderation.fields.reported_content", scope: "decidim.moderations") %></th>
+            <th><%= t("models.moderation.fields.reports", scope: "decidim.moderations") %></th>
+            <th><%= t("models.moderation.fields.report_count", scope: "decidim.moderations") %></th>
+            <th><%= t("models.moderation.fields.hidden_at", scope: "decidim.moderations") %></th>
+            <th class="actions"><%= t("actions.title", scope: "decidim.moderations") %></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% moderations.each do |moderation| %>
+            <tr data-id="<%= moderation.id %>">
+              <td>
+                <%= moderation.reportable.class.name %>
+              </td>
+              <td>
+                <%= moderation.reportable.reported_content %>
+              </td>
+              <td>
+                <ul>
+                  <% moderation.reports.each do |report| %>
+                    <li>
+                      <% if report.details.blank? %>
+                        <%= report.reason %>
+                      <% else %>
+                        <span
+                          data-tooltip
+                          aria-haspopup="true"
+                          class="has-tip"
+                          title="<%= report.details %>">
+                            <%= report.reason %>
+                        </span>
+                      <% end %>
+                    </li>
+                  <% end %>
+                </ul>
+              </td>
+              <td>
+                <%= moderation.report_count %>
+              </td>
+              <td>
+                <%= l moderation.hidden_at if moderation.hidden_at.present? %>
+              </td>
+              <td class="actions">
+                <% if can? :unreport, moderation %>
+                  <%= link_to t("actions.unreport", scope: "decidim.moderations"), decidim_admin.unreport_participatory_process_moderation_path(id: moderation), method: :put, class: "button" %>
                 <% end %>
-              </li>
-            <% end %>
-          </ul>
-        </td>
-        <td>
-          <%= moderation.report_count %>
-        </td>
-        <td>
-          <%= l moderation.hidden_at if moderation.hidden_at.present? %>
-        </td>
-        <td class="actions">
-          <% if can? :unreport, moderation %>
-            <%= link_to t("actions.unreport", scope: "decidim.moderations"), decidim_admin.unreport_participatory_process_moderation_path(id: moderation), method: :put, class: "button" %>
-          <% end %>
-          <% if !moderation.reportable.hidden? && can?(:hide, moderation) %>
-            | <%= link_to t("actions.hide", scope: "decidim.moderations"), decidim_admin.hide_participatory_process_moderation_path(id: moderation), method: :put, class: "button" %>
+                <% if !moderation.reportable.hidden? && can?(:hide, moderation) %>
+                  | <%= link_to t("actions.hide", scope: "decidim.moderations"), decidim_admin.hide_participatory_process_moderation_path(id: moderation), method: :put, class: "button" %>
+                <% end %>
+              </td>
+            </tr>
           <% end %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>