spina 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf8e1acf502fbd64b327828a28af4ec8452a22e2e81c103ad853636ccde3eea1
-  data.tar.gz: f46e38dcc0c9a6e88abde1bee9f1d0ecfc9395926985450cd31206eea5ea5847
+  metadata.gz: 50253fea48d53beb3fa281b4b1d50b0200f185c0f64bcfa6e5f9d2bb191c6e7e
+  data.tar.gz: ada89edeccdd49639b147a6da870490fc4661c73c530e9340611556281029ac4
 SHA512:
-  metadata.gz: da8787b13f4fafd83d1b33d7069254c9c1a0cd214fb11fca79c28d7592ae6536e912d497dff829b5ef9a0eba53d14ce30a9b2ceceb52564d04c7ac0e7dc11fff
-  data.tar.gz: 9771f950a95113c250d8c44ab7ccf0e41369b9d56644a4f4b9cb1f25cb956a33152682e6fb4749c04ae1bf67f382f4d5ce6f5f16c798f63c4c4423cc078c3747
+  metadata.gz: fdfd4ee732b880604104ba8fc0aa6064e1fe7e9c807b73a9cfc9466ad054e555fdb0e74504baf55989c746f00acd5812b2299c1b224f04748886adfc60e1dd8f
+  data.tar.gz: db3e730dc7ec2dcc252bed01e9eac095b954eb68eb2dff0afca7b971c29c659d3b480b891642e8b8b5b5de4e51c1fe61cb529886adc5a7877889854aa21d1c59

data/README.md

@@ -255,7 +255,7 @@ You can define custom pages for your theme that will be generated when bootstrap
 
 Check our [Contributing Guide](CONTRIBUTING.md) for instructions on how to help the project.
 
-<a href="graphs/contributors"><img src="https://opencollective.com/Spina/contributors.svg?width=890" /></a>
+<a href="https://github.com/SpinaCMS/Spina/graphs/contributors"><img src="https://opencollective.com/Spina/contributors.svg?width=890" /></a>
 
 
 # Backers
@@ -288,6 +288,6 @@ Spina is released under the [MIT license](LICENSE.md).
 
 # Credits
 
-Some parts of Spina are heavily influenced by the wonderful Refinery CMS. Credits to [the Refinery  team](http://www.refinerycms.com/about).
+Some parts of Spina are heavily influenced by the wonderful Refinery CMS. Credits to [the Refinery  team](https://www.refinerycms.com/).
 
 All icons in Spina were made by Brent Jackson [Geomicons](http://jxnblk.com/geomicons-wired/).

data/app/assets/javascripts/spina/admin/controllers/image_form_controller.js

@@ -0,0 +1,21 @@
+(() => {
+  const application = Stimulus.Application.start()
+
+  application.register("image-form", class extends Stimulus.Controller {
+    static get targets() {
+      return ["image", "field", "button"]
+    }
+
+    remove(e) {
+      // Prevent link
+      e.preventDefault()
+      e.stopPropagation()
+
+      // Remove image and reset field
+      this.imageTarget.remove()
+      this.buttonTarget.remove()
+      this.fieldTarget.value = null
+    }
+    
+  })
+})()

data/app/assets/stylesheets/spina/_forms.sass

@@ -852,7 +852,7 @@ input.datepicker
   &:hover .button
     background: tint(#efefef, 20%)
 
-  &:active .button
+  .button:active 
     background: shade(#efefef, 10%)
 
   .placeholder

data/app/controllers/spina/admin/accounts_controller.rb

@@ -28,7 +28,7 @@ module Spina
       private
 
       def account_params
-        params.require(:account).permit(:address, :city, :email, :logo, :name, :phone,
+        params.require(:account).permit(:address, :city, :email, :name, :phone,
                                         :postal_code, :preferences, :google_analytics,
                                         :google_site_verification, :facebook, :twitter, :google_plus,
                                         :kvk_identifier, :theme, :vat_identifier, :robots_allowed,

data/app/controllers/spina/admin/media_picker_controller.rb

@@ -17,7 +17,7 @@ module Spina
 
       def select
         if params[:multiple]
-          @images = Image.find(params[:image_ids])
+          @images = Image.where(id: params[:image_ids])
         else 
           @image = Image.find(params[:image_id])
         end

data/app/controllers/spina/admin/pages_controller.rb

@@ -53,9 +53,6 @@ module Spina
             format.html { redirect_to spina.edit_admin_page_url(@page, params: {locale: @locale}), flash: {success: t('spina.pages.saved')} }
             format.js
           else
-            50.times do
-              Rails.logger.info @page.errors.inspect
-            end
             format.html do
               @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
               render :edit, layout: 'spina/admin/admin'

data/app/models/spina/page.rb

@@ -38,7 +38,6 @@ module Spina
 
     before_validation :set_materialized_path
     validates :title, presence: true
-    validates :materialized_path, uniqueness: true
 
     translates :title, :description, :materialized_path
     translates :menu_title, :seo_title, default: -> { title }

data/app/views/spina/admin/accounts/style.html.haml

@@ -16,13 +16,6 @@
           .select-dropdown.account-theme{data: {layout_parts: current_theme.layout_parts.map{|layout_part| layout_part[:name]}}}
             - options = options_for_select(::Spina::Theme.all.map { |theme| [theme.name, theme.name, {'data-layout-parts' => theme.layout_parts.map{|layout_part| layout_part[:name] }}] }, current_account.theme)
             = f.select :theme, options
-            
-      .horizontal-form-group
-        .horizontal-form-label
-          = Spina::Account.human_attribute_name(:logo)
-        .horizontal-form-content
-          = image_tag current_account.logo.url if current_account.logo.present?
-          = f.file_field :logo
 
       = f.fields_for :layout_parts do |ff|
         .horizontal-form-group.layout-part{data: {name: ff.object.name}}

data/app/views/spina/admin/media_picker/select.js.erb

@@ -1,5 +1,6 @@
 let hidden_input = $("input[data-hidden-field-id='<%= j params[:hidden_field_id] %>']");
 hidden_input.parents('.media_picker').find('.image').remove();
+hidden_input.val("");
 
 <% if @image.present? %>
   hidden_input.parents('.media_picker').append("<%=j render partial: 'spina/admin/images/image', object: @image, locals: {simple: true} %>");

data/app/views/spina/admin/partables/images/_form.html.haml

@@ -1,14 +1,21 @@
 .horizontal-form-label
   = f.object.title
-.horizontal-form-content
+.horizontal-form-content{data: {controller: "image-form"}}
   = link_to admin_media_picker_path(selected_ids: [f.object.partable_id], hidden_field_id: "media_picker_#{f.object.object_id}"), remote: true, class: 'media_picker clearfix' do
     .placeholder
       %span.button.button-small.button-round
         %i.icon.icon-dots
         =t 'spina.images.choose_image'
 
+      - if f.object.partable.file.attached?
+        %br/
+
+        %span.button.button-small.button-round{data: {action: "click->image-form#remove", target: "image-form.button"}}
+          %i.icon.icon-trash
+          =t 'spina.images.remove_image'
+
     - if f.object.partable.file.attached?
-      .image
+      .image{data: {target: 'image-form.image'}}
         = image_tag variant(f.object.partable.file, resize: "300x300^", crop: "300x300+0+0")
 
-    = f.hidden_field :partable_id, data: {hidden_field_id: "media_picker_#{f.object.object_id}"}
+    = f.hidden_field :partable_id, data: {hidden_field_id: "media_picker_#{f.object.object_id}", target: 'image-form.field'}

data/config/locales/en.yml

@@ -101,6 +101,7 @@ en:
       upload: Upload images
       choose_images: Choose images
       choose_image: Choose image
+      remove_image: Remove image
 
     wysiwyg:
       paragraph: Paragraph

data/config/locales/nl.yml

@@ -47,6 +47,7 @@ nl:
       delete: Verwijderen
       upload: kies een bestand
       choose_image: Kies afbeelding
+      remove_image: Verwijder afbeelding
 
     forgot_password:
       new: Wachtwoord vergeten

data/db/migrate/1_create_spina_tables.rb

@@ -8,7 +8,6 @@ class CreateSpinaTables < ActiveRecord::Migration[4.2]
       t.string   "phone"
       t.string   "email"
       t.text     "preferences"
-      t.string   "logo"
       t.datetime "created_at",                     null: false
       t.datetime "updated_at",                     null: false
       t.boolean  "robots_allowed", default: false

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Bram Jetten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-26 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -304,6 +304,7 @@ files:
 - app/assets/javascripts/spina/admin/account.coffee
 - app/assets/javascripts/spina/admin/application.js
 - app/assets/javascripts/spina/admin/confirm_delete.coffee.erb
+- app/assets/javascripts/spina/admin/controllers/image_form_controller.js
 - app/assets/javascripts/spina/admin/controllers/infinite_scroll_controller.js
 - app/assets/javascripts/spina/admin/dropdown.coffee
 - app/assets/javascripts/spina/admin/forms.coffee