spina 1.2.0 → 2.0.2

data/app/models/spina/parts/image.rb

@@ -0,0 +1,39 @@
+module Spina
+  module Parts
+    class Image < Base
+      attr_json :image_id, :integer, default: nil
+      attr_json :signed_blob_id, :string, default: nil
+      attr_json :alt, :string, default: ""
+      attr_json :filename, :string, default: ""
+
+      def to_s
+        alt.presence || filename.presence || Spina::Image.model_name.human
+      end
+
+      def content
+        self
+      end
+
+      def svg?
+        filename =~ /\.svg\z/
+      end
+
+      def spina_image
+        Spina::Image.find_by(id: image_id)
+      end
+
+      def present?
+        signed_blob_id.present?
+      end
+      
+      def signed_id
+        signed_blob_id
+      end
+      
+      def variant(options)
+        Spina::Parts::ImageVariant.new(self, options)
+      end
+      
+    end
+  end
+end

data/app/models/spina/parts/image_collection.rb

@@ -0,0 +1,23 @@
+module Spina
+  module Parts
+    class ImageCollection < Base
+      include AttrJson::NestedAttributes
+      
+      attr_json :images, Image.to_type, array: true
+      attr_json_accepts_nested_attributes_for :images
+
+      def to_s
+        Spina::Parts::ImageCollection.model_name.human
+      end
+
+      def content
+        (images || [])
+      end
+
+      def image_ids
+        content.map(&:image_id)
+      end
+
+    end
+  end
+end

data/app/models/spina/parts/image_variant.rb

@@ -0,0 +1,19 @@
+module Spina
+  module Parts
+    class ImageVariant
+      attr_reader :blob
+      
+      def initialize(image, options)
+        @blob = image
+        @options = options
+      end
+      
+      def variation
+        OpenStruct.new({
+          key: ActiveStorage::Variation.encode(@options)
+        })
+      end 
+
+    end
+  end
+end

data/app/models/spina/parts/line.rb

@@ -0,0 +1,7 @@
+module Spina
+  module Parts
+    class Line < Base
+      attr_json :content, :string, default: ""
+    end
+  end
+end

data/app/models/spina/parts/multi_line.rb

@@ -0,0 +1,7 @@
+module Spina
+  module Parts
+    class MultiLine < Base
+      attr_json :content, :string, default: ""
+    end
+  end
+end

data/app/models/spina/parts/option.rb

@@ -0,0 +1,13 @@
+module Spina
+  module Parts
+    class Option < Base
+      attr_json :value, :string, default: ""
+
+      attr_accessor :options
+
+      def content
+        value
+      end
+    end
+  end
+end

data/app/models/spina/parts/repeater.rb

@@ -0,0 +1,10 @@
+module Spina
+  module Parts
+    class Repeater < Base
+      include AttrJson::NestedAttributes
+
+      attr_json :content, RepeaterContent.to_type, array: true
+      attr_json_accepts_nested_attributes_for :content
+    end
+  end
+end

data/app/models/spina/parts/repeater_content.rb

@@ -0,0 +1,15 @@
+module Spina
+  module Parts
+    class RepeaterContent < Base
+      include Partable
+      include AttrJson::NestedAttributes
+
+      attr_json :parts, AttrJson::Type::SpinaPartsModel.new, array: true
+      attr_json_accepts_nested_attributes_for :parts
+
+      def find_part(name)
+        (parts || []).find{|part| part.name.to_s == name.to_s}
+      end
+    end
+  end
+end

data/app/models/spina/parts/text.rb

@@ -0,0 +1,7 @@
+module Spina
+  module Parts
+    class Text < Base
+      attr_json :content, :string, default: ""
+    end
+  end
+end

data/app/models/spina/resource.rb

@@ -1,7 +1,11 @@
 module Spina
   class Resource < ApplicationRecord
+    extend Mobility
+
     has_many :pages, dependent: :restrict_with_exception
 
+    translates :slug, backend: :jsonb
+
     def pages
       case order_by
       when "title"

data/app/presenters/spina/content_presenter.rb

@@ -0,0 +1,51 @@
+module Spina
+  class ContentPresenter
+    attr_reader :view_context, :container
+
+    def initialize(view_context, container)
+      @view_context = view_context || Spina::Current.page&.view_context
+      @container = container
+    end
+
+    def text(name)
+      part = find_part(name)
+      part&.content.to_s
+    end
+
+    def html(name)
+      html = find_part(name)&.content
+      ActiveSupport::SafeBuffer.new(html.to_s)
+    end
+
+    def image_tag(image, variant_options = {}, options = {})
+      image = find_part(image) unless image.is_a? Spina::Parts::Image
+      image_tag_options = {alt: image&.alt}
+      view_context.image_tag main_app_image_url(image, variant_options), options.merge(image_tag_options) if image.present?
+    end
+
+    def image_url(image, variant_options = {})
+      image = find_part(image) unless image.is_a? Spina::Parts::Image
+      main_app_image_url(image, variant_options) if image.present?
+    end
+
+    def attachment_url(attachment)
+      attachment = find_part(attachment) unless attachment.is_a? Spina::Parts::Attachment
+      view_context.main_app.url_for(attachment) if attachment.present?
+    end
+
+    private
+
+      def main_app_image_url(image, variant_options = {})
+        # SVG's can't have variants, 
+        # Render rails_service_blob_url directly instead
+        return view_context.main_app.url_for(image) if image.svg?
+        
+        view_context.main_app.url_for(image.variant(variant_options))
+      end
+
+      def find_part(name)
+        container.find_part(name)
+      end
+
+  end
+end

data/app/presenters/spina/menu_presenter.rb

@@ -50,6 +50,7 @@ module Spina
       end
 
       def render_item(item)
+        return nil unless item.materialized_path
         children = scoped_collection(item.children)
 
         content_tag(list_item_tag, class: list_item_css, data: {page_id: item.page_id, draft: (true if item.draft?) }) do
@@ -71,4 +72,4 @@ module Spina
       end
 
   end
-end
+end

data/app/views/layouts/spina/admin/admin.html.haml

@@ -6,14 +6,13 @@
     = csrf_meta_tags
     %meta{name: 'turbolinks-cache-control', content: 'no-preview'}
 
-    %title Spina
+    %link{rel: 'icon', href: image_url("spina/favicon.png")}
+
+    %title Spina CMS
 
     / Stylesheet
     = stylesheet_link_tag 'spina/admin/application', data: {turbolinks_track: true}
 
-    /[if lt IE 9]
-      = javascript_include_tag '//html5shiv.googlecode.com/svn/trunk/html5.js', data: {turbolinks_track: true}
-
     / JavaScript
     = javascript_include_tag 'spina/admin/application', data: {turbolinks_track: true}
     = yield(:plugin_stylesheets)
@@ -33,6 +32,3 @@
       = render 'spina/admin/shared/notifications'
 
       = content_for?(:application) ? yield(:application) : yield
-
-      = link_to 'http://www.spinacms.com', class: 'spina-logo', target: :blank do
-        = image_tag('spina/spina.svg', width: 32, height: 24)

data/app/views/layouts/spina/admin/pages.html.haml

@@ -9,15 +9,16 @@
 - content_for :application do
   %header#header
     #header_actions
-      = link_to '#pages_list', class: 'button sort-switch', data: {change_order: t('spina.pages.change_order'), done_changing_order: t('spina.pages.done_changing_order')} do
-        = icon('random')
-        = t('spina.pages.change_order')
+      = link_to '#pages_list', class: 'button button-default sort-switch', data: {change_order: t('spina.pages.change_order'), done_changing_order: t('spina.pages.done_changing_order')} do
+        .button-content
+          = icon('random')
+          = t('spina.pages.change_order')
 
       = yield(:header_actions) if content_for?(:header_actions)
 
     .breadcrumbs
       = render_breadcrumbs separator: '<div class="divider"></div>'
-      = link_to '/', class: 'button button-small button-hollow', target: :blank do
+      = link_to '/', class: 'button button-small button-default', target: :blank do
         %i.icon.icon-export{style: "margin: 0"}
 
     %nav#secondary.tabs

data/app/views/layouts/spina/login.html.haml

@@ -10,9 +10,6 @@
     / Stylesheet
     = stylesheet_link_tag "spina/admin/application"
 
-    /[if lt IE 9]
-      = javascript_include_tag "//html5shiv.googlecode.com/svn/trunk/html5.js"
-
     / JavaScript
     = javascript_include_tag "spina/admin/application"
 

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

@@ -7,42 +7,48 @@
         = icon('check')
         = t('spina.preferences.account_save')
 
-  .well
+  %div{style: "margin-top: 40px"}
     .horizontal-form
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:name)
         .horizontal-form-content
-          = f.text_field :name, placeholder: Spina::Account.human_attribute_name(:name)
+          .page-form-control
+            = f.text_field :name, placeholder: Spina::Account.human_attribute_name(:name)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:address)
         .horizontal-form-content
-          = f.text_field :address, placeholder: Spina::Account.human_attribute_name(:address)
+          .page-form-control
+            = f.text_field :address, placeholder: Spina::Account.human_attribute_name(:address)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:postal_code)
         .horizontal-form-content
-          = f.text_field :postal_code, placeholder: Spina::Account.human_attribute_name(:postal_code)
+          .page-form-control
+            = f.text_field :postal_code, placeholder: Spina::Account.human_attribute_name(:postal_code)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:city)
         .horizontal-form-content
-          = f.text_field :city, placeholder: Spina::Account.human_attribute_name(:city)
+          .page-form-control
+            = f.text_field :city, placeholder: Spina::Account.human_attribute_name(:city)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:phone)
         .horizontal-form-content
-          = f.text_field :phone, placeholder: Spina::Account.human_attribute_name(:phone)
+          .page-form-control
+            = f.text_field :phone, placeholder: Spina::Account.human_attribute_name(:phone)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:email)
         .horizontal-form-content
-          = f.text_field :email, placeholder: Spina::Account.human_attribute_name(:email)
+          .page-form-control
+            = f.text_field :email, placeholder: Spina::Account.human_attribute_name(:email)
 
   

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

@@ -7,7 +7,7 @@
         = icon('check')
         = t('spina.preferences.analytics_save')
 
-  .well
+  %div{style: "margin-top: 40px"}
     .horizontal-form
       .horizontal-form-group
         .horizontal-form-label
@@ -18,9 +18,11 @@
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:google_analytics)
         .horizontal-form-content
-          = f.text_field :google_analytics, placeholder: Spina::Account.human_attribute_name(:google_analytics)
+          .page-form-control
+            = f.text_field :google_analytics, placeholder: Spina::Account.human_attribute_name(:google_analytics)
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:google_site_verification)
         .horizontal-form-content
-          = f.text_field :google_site_verification, placeholder: Spina::Account.human_attribute_name(:google_site_verification)
+          .page-form-control
+            = f.text_field :google_site_verification, placeholder: Spina::Account.human_attribute_name(:google_site_verification)

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

@@ -7,40 +7,46 @@
         = icon('check')
         = t('spina.preferences.social_media_save')
 
-  .well
+  %div{style: "margin-top: 40px"}
     .horizontal-form
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:facebook)
         .horizontal-form-content
-          = f.text_field :facebook, placeholder: Spina::Account.human_attribute_name(:facebook)
+          .page-form-control
+            = f.text_field :facebook, placeholder: Spina::Account.human_attribute_name(:facebook)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:twitter)
         .horizontal-form-content
-          = f.text_field :twitter, placeholder: Spina::Account.human_attribute_name(:twitter)
+          .page-form-control
+            = f.text_field :twitter, placeholder: Spina::Account.human_attribute_name(:twitter)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:instagram)
         .horizontal-form-content
-          = f.text_field :instagram, placeholder: Spina::Account.human_attribute_name(:instagram)
+          .page-form-control
+            = f.text_field :instagram, placeholder: Spina::Account.human_attribute_name(:instagram)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:youtube)
         .horizontal-form-content
-          = f.text_field :youtube, placeholder: Spina::Account.human_attribute_name(:youtube)
+          .page-form-control
+            = f.text_field :youtube, placeholder: Spina::Account.human_attribute_name(:youtube)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:linkedin)
         .horizontal-form-content
-          = f.text_field :linkedin, placeholder: Spina::Account.human_attribute_name(:linkedin)
+          .page-form-control
+            = f.text_field :linkedin, placeholder: Spina::Account.human_attribute_name(:linkedin)
 
       .horizontal-form-group
         .horizontal-form-label
           = Spina::Account.human_attribute_name(:google_plus)
         .horizontal-form-content
-          = f.text_field :google_plus, placeholder: Spina::Account.human_attribute_name(:google_plus)
+          .page-form-control
+            = f.text_field :google_plus, placeholder: Spina::Account.human_attribute_name(:google_plus)

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

@@ -1,30 +1,35 @@
 = form_for [spina, :admin, current_account], url: spina.admin_account_path do |f|
   %header#header
-    = render partial: 'spina/admin/shared/breadcrumbs'
+    .breadcrumbs
+      = render_breadcrumbs separator: '<div class="divider"></div>'
+      %span{style: 'margin-left: 10px'}
+        - if Spina.config.locales.size > 1
+          %div{style: "display: inline-block", data: {dropdown: true}}
+            = link_to '#', class: 'button button-default button-small', style: 'margin-left: 0; margin-right: 0', data: {trigger: 'dropdown', target: '#locales'} do
+              = icon('comment')
+              =t "spina.languages.#{@locale}"
+              %i.icon.icon-chevron-down{style: 'font-size: 9px; margin-right: 0'}
+
+            %ul#locales
+              - Spina.config.locales.each do |locale|
+                %li
+                  = link_to t("spina.languages.#{locale}"), "?locale=#{locale}", style: ('font-weight: 600' if @locale.to_s == locale.to_s).to_s
 
     #header_actions
       %button.button.button-primary{type: 'submit', data: {icon: 'o'}}
         = icon('check')
         = t('spina.preferences.style_save')
 
-  .well
-    .horizontal-form
-      .horizontal-form-group
-        .horizontal-form-label
-          = Spina::Account.human_attribute_name(:theme)
-        .horizontal-form-content
-          .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
-
-      = f.fields_for :layout_parts do |ff|
-        .horizontal-form-group.layout-part{data: {name: ff.object.name}}
-          .horizontal-form-label
-            = ff.object.title
-          .horizontal-form-content
-            = ff.hidden_field :id
-            = ff.hidden_field :title
-            = ff.hidden_field :layout_partable_type
-            = ff.hidden_field :name
+  .page-form
+    .page-form-group
+      .page-form-label= Spina::Account.human_attribute_name(:theme)
+      .page-form-control
+        .select-dropdown= f.select :theme, Spina::Theme.all.map(&:name)
 
-            = render "spina/admin/layout_partables/#{ partable_type_partial_namespace(ff.object.layout_partable_type) }/form", f: ff
+    = f.fields_for "#{@locale}_content".to_sym, build_parts(f.object, current_theme.layout_parts) do |ff|
+      = ff.hidden_field :type, value: ff.object.class
+      = ff.hidden_field :name
+      = ff.hidden_field :title
+      
+      .page-form-group.page-part{data: {name: ff.object.name}}
+        = render "spina/admin/parts/#{parts_partial_namespace(ff.object.class.to_s)}/form", f: ff