spina 0.11.1 → 0.12.0

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

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

data/app/views/spina/admin/sessions/new.html.haml

@@ -9,4 +9,6 @@
     = text_field_tag :email, params[:email], placeholder: Spina::User.human_attribute_name(:email), autofocus: true, class: "animated fadeInDown"
     = password_field_tag :password, nil, placeholder: Spina::User.human_attribute_name(:password), class: "animated fadeInDown"
 
-  = button_tag t('spina.login'), class: 'button button-primary animated fadeInDown', data: {icon: '3'}
+  = button_tag t('spina.login'), class: 'button button-primary animated fadeInDown'
+
+  .login-extra-links.animated.fadeInDown= link_to t('spina.forgot_password.new'), spina.new_admin_password_reset_path, class: 'button button-hollow button-block'

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

@@ -36,7 +36,7 @@
           = link_to t('spina.preferences.account'), spina.edit_admin_account_path
         %li{class: ('active' if params[:action] == 'style')}
           = link_to t('spina.preferences.style'), spina.style_admin_account_path
-        - if can? :manage, Spina::User
+        - if current_spina_user.admin?
           %li{class: ('active' if %w[users].include? controller_name)}
             = link_to t('spina.preferences.users'), spina.admin_users_path
         %li{class: ('active' if params[:action] == 'social')}

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

@@ -1,4 +1,5 @@
-- object_id = f.object.persisted? ? f.object.object_id : "new_association_#{f.object.object_id}"
+
+- object_id = (f.object.persisted? ? f.object.object_id : "new_association_#{f.object.object_id}").to_s + "_#{field}"
 = f.hidden_field field, id: "#{object_id}_input"
 
 %trix-toolbar.clearfix{ id: "#{object_id}_toolbar", data: { trix_editor_id: "#{object_id}_editor" }}

data/app/views/spina/admin/structure_items/_fields.html.haml

@@ -1,8 +1,8 @@
-.structure-form-pane{class: ('active' if f.options[:child_index] == 0), id: "structure_form_pane_#{f.object.id}"}
+.structure-form-pane{class: ('active' if f.options[:child_index] == 0), id: "structure_form_pane_#{f.object.object_id}"}
   / Structure parts
   = f.fields_for :structure_parts, build_structure_parts(f.object.structure.try(:page_part).try(:name), f.object) do |ff|
     .structure-form-part
-      = render "spina/admin/structure_partables/#{ partable_type_partial_namespace(ff.object.structure_partable_type) }/form", f: ff
+      = render "spina/admin/structure_partables/#{partable_type_partial_namespace(ff.object.structure_partable_type)}/form", f: ff
 
     = ff.hidden_field :id
     = ff.hidden_field :title
@@ -10,6 +10,6 @@
     = ff.hidden_field :name
 
   / Hidden field
-  = f.hidden_field :position, placeholder: "Position", class: "structure_form_pane_#{f.object.id}_position"
+  = f.hidden_field :position, placeholder: "Position", class: "structure_form_pane_#{f.object.object_id}_position"
   = f.hidden_field :_destroy
   = link_to t('spina.delete'), '#', class: 'remove_structure_item_fields button button-mini button-link pull-right'

data/app/views/spina/admin/structure_partables/lines/_form.html.haml

@@ -1,2 +1,5 @@
-= f.fields_for :structure_partable do |ff|
-  = ff.text_field :content, placeholder: f.object.title
+.horizontal-form-label
+  = f.object.title
+.horizontal-form-content
+  = f.fields_for :structure_partable do |ff|
+    = ff.text_field :content, placeholder: f.object.title

data/app/views/spina/admin/structure_partables/options/_form.html.haml

@@ -0,0 +1,7 @@
+.horizontal-form-label
+  = f.object.title
+.horizontal-form-content
+  = f.fields_for :structure_partable, f.object.structure_partable do |ff|
+    .select-dropdown
+      = ff.label :value, f.object.title
+      = ff.select :value, f.object.options[:values].map{|o| [option_label(f.object, o), o]}, prompt: true

data/app/views/spina/admin/structure_partables/photo_collections/_form.html.haml

@@ -3,12 +3,15 @@
 .horizontal-form-content
   = f.fields_for :structure_partable, f.object.structure_partable do |ff|
     = link_to spina.photo_collection_select_admin_photos_path(ff.object_name, selected_photo_ids: ff.object.photo_ids), remote: true, class: 'media_picker clearfix' do
-      .placeholder.pull-right
-        %span.button.button-small.button-round{data: {icon: 'U'}}=t 'spina.pages.photos_picker'
-    .photo-collection
-      - if ff.object.photos.sorted_by_photo_collection.any?
-        = render 'spina/admin/photos/photo_collection', photos: ff.object.photos.sorted_by_photo_collection
-      - elsif ff.object.photos.any?
-        = render 'spina/admin/photos/photo_collection', photos: ff.object.photos
-    = ff.hidden_field :photo_tokens, value: ff.object.photo_ids.join(",")
-    = ff.hidden_field :photo_positions, value: ff.object.photos.sorted_by_photo_collection.pluck(:photo_id).join(","), class: 'photo-positions'
+      .placeholder
+        %span.button.button-small.button-round
+          %i.icon.icon-dots
+          =t 'spina.pages.photos_picker'
+
+      .photo-collection
+        - if ff.object.photos.sorted_by_photo_collection.any?
+          = render 'spina/admin/photos/photo_collection', photos: ff.object.photos.sorted_by_photo_collection
+        - elsif ff.object.photos.any?
+          = render 'spina/admin/photos/photo_collection', photos: ff.object.photos
+      = ff.hidden_field :photo_tokens, value: ff.object.photo_ids.join(",")
+      = ff.hidden_field :photo_positions, value: ff.object.photos.sorted_by_photo_collection.pluck(:photo_id).join(","), class: 'photo-positions'

data/app/views/spina/admin/structure_partables/photos/_form.html.haml

@@ -1,8 +1,11 @@
-= link_to spina.photo_select_admin_photos_path(f.object_name, selected_photo_id: f.object.structure_partable.try(:id)), remote: true, class: "media_picker" do
-  .placeholder
-    %span.button.button-small.button-round{data: {icon: 'U'}}=t 'spina.pages.photo_picker'
-  - if f.object.structure_partable && f.object.structure_partable.file.present?
-    .image
-      = image_tag f.object.structure_partable.file.thumb
+.horizontal-form-label
+  = f.object.title
+.horizontal-form-content
+  = link_to spina.photo_select_admin_photos_path(f.object_name, selected_photo_id: f.object.structure_partable.try(:id)), remote: true, class: "media_picker" do
+    .placeholder
+      %span.button.button-small.button-round{data: {icon: 'U'}}=t 'spina.pages.photo_picker'
+    - if f.object.structure_partable && f.object.structure_partable.file.present?
+      .image
+        = image_tag f.object.structure_partable.file.thumb
 
-  = f.hidden_field :structure_partable_id
+    = f.hidden_field :structure_partable_id

data/app/views/spina/admin/structure_partables/texts/_form.html.haml

@@ -1,2 +1,5 @@
-= f.fields_for :structure_partable, f.object.structure_partable do |ff|
-  = render 'spina/admin/shared/rich_text_field', f: ff, field: :content
+.horizontal-form-label
+  = f.object.title
+.horizontal-form-content
+  = f.fields_for :structure_partable, f.object.structure_partable do |ff|
+    = render 'spina/admin/shared/rich_text_field', f: ff, field: :content

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

@@ -54,5 +54,5 @@
         .horizontal-form-content
           = f.check_box :admin, data: {switch: 'true'}
 
-  - unless @user.new_record? || @user == current_user
+  - unless @user.new_record? || @user == current_spina_user
     .pull-right= link_to t('spina.permanently_delete'), spina.admin_user_path(@user), method: :delete, data: {confirm: t('spina.users.delete_confirmation', user: @user)}, class: 'button button-link button-danger'

data/app/views/spina/shared/_admin_bar.html.haml

@@ -1,4 +1,4 @@
-- if current_user.present?
+- if current_spina_user.present?
   #admin_bar
     = link_to t('spina.edit_website'), spina.admin_root_url, data: {icon: 'q', :"no-turbolink" => true}, class: 'button button-hollow button-round button-small'
     = link_to t('spina.logout'), spina.admin_logout_path, data: {icon: 'h'}, class: 'button button-hollow button-round button-small'

data/app/views/spina/shared/_navigation.html.haml

@@ -1,3 +1,3 @@
-- pages = current_user.present? ? Spina::Page.active : Spina::Page.live
+- pages = current_spina_user.present? ? Spina::Page.active : Spina::Page.live
 - menu = Spina::Pages::MenuPresenter.new(pages.in_menu.arrange(order: :position), self, @page)
 = menu.to_html

data/app/views/spina/user_mailer/forgot_password.html.erb

@@ -0,0 +1 @@
+You forgot your password dummy. Here's a link to setup a new one: <%= link_to 'Reset password', spina.edit_admin_password_reset_url(@user.password_reset_token) %>. It expires in 2 hours.

data/app/views/spina/user_mailer/forgot_password.txt.erb

@@ -0,0 +1 @@
+You forgot your password dummy. Here's a link to setup a new one: <%= spina.edit_admin_password_reset_url(@user.password_reset_token) %>. It expires in 2 hours.

data/config/locales/en.yml

@@ -16,6 +16,15 @@ en:
     logout: Logout
     main_menu: Main menu
 
+    forgot_password:
+      new: Forgot password
+      request: Request new password
+      unknown_user: This user does not exist
+      save: Save new password
+      success: You can use your new password
+      mail_subject: Reset your password
+      expired: Your password reset token has expired
+
     modal:
       agree: "Yes, I'm sure"
       cancel: "No, cancel"
@@ -57,6 +66,7 @@ en:
       rebuild_materialized_path: Rebuild materialized path
       materialize_path_confirmation: "Are you sure you want to rebuild the path for this page?"
       saving: Saving...
+      saved: Page saved
 
     users:
       new: New user

data/config/locales/nl.yml

@@ -2,6 +2,8 @@ nl:
   languages:
     nl: Nederlands
     en: Engels
+    de: Duits
+    fr: Frans
   spina:
     cancel: Annuleren
     close: Sluiten

data/config/routes.rb

@@ -19,6 +19,9 @@ Spina::Engine.routes.draw do
     get "login" => "sessions#new"
     get "logout" => "sessions#destroy"
 
+    # Passwords
+    resources :password_resets
+
     # Media library
     get 'media_library' => 'photos#media_library', as: "media_library"
 
@@ -30,13 +33,6 @@ Spina::Engine.routes.draw do
       post :sort, on: :member
     end
 
-    resources :page_parts do
-      collection do
-        get 'wysihtml5_link/:object_id' => 'page_parts#wysihtml5_link', as: :wysihtml5_link
-        post 'wysihtml5_link/:object_id' => 'page_parts#insert_wysihtml5_link'
-      end
-    end
-
     resources :attachments do
       collection do
         get 'select/:page_part_id' => 'attachments#select', as: :select
@@ -48,8 +44,8 @@ Spina::Engine.routes.draw do
 
     resources :photos do
       collection do
-        get 'wysihtml5_select/:object_id' => 'photos#wysihtml5_select', as: :wysihtml5_select
-        post 'wysihtml5_insert/:object_id' => 'photos#wysihtml5_insert', as: :wysihtml5_insert
+        get 'trix_select/:object_id' => 'photos#trix_select', as: :trix_select   
+        post 'trix_insert/:object_id' => 'photos#trix_insert', as: :trix_insert
         get 'photo_select/:page_part_id' => 'photos#photo_select', as: :photo_select
         get 'photo_collection_select/:page_part_id' => 'photos#photo_collection_select', as: :photo_collection_select
         post 'insert_photo/:page_part_id' => 'photos#insert_photo', as: :insert_photo

data/db/migrate/1_create_spina_tables.rb

@@ -1,4 +1,4 @@
-class CreateSpinaTables < ActiveRecord::Migration
+class CreateSpinaTables < ActiveRecord::Migration[4.2]
   def change
     create_table "spina_accounts", force: :cascade do |t|
       t.string   "name"
@@ -32,12 +32,6 @@ class CreateSpinaTables < ActiveRecord::Migration
       t.datetime "updated_at", null: false
     end
 
-    create_table "spina_colors", force: :cascade do |t|
-      t.text     "content"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-
     create_table "spina_layout_parts", force: :cascade do |t|
       t.string   "title"
       t.string   "name"
@@ -49,6 +43,7 @@ class CreateSpinaTables < ActiveRecord::Migration
     end
 
     create_table "spina_lines", force: :cascade do |t|
+      t.string   "content"
       t.datetime "created_at"
       t.datetime "updated_at"
     end
@@ -64,12 +59,16 @@ class CreateSpinaTables < ActiveRecord::Migration
     end
 
     create_table "spina_pages", force: :cascade do |t|
+      t.string   "title"
+      t.string   "menu_title"
+      t.string   "description"
       t.boolean  "show_in_menu",        default: true
       t.string   "slug"
       t.boolean  "deletable",           default: true
       t.datetime "created_at",                          null: false
       t.datetime "updated_at",                          null: false
       t.string   "name"
+      t.string   "seo_title"
       t.boolean  "skip_to_first_child", default: false
       t.string   "view_template"
       t.string   "layout_template"
@@ -77,6 +76,7 @@ class CreateSpinaTables < ActiveRecord::Migration
       t.string   "link_url"
       t.string   "ancestry"
       t.integer  "position"
+      t.string   "materialized_path"
       t.boolean  "active",              default: true
     end
 
@@ -125,6 +125,7 @@ class CreateSpinaTables < ActiveRecord::Migration
     end
 
     create_table "spina_texts", force: :cascade do |t|
+      t.text     "content"
       t.datetime "created_at"
       t.datetime "updated_at"
     end

data/db/migrate/2_create_spina_translation_tables.rb

@@ -1,32 +1,13 @@
-class CreateSpinaTranslationTables < ActiveRecord::Migration
+class CreateSpinaTranslationTables < ActiveRecord::Migration[4.2]
   def up
-    Spina::Page.create_translation_table!({
-      title: :string,
-      menu_title: :string,
-      description: :string,
-      seo_title: :string,
-      materialized_path: :string
-    }, {
-      migrate_data: true,
-      remove_source_columns: true
-    })
-    Spina::Text.create_translation_table!({
-      content: :text
-    }, {
-      migrate_data: true,
-      remove_source_columns: true
-    })
-    Spina::Line.create_translation_table!({
-      content: :string
-    }, {
-      migrate_data: true,
-      remove_source_columns: true
-    })
+    Spina::Page.create_translation_table! title: :string, menu_title: :string, description: :string, seo_title: :string, materialized_path: :string
+    Spina::Text.create_translation_table! content: :text
+    Spina::Line.create_translation_table! content: :string
   end
 
   def down
-    Spina::Page.drop_translation_table! migrate_data: true
-    Spina::Text.drop_translation_table! migrate_data: true
-    Spina::Line.drop_translation_table! migrate_data: true
+    Spina::Page.drop_translation_table!
+    Spina::Text.drop_translation_table!
+    Spina::Line.drop_translation_table!
   end
 end

data/db/migrate/3_create_spina_navigations.rb

@@ -1,4 +1,4 @@
-class CreateSpinaNavigations < ActiveRecord::Migration
+class CreateSpinaNavigations < ActiveRecord::Migration[4.2]
   def change
     create_table "spina_navigations", force: :cascade do |t|
       t.string "name", null: false

data/db/migrate/4_add_password_reset_token_to_spina_users.rb

@@ -0,0 +1,6 @@
+class AddPasswordResetTokenToSpinaUsers < ActiveRecord::Migration[5.0]
+  def change
+    add_column :spina_users, :password_reset_token, :string
+    add_column :spina_users, :password_reset_sent_at, :datetime
+  end
+end

data/db/migrate/5_remove_translated_columns.rb

@@ -0,0 +1,11 @@
+class RemoveTranslatedColumns < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :spina_lines, :content
+    remove_column :spina_texts, :content
+    remove_column :spina_pages, :title
+    remove_column :spina_pages, :menu_title
+    remove_column :spina_pages, :description
+    remove_column :spina_pages, :seo_title
+    remove_column :spina_pages, :materialized_path
+  end
+end

data/db/migrate/6_create_spina_options.rb

@@ -0,0 +1,8 @@
+class CreateSpinaOptions < ActiveRecord::Migration[5.0]
+  def change
+    create_table :spina_options do |t|
+      t.string :value
+      t.timestamps
+    end
+  end
+end

data/lib/generators/spina/install_generator.rb

@@ -72,28 +72,6 @@ module Spina
       rake 'spina:bootstrap'
     end
 
-    def seed_demo_content
-      theme_name = Account.first.theme
-      if theme_name == 'demo' && !no?('Seed example content? [Yn]')
-        current_theme = ::Spina::Theme.find_by_name(theme_name)
-        if (page = Spina::Page.find_by(name: 'demo'))
-          page.page_parts.clear
-          parts = current_theme.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::Color' then part.partable.content = '#6865b4'
-            end
-          end
-          page.save
-        end
-      end
-    end
-
     def feedback
       puts
       puts '    Your Spina site has been succesfully installed! '

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

@@ -1,4 +1,4 @@
-- pages = current_user.present? ? Spina::Page.active : Spina::Page.live
+- pages = current_spina_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'

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

@@ -1,4 +1,4 @@
-- pages = current_user.present? ? Spina::Page.active : Spina::Page.live
+- pages = current_spina_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'

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

@@ -28,4 +28,13 @@
     view_template:  'homepage'
   }]
 
+  theme.navigations = [{
+    name: 'mobile',
+    label: 'Mobile'  
+  }, {
+    name: 'main',
+    label: 'Main navigation',
+    auto_add_pages: true
+  }]
+
 end

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

@@ -31,10 +31,6 @@
     name:           'structure',
     title:          'Structure',
     partable_type:  'Spina::Structure'
-  }, {
-    name:           'color',
-    title:          'Color',
-    partable_type:  'Spina::Color'
   }]
 
   theme.structures = [{
@@ -54,10 +50,6 @@
     name:           'line',
     title:          'Line',
     partable_type:  'Spina::Line'
-  }, {
-    name:           'color',
-    title:          'Color',
-    partable_type:  'Spina::Color'
   }]
 
   theme.view_templates = [{
@@ -73,7 +65,7 @@
     name: 'demo',
     title: 'Demo',
     description: 'Contains examples of every page part',
-    page_parts: ['line', 'text', 'photo', 'photo_collection', 'attachment', 'attachment_collection', 'structure', 'color']
+    page_parts: ['line', 'text', 'photo', 'photo_collection', 'attachment', 'attachment_collection', 'structure']
   }]
 
   theme.custom_pages = [{

data/lib/spina/engine.rb

@@ -1,14 +1,11 @@
 require 'haml-rails'
 require 'sass-rails'
-require 'bourbon'
-require 'neat'
 require 'coffee-rails'
 require 'jquery-rails'
 require 'jquery-fileupload-rails'
 require 'turbolinks'
 require 'carrierwave'
 require 'mini_magick'
-require 'cancancan'
 require 'ancestry'
 require 'breadcrumbs_on_rails'
 require 'kaminari'
@@ -24,9 +21,13 @@ module Spina
     config.assets.paths << config.root.join('vendor', 'assets')
 
     config.to_prepare do
+      # Require decorators from main application
       [Rails.root].flatten.map { |p| Dir[p.join('app', 'decorators', '**', '*_decorator.rb')]}.flatten.uniq.each do |decorator|
         Rails.configuration.cache_classes ? require(decorator) : load(decorator)
       end
+
+      # Load helpers from main application
+      Spina::ApplicationController.helper Rails.application.helpers
     end
 
   end

data/lib/spina/theme.rb

@@ -1,7 +1,7 @@
 module Spina
   class Theme
 
-    attr_accessor :name, :title, :page_parts, :structures, :view_templates, :layout_parts, :custom_pages, :plugins, :public_theme, :config
+    attr_accessor :name, :title, :page_parts, :structures, :view_templates, :layout_parts, :custom_pages, :plugins, :public_theme, :config, :navigations
 
     class << self
 
@@ -31,6 +31,7 @@ module Spina
       @layout_parts     = []
       @view_templates   = []
       @custom_pages     = []
+      @navigations      = []
       @public_theme = false
     end
 

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "0.11.1"
+  VERSION = "0.12.0"
 end

data/lib/spina.rb

@@ -22,27 +22,4 @@ module Spina
 
   self.locales = [I18n.default_locale]
 
-  class << self
-
-    def register_theme(deprecated_theme)
-      warn "[DEPRECATION] `register_theme` is deprecated. Please use `::Spina::Theme.register` instead."
-      Spina::Theme.register do |theme|
-        theme.name            = deprecated_theme.name
-        theme.title           = deprecated_theme.config.title
-        theme.page_parts      = deprecated_theme.config.page_parts
-        theme.view_templates  = deprecated_theme.config.view_templates.inject([]) do |a, (k, v)|
-          v[:name] = k
-          a << v
-        end
-        theme.layout_parts    = deprecated_theme.config.layout_parts
-        theme.custom_pages    = deprecated_theme.config.custom_pages
-        theme.plugins         = deprecated_theme.config.plugins
-        theme.structures      = deprecated_theme.config.structures.inject([]) do |a, (k, v)|
-          a << { name: k, structure_parts: v }
-        end
-        theme.public_theme    = deprecated_theme.config.public_theme
-      end
-    end
-
-  end
 end