RubyGems - decidim-admin - Versions diffs - 0.0.1.alpha5 → 0.0.1.alpha6 - Mend

decidim-admin 0.0.1.alpha5 → 0.0.1.alpha6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

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

Files changed (15) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bcb075ae6997dfee8724c29c8b31cde6d60df4a
-  data.tar.gz: b2e92083902a331ae3c462850f43a1350c8883f5
+  metadata.gz: f9a07856bf0f1fe7fafa20f693fd0d7c877270dc
+  data.tar.gz: ca7b7bb0bf52a3612ad0da6380c8897365878674
 SHA512:
-  metadata.gz: 11a6968f34ae49a3b20cbc2f14153599eb8d83d49c744f8004121e45922b6878a1f1894aaebfd67e91993c2d5c19d2cb6283ac7a40ec71712eaf3562a19f58b8
-  data.tar.gz: 4efdcc626a300fa04c9009e12d3120b93733f0e43de3876f89a4643ab95c19092f7947748491d86e0b7f41b752c898897019b0f10417025194a562b0f10d8efd
+  metadata.gz: d0ee71032aeef185653aa314089fed92e66ab7bfd293204c8d08743abe96e3086f6e895e4332863649b0685902f02141bd14f328a94ce2693edaac34d40fbb60
+  data.tar.gz: ce218ae587b569a0217349f67cb9b520213d36a1c7897bdf8ea4ddc572064189ab372c8207b1c96c185e8d9981080d9727aa03e4bbf52af2f2fda12912090210

data/app/assets/config/decidim_admin_manifest.js CHANGED

@@ -1,2 +1,3 @@
-//= link_directory ../javascripts/decidim/admin.js
-//= link_directory ../stylesheets/decidim/admin.css
+//= link decidim/admin/application.js
+//= link decidim/admin/application.css
+//= link_directory ../images/decidim/admin/

data/app/assets/javascripts/decidim/{admin.js → admin/application.js} RENAMED

File without changes

data/app/assets/stylesheets/decidim/admin/application.scss ADDED

@@ -0,0 +1,8 @@
+@import 'https://fonts.googleapis.com/css?family=Montserrat:400,700';
+@import "foundation_and_overrides";
+@import "layout";
+@import "login";
+@import "sidebar";
+@import "tables";
+@import "actions";

data/app/commands/decidim/admin/create_participatory_process.rb CHANGED

@@ -39,6 +39,8 @@ module Decidim
           hashtag: form.hashtag,
           description: form.description,
           short_description: form.short_description,
+          hero_image: form.hero_image,
+          banner_image: form.banner_image,
           organization: @organization
         )
       end

data/app/commands/decidim/admin/update_participatory_process.rb CHANGED

@@ -40,6 +40,8 @@ module Decidim
           subtitle: form.subtitle,
           slug: form.slug,
           hashtag: form.hashtag,
+          hero_image: form.hero_image,
+          banner_image: form.banner_image,
           description: form.description,
           short_description: form.short_description
         }

data/app/controllers/decidim/admin/participatory_processes_controller.rb CHANGED

@@ -63,9 +63,11 @@ module Decidim
       end
       def destroy
-        @participatory_process = collection.find(params[:id]).destroy!
+        @participatory_process = collection.find(params[:id])
         authorize @participatory_process
+        @participatory_process.destroy!
         flash[:notice] = I18n.t("participatory_processes.destroy.success", scope: "decidim.admin")
         redirect_to participatory_processes_path

data/app/forms/decidim/admin/participatory_process_form.rb CHANGED

@@ -16,6 +16,8 @@ module Decidim
       attribute :slug, String
       attribute :hashtag, String
+      attribute :hero_image
+      attribute :banner_image
       validates :slug, presence: true
       translatable_validates :title, :subtitle, :description, :short_description, presence: true

data/app/helpers/decidim/admin/attributes_display_helper.rb CHANGED

@@ -33,8 +33,7 @@ module Decidim
         attrs.map do |attr|
           if record.column_for_attribute(attr).type == :hstore
             I18n.available_locales.map do |locale|
-              content_tag(:dt, record.class.human_attribute_name(attr) + " (#{locale})") +
-                display_value(record, attr, locale)
+              display_label(record, attr, locale) + display_value(record, attr, locale)
             end.reduce(:+)
           else
             display_label(record, attr) + display_value(record, attr)
@@ -42,13 +41,14 @@ module Decidim
         end.reduce(:+)
       end
-      private
-      # Private: Holds the logic to render a label for a given attribute.
-      def display_label(record, attr)
-        content_tag(:dt, record.class.human_attribute_name(attr))
+      # Holds the logic to render a label for a given attribute.
+      def display_label(record, attr, locale = nil)
+        return content_tag(:dt, record.class.human_attribute_name(attr)) unless locale
+        content_tag(:dt, record.class.human_attribute_name(attr) + " (#{locale})")
       end
+      private
       # Private: Holds the logic to render the attribute value.
       def display_value(record, attr, locale = nil)
         return I18n.with_locale(locale) do

data/app/views/decidim/admin/participatory_processes/_form.html.erb CHANGED

@@ -21,3 +21,11 @@
 <div class="field">
   <%= form.translated :text_area, :description %>
 </div>
+<div class="field">
+  <%= form.file_field :hero_image %>
+</div>
+<div class="field">
+  <%= form.file_field :banner_image %>
+</div>

data/app/views/decidim/admin/participatory_processes/show.html.erb CHANGED

@@ -14,7 +14,12 @@
     :title,
     :subtitle,
     :hashtag,
+    :slug,
     :short_description,
     :description
     %>
+  <dt><%= display_label(@participatory_process, :hero_image) %></dt>
+  <dd><%= image_tag @participatory_process.hero_image.url.to_s %></dd>
+  <dt><%= display_label(@participatory_process, :banner_image) %></dt>
+  <dd><%= image_tag @participatory_process.banner_image.url.to_s %></dd>
 </dl>

data/app/views/layouts/decidim/admin/_header.html.erb CHANGED

@@ -1,4 +1,4 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <%= csrf_meta_tags %>
-<%= stylesheet_link_tag    'decidim/admin', media: 'all', 'data-turbolinks-track': 'reload' %>
-<%= javascript_include_tag 'decidim/admin', 'data-turbolinks-track': 'reload' %>
+<%= stylesheet_link_tag    'decidim/admin/application', media: 'all', 'data-turbolinks-track': 'reload' %>
+<%= javascript_include_tag 'decidim/admin/application', 'data-turbolinks-track': 'reload' %>

data/lib/decidim/admin/engine.rb CHANGED

@@ -20,11 +20,8 @@ module Decidim
     class Engine < ::Rails::Engine
       isolate_namespace Decidim::Admin
-      config.to_prepare do
-        Rails.application.config.assets.precompile += %w(
-          decidim/admin.js
-          decidim/admin.css
-        )
+      initializer "decidim_admin.assets" do |app|
+        app.config.assets.precompile += %w(decidim_admin_manifest.js)
       end
     end
   end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha5
+  version: 0.0.1.alpha6
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha5
+        version: 0.0.1.alpha6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha5
+        version: 0.0.1.alpha6
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -208,20 +208,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha5
+        version: 0.0.1.alpha6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1.alpha5
+        version: 0.0.1.alpha6
 - !ruby/object:Gem::Dependency
   name: pundit-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -248,8 +262,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/decidim_admin_manifest.js
-- app/assets/javascripts/decidim/admin.js
-- app/assets/stylesheets/decidim/admin.scss
+- app/assets/javascripts/decidim/admin/application.js
 - app/assets/stylesheets/decidim/admin/_actions.scss
 - app/assets/stylesheets/decidim/admin/_foundation_and_overrides.scss
 - app/assets/stylesheets/decidim/admin/_layout.scss
@@ -257,6 +270,7 @@ files:
 - app/assets/stylesheets/decidim/admin/_settings.scss
 - app/assets/stylesheets/decidim/admin/_sidebar.scss
 - app/assets/stylesheets/decidim/admin/_tables.scss
+- app/assets/stylesheets/decidim/admin/application.scss
 - app/commands/decidim/admin/create_participatory_process.rb
 - app/commands/decidim/admin/update_participatory_process.rb
 - app/constraints/decidim/admin/organization_dashboard_constraint.rb

data/app/assets/stylesheets/decidim/admin.scss DELETED

@@ -1,8 +0,0 @@
-@import 'https://fonts.googleapis.com/css?family=Montserrat:400,700';
-@import "admin/foundation_and_overrides";
-@import "admin/layout";
-@import "admin/login";
-@import "admin/sidebar";
-@import "admin/tables";
-@import "admin/actions";