spina 0.7.0 → 0.7.2

data/app/views/spina/admin/photos/index.html.haml

@@ -1,7 +1,11 @@
-.gallery
-  .item
-    = form_for [spina, :admin, @photo], html: {multipart: true} do |f|
-      = f.file_field :file, data: {customfileinput: true}
+.gallery-container
+  .gallery
+    -# .item
+    -#   = form_for [spina, :admin, @photo], html: {multipart: true} do |f|
+    -#     = f.label :file, t('spina.photos.upload_image')
+    -#     = f.file_field :file, data: {customfileinput: true}
 
-  .gallery-prepend-image
-    = render partial: 'spina/admin/photos/photo', collection: @photos
+    .gallery-prepend-image.infinite-scroll
+      = render partial: 'spina/admin/photos/photo', collection: @photos
+
+    .infinite-pagination= link_to_next_page @photos, 'Next', remote: true

data/app/views/spina/admin/photos/index.js.erb

@@ -0,0 +1,5 @@
+// Append new data
+$("<%=j render partial: 'spina/admin/photos/photo', collection: @photos %>").appendTo($(".infinite-scroll"));
+
+// Update pagination link
+$('.infinite-pagination').html("<%= j link_to_next_page @photos, 'Next', remote: true %>").infiniteScroll()

data/app/views/spina/admin/photos/multi_picker_infinite_scroll.js.erb

@@ -0,0 +1,6 @@
+// Append new data
+$("<%=j render partial: 'spina/admin/photos/photo_multi_picker', collection: @photos %>").appendTo($(".infinite-scroll"));
+
+// Update pagination link
+$('.infinite-pagination').html("<%= j link_to_next_page @photos, 'Next', params: {selected_photo_ids: @selected_photos.ids}, remote: true %>").infiniteScroll()
+

data/app/views/spina/admin/photos/photo_collection_select.js.erb

@@ -1,2 +1,3 @@
 var modal = $("<%= j render 'photo_collection_select' %>");
 modal.modal();
+$(document).trigger('page:change');

data/app/views/spina/admin/photos/photo_select.js.erb

@@ -1,2 +1,3 @@
 var modal = $("<%= j render 'photo_select' %>");
 modal.modal();
+$(document).trigger('page:change');

data/app/views/spina/admin/photos/single_picker_infinite_scroll.js.erb

@@ -0,0 +1,6 @@
+// Append new data
+$("<%=j render partial: 'spina/admin/photos/photo_single_picker', collection: @photos %>").appendTo($(".infinite-scroll"));
+
+// Update pagination link
+$('.infinite-pagination').html("<%= j link_to_next_page @photos, 'Next', params: {selected_photo_id: @selected_photo.try(:id)}, remote: true %>").infiniteScroll()
+

data/app/views/spina/admin/photos/wysihtml5_infinite_scroll.js.erb

@@ -0,0 +1,6 @@
+// Append new data
+$("<%=j render partial: 'spina/admin/photos/photo_single_picker', collection: @photos %>").appendTo($(".infinite-scroll"));
+
+// Update pagination link
+$('.infinite-pagination').html("<%= j link_to_next_page @photos, 'Next', remote: true %>").infiniteScroll()
+

data/app/views/spina/admin/photos/wysihtml5_select.js.erb

@@ -1,2 +1,3 @@
 var modal = $("<%= j render 'wysihtml5_select' %>");
 modal.modal();
+$(document).trigger('page:change');

data/app/views/spina/admin/shared/_rich_text_field.html.haml

@@ -1,33 +1,34 @@
-- object_id = form.object.persisted? ? form.object.object_id : 'new_association'
+- object_id = form.object.persisted? ? form.object.object_id : "new_association_#{form.object.object_id}"
 = form.hidden_field field, id: "#{object_id}_input"
 %trix-toolbar.clearfix{ id: "#{object_id}_toolbar", data: { editor_id: "#{object_id}_editor" }}
-  .button-group.pull-left
-    %button.button.button-small{ type: 'button', title: 'Bold', data: { attribute: 'bold', key: 'b' }}
-      .icon.icon-bold
-    %button.button.button-small{ type: 'button', title: 'Italic', data: { attribute: 'italic', key: 'i' }}
-      .icon.icon-italic
-    %button.button.button-small{ type: 'button', title: 'Bullets', data: { attribute: 'bullet' }}
-      .icon.icon-list-ul
-    %button.button.button-small{ type: 'button', title: 'Link', data: { action: 'link', attribute: 'href', key: 'k' }}
-      .icon.icon-link
-    %button.button.button-small.js-trix-photo{ type: 'button', title: 'Photo', data: { action: 'photo', attribute: 'photo' }}
-      .icon.icon-picture-o
+  .button-groups
+    .button-group.pull-left
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Bold', data: { attribute: 'bold', key: 'b' }}
+        .icon.icon-bold
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Italic', data: { attribute: 'italic', key: 'i' }}
+        .icon.icon-italic
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Bullets', data: { attribute: 'bullet' }}
+        .icon.icon-list-ul
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Link', data: { action: 'link', attribute: 'href', key: 'k' }}
+        .icon.icon-link
+      %button.button.button-small.js-trix-photo{ type: 'button', tabindex: -1, title: 'Photo', data: { action: 'photo', attribute: 'photo' }}
+        .icon.icon-picture-o
 
-  .button-group.pull-left
-    %button.button.button-small{ type: 'button', title: 'h1', data: { attribute: 'h1' }} H1
-    %button.button.button-small{ type: 'button', title: 'h2', data: { attribute: 'h2' }} H2
-    %button.button.button-small{ type: 'button', title: 'h3', data: { attribute: 'h3' }} H3
-    %button.button.button-small{ type: 'button', title: 'h4', data: { attribute: 'h4' }} H4
+    .button-group.pull-left
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h1', data: { attribute: 'h1' }} H1
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h2', data: { attribute: 'h2' }} H2
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h3', data: { attribute: 'h3' }} H3
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h4', data: { attribute: 'h4' }} H4
 
-    -# %button.button.button-small{ type: 'button', title: 'Numbers', data: { attribute: 'number' }}
-    -#   .icon.icon-list-ul
+      -# %button.button.button-small{ type: 'button', tabindex: -1, title: 'Numbers', data: { attribute: 'number' }}
+      -#   .icon.icon-list-ul
 
   .dialogs
     .dialog.link_dialog{ data: { attribute: 'href', dialog: 'href'}}
       .link_url_fields
-        %input{ disabled: 'disabled', name: 'href', placeholder: 'Enter a URL…', required: '', type: 'url'}
+        %input{type: 'text', name: 'href', placeholder: 'Enter a URL…', required: true}
         .button-group
-          %button.button{ type: 'button', value: 'Link', data: { method: 'setAttribute' }} Link
-          %button.button{ type: 'button', value: 'Unlink', data: { method: 'removeAttribute' }} Unlink
+          %input.button{type: 'button', tabindex: -1, value: 'Link', data: { method: 'setAttribute'}}
+          %input.button{type: 'button', tabindex: -1, value: 'Unlink', data: { method: 'removeAttribute'}}
 
-%trix-editor.text-input{ input: "#{object_id}_input", toolbar: "#{object_id}_toolbar", id: "#{object_id}_editor" }
+%trix-editor.text-input{input: "#{object_id}_input", toolbar: "#{object_id}_toolbar", id: "#{object_id}_editor"}

data/config/locales/en.yml

@@ -76,7 +76,8 @@ en:
 
     photos:
       delete_confirmation: "Are you sure you want to delete this <strong>image</strong>?"
-      insert_photos: Insert images
+      insert_photos: Choose images
+      choose_images: Choose images
       insert_photo: Insert image
       link: "URL of your image:"
       cannot_be_created: "Image could not be processed:"

data/db/seeds.rb

@@ -1,11 +1,21 @@
 puts "Seeding #{__FILE__} from Spina::Engine"
 
-Spina::User.destroy_all
-Spina::User.create name: "Bram", email: "bram@denkgroot.com", password: "spina", password_confirmation: "spina", admin: true
-
-Spina::Account.destroy_all
-Spina::Account.create name: "Website", theme: "default"
-
-Spina::Page.destroy_all
-
-Spina::Photo.destroy_all
+current_theme = ::Spina.themes.detect{ |theme| theme.name == Spina::Account.first.theme }
+if (page = Spina::Page.find_by(name: 'demo'))
+  page.page_parts.clear
+  parts = current_theme.config.page_parts.map { |page_part| page.page_part(page_part) }
+  parts.each do |part|
+    case part.partable_type
+    when 'Spina::Line' then part.partable.content = 'This is a single line'
+    when 'Spina::Text' then part.partable.content = '<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>'
+    when 'Spina::Photo' then part.partable.remote_file_url = 'https://unsplash.it/300/200?random'
+    when 'Spina::PhotoCollection'
+      5.times { part.partable.photos.build(remote_file_url: 'https://unsplash.it/300/200?random') }
+    # when 'Spina::Structure'
+    #   part.partable.structure_items.build({ name: 'title', title: 'Title', structure_partable_type: 'Spina::Line' })
+    #   part.partable.structure_items.build({ name: 'description', title: 'Description', structure_partable_type:  'Spina::Text' })
+    when 'Spina::Color' then part.partable.content = '#6865b4'
+    end
+  end
+  page.save
+end

data/lib/generators/spina/install_generator.rb

@@ -3,40 +3,42 @@ module Spina
     source_root File.expand_path("../templates", __FILE__)
 
     def create_initializer_file
-      template "spina.rb", "config/initializers/spina.rb"
+      template 'config/initializers/spina.rb'
     end
 
     def create_theme_initializer
-      template "theme.rb", "config/initializers/themes/default.rb"
+      template 'config/initializers/themes/default.rb'
     end
 
     def copy_migrations
-      rake "spina:install:migrations"
+      rake 'spina:install:migrations'
     end
 
     def run_migrations
-      rake "db:migrate"
+      rake 'db:migrate'
     end
 
     def copy_views
-      template "application.html.erb", "app/views/layouts/default/application.html.erb"
-      template "homepage.html.erb", "app/views/default/pages/homepage.html.erb"
-      template "show.html.erb", "app/views/default/pages/show.html.erb"
+      template 'app/assets/stylesheets/default/application.css.sass'
+      template 'app/views/layouts/default/application.html.haml'
+      template 'app/views/default/shared/_navigation.html.haml'
+      template 'app/views/default/pages/homepage.html.haml'
+      template 'app/views/default/pages/show.html.haml'
     end
 
     def create_account
-      name = ask("What would you like to name your website?")
+      name = ask('What would you like to name your website?')
       Account.create name: name, theme: 'default'
     end
 
     def create_user
-      email = ask("Please enter an email address for your first user:")
-      password = ask("Create a temporary password:")
+      email = ask('Please enter an email address for your first user:')
+      password = ask('Create a temporary password:')
       User.create name: 'admin', email: email, password: password, admin: true
     end
 
     def bootstrap_spina
-      rake "spina:bootstrap"
+      rake 'spina:bootstrap'
     end
 
     def add_route
@@ -44,4 +46,4 @@ module Spina
     end
 
   end
-end
+end

data/lib/generators/spina/templates/app/assets/stylesheets/default/application.css.sass

@@ -0,0 +1,66 @@
+// require normalize.css
+
+// $color-primary: #6865b4
+$color-link: #0275d8
+
+html
+  font-size: 16px
+
+body
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif
+  font-size: 1rem
+  line-height: 1.5
+
+h1, h2, h3, h4, h5, h6
+  margin-top: 0
+  margin-bottom: 0.5rem
+
+h1
+  font-size: 2.5rem
+h2
+  font-size: 2rem
+h3
+  font-size: 1.75rem
+h4
+  font-size: 1.5rem
+h5
+  font-size: 1.25rem
+h6
+  font-size: 1rem
+
+p
+  margin-top: 0
+  margin-bottom: 1rem
+
+ul, ol
+  margin-top: 0
+  margin-bottom: 1rem
+
+img
+  vertical-align: middle
+
+a
+  color: $color-link
+  text-decoration: none
+
+  &:hover, &:focus
+    color: darken($color-link, 15%)
+    text-decoration: underline
+
+.container
+  width: 960px
+  margin: 0 auto
+
+.nav
+  padding-left: 0
+  margin-bottom: 2rem
+  list-style: none
+
+.nav-item
+  display: inline-block
+
+.nav-item + .nav-item
+  margin-left: 20px
+
+.nav-item.active > a
+  text-decoration: underline

data/lib/generators/spina/templates/app/views/default/pages/demo.html.haml

@@ -0,0 +1,30 @@
+%h1
+  = @page.title
+
+%h5 Line
+%p
+  = @page.content(:line)
+%h5 Content
+= @page.content(:text).try(:html_safe)
+
+%h5 Photo
+%p
+  = image_tag @page.content(:photo).try(:file_url)
+
+%h5 Photo collection
+- if @page.content(:photo_collection).try(:photos)
+  %ul
+    - @page.content(:photo_collection).photos.each do |photo|
+      %li
+        = image_tag photo.file_url
+
+%h5 Structure
+- if @page.content(:structure).try(:structure_items)
+  %ul
+    - @page.content(:structure).structure_items.each do |item|
+      %li
+        %h6 Title
+        %p
+          = item.content(:title)
+        %h6 Description
+        = item.content(:description).try(:html_safe)

data/lib/generators/spina/templates/app/views/default/pages/homepage.html.haml

@@ -0,0 +1,2 @@
+%h1= @page.title
+= @page.content(:content).try(:html_safe)

data/lib/generators/spina/templates/app/views/default/pages/show.html.haml

@@ -0,0 +1,3 @@
+%h1= @page.title
+= @page.content(:content).try(:html_safe)
+

data/lib/generators/spina/templates/app/views/default/shared/_navigation.html.haml

@@ -0,0 +1,5 @@
+- pages = current_user.present? ? Spina::Page.active : Spina::Page.live
+- menu = Spina::Pages::MenuPresenter.new(pages.in_menu.arrange(order: :position), self, @page)
+- menu.list_class = 'nav'
+- menu.list_item_css = 'nav-item'
+= menu.to_html

data/lib/generators/spina/templates/app/views/layouts/default/application.html.haml

@@ -0,0 +1,11 @@
+!!!
+%html
+  %head
+    %title= current_account.name
+    = stylesheet_link_tag    'default/application', media: 'all', 'data-turbolinks-track' => true
+    = javascript_include_tag 'application', 'data-turbolinks-track' => true
+    = csrf_meta_tags
+  %body
+    .container
+      = render 'default/shared/navigation'
+      = yield

data/lib/generators/spina/templates/{spina.rb → config/initializers/spina.rb}

@@ -14,6 +14,8 @@ Spina::Engine.configure do
   # other files. We use CarrierWave for storage. See
   # https://github.com/denkGroot/Spina/tree/master/app/uploaders/spina
   #
+  config.storage = :file
+  #
   # If you want to use s3 to store uploads (recommended)
   #
   # config.storage = :s3
@@ -24,6 +26,5 @@ Spina::Engine.configure do
   # If you want to store your files localy (not recommended for
   # production, in large part because it's more difficult to ensure
   # that files are backed up in sync with your database):
-  #
-  # config.storage = :file
+
 end

data/lib/generators/spina/templates/config/initializers/themes/default.rb

@@ -0,0 +1,96 @@
+module Spina
+  module DefaultTheme
+    include ::ActiveSupport::Configurable
+
+    config_accessor :title, :page_parts, :view_templates, :layout_parts, :custom_pages, :plugins, :structures
+
+    self.title = 'Default theme'
+
+    self.page_parts = [{
+      name:               'line',
+      title:              'Line',
+      page_partable_type: 'Spina::Line'
+    }, {
+      name:               'text',
+      title:              'Text',
+      page_partable_type: 'Spina::Text'
+    }, {
+      name:               'photo',
+      title:              'Photo',
+      page_partable_type: 'Spina::Photo'
+    }, {
+      name:               'photo_collection',
+      title:              'Photo collection',
+      page_partable_type: 'Spina::PhotoCollection'
+    }, {
+      name:               'structure',
+      title:              'Structure',
+      page_partable_type: 'Spina::Structure'
+    }, {
+      name:               'color',
+      title:              'Color',
+      page_partable_type: 'Spina::Color'
+    }]
+
+    self.structures = {
+      'structure' => [{
+        name:                     'title',
+        title:                    'Title',
+        structure_partable_type:  'Spina::Line'
+      }, {
+        name:                     'description',
+        title:                    'Description',
+        structure_partable_type:  'Spina::Text'
+      }]
+    }
+
+    self.layout_parts = [{
+      name:               'line',
+      title:              'Line',
+      layout_partable_type: 'Spina::Line'
+    }, {
+      name:               'color',
+      title:              'Color',
+      layout_partable_type: 'Spina::Color'
+    }]
+
+    self.view_templates = {
+      'homepage' => {
+        title:      'Homepage',
+        page_parts: ['text']
+      },
+      'show' => {
+        title:        'Default',
+        description:  'A simple page',
+        usage:        'Use for your content',
+        page_parts:   ['text']
+      },
+      'demo' => {
+        title:        'Demo',
+        description:  'Example page',
+        usage:        'Shows the usage of several page parts',
+        page_parts:   ['line', 'text', 'photo', 'photo_collection', 'structure', 'color']
+      }
+    }
+
+    self.custom_pages = [{
+      name:           'homepage',
+      title:          'Homepage',
+      deletable:      false,
+      view_template:  'homepage'
+    }, {
+      name:           'demo',
+      title:          'Demo',
+      deletable:      true,
+      view_template:  'demo'
+    }]
+
+    self.plugins = []
+
+  end
+end
+
+theme = Spina::Theme.new
+theme.name = 'default'
+theme.config = Spina::DefaultTheme.config
+Spina.register_theme(theme)