qbrick 2.5.0.pre → 2.5.0

data/config/locales/views/{kuhsaft → qbrick}/search/en.yml

@@ -1,5 +1,5 @@
 en:
-  kuhsaft:
+  qbrick:
     search:
       results:
         title: Search results

data/config/locales/views/{kuhsaft → qbrick}/text_brick/de.yml

@@ -1,5 +1,5 @@
 de:
-  kuhsaft:
+  qbrick:
     text_bricks:
       text_brick:
         read_more: 'Mehr lesen'

data/config/locales/views/{kuhsaft → qbrick}/text_brick/en.yml

@@ -1,5 +1,5 @@
 en:
-  kuhsaft:
+  qbrick:
     text_bricks:
       text_brick:
         read_more: 'Read more'

data/config/locales/views/{kuhsaft → qbrick}/video_brick/de.yml

@@ -1,5 +1,5 @@
 de:
-  kuhsaft:
+  qbrick:
     video_bricks:
       video_brick:
         edit:

data/config/locales/views/{kuhsaft → qbrick}/video_brick/en.yml

@@ -1,5 +1,5 @@
 en:
-  kuhsaft:
+  qbrick:
     video_bricks:
       video_brick:
         edit:

data/config/routes.rb

@@ -1,8 +1,11 @@
-Kuhsaft::Engine.routes.draw do
+Qbrick::Engine.routes.draw do
+  devise_for :admins, class_name: 'Qbrick::Admin', module: :devise
 
   namespace :cms do
+    resources :settings_collections, only: [:update, :index]
     resources :pages, except: :show do
       post :sort, on: :collection
+      get :mirror
     end
 
     resources :bricks, except: [:edit, :index] do
@@ -11,6 +14,15 @@ Kuhsaft::Engine.routes.draw do
 
     resources :assets
     resources :ckimages, only: [:create, :index, :destroy]
+
+    resource :account, only: :edit do
+      collection do
+        patch 'update_password'
+      end
+    end
+
+    resources :admins
+
     root to: 'pages#index'
   end
 
@@ -26,5 +38,5 @@ Kuhsaft::Engine.routes.draw do
   end
 
   get '/pages/:id' => 'pages#lookup_by_id'
-  get '/sitemap.format' => 'sitemaps#index', format: 'xml'
+  get '/sitemap' => 'sitemaps#index', format: 'xml'
 end

data/db/migrate/{01_create_kuhsaft_pages.rb → 01_create_qbrick_pages.rb}

@@ -1,7 +1,7 @@
-class CreateKuhsaftPages < ActiveRecord::Migration
+class CreateQbrickPages < ActiveRecord::Migration
 
   def change
-    create_table :kuhsaft_pages do |t|
+    create_table :qbrick_pages do |t|
       t.integer :position
       t.string :title_en
       t.string :title_de
@@ -21,11 +21,11 @@ class CreateKuhsaftPages < ActiveRecord::Migration
       t.text :fulltext_en
       t.text :fulltext_de
       t.string :ancestry
-      t.timestamps
+      t.timestamps null: true
     end
 
-    add_index :kuhsaft_pages, :ancestry
-    add_index :kuhsaft_pages, :published
+    add_index :qbrick_pages, :ancestry
+    add_index :qbrick_pages, :published
   end
 
 end

data/db/migrate/{02_create_kuhsaft_bricks.rb → 02_create_qbrick_bricks.rb}

@@ -1,7 +1,7 @@
-class CreateKuhsaftBricks < ActiveRecord::Migration
+class CreateQbrickBricks < ActiveRecord::Migration
 
   def change
-    create_table :kuhsaft_bricks do |t|
+    create_table :qbrick_bricks do |t|
       t.integer :position
       t.references :brick_list, :polymorphic => true # all bricks
       t.string :type # all bricks
@@ -16,7 +16,7 @@ class CreateKuhsaftBricks < ActiveRecord::Migration
       t.string :image_size # ImageBrick
       t.text :embed_src # VideoBrick
       t.string :video # VideoBrick
-      t.timestamps
+      t.timestamps null: true
     end
   end
 

data/db/migrate/03_create_qbrick_brick_types.rb

@@ -0,0 +1,12 @@
+class CreateQbrickBrickTypes < ActiveRecord::Migration
+
+  def change
+    create_table :qbrick_brick_types do |t|
+      t.string :class_name
+      t.string :group
+      t.boolean :disabled
+      t.timestamps null: true
+    end
+  end
+
+end

data/db/migrate/04_create_qbrick_assets.rb

@@ -0,0 +1,10 @@
+class CreateQbrickAssets < ActiveRecord::Migration
+
+  def change
+    create_table :qbrick_assets do |t|
+      t.string :file
+      t.timestamps null: true
+    end
+  end
+
+end

data/db/migrate/05_remove_cms_admin.rb

@@ -1,9 +1,9 @@
 class RemoveCmsAdmin < ActiveRecord::Migration
   def change
-    if ActiveRecord::Base.connection.table_exists?(:kuhsaft_cms_admins)
-      drop_table :kuhsaft_cms_admins
+    if ActiveRecord::Base.connection.table_exists?(:qbrick_cms_admins)
+      drop_table :qbrick_cms_admins
     else
-      puts 'kuhsaft_cms_admins table does not exist, not deleting'
+      puts 'qbrick_cms_admins table does not exist, not deleting'
     end
   end
 end

data/db/migrate/06_add_template_name_to_qbrick_bricks.rb

@@ -0,0 +1,7 @@
+class AddTemplateNameToQbrickBricks < ActiveRecord::Migration
+  def change
+    change_table :qbrick_bricks do |t|
+      t.string :template_name
+    end
+  end
+end

data/db/migrate/07_add_default_value_to_brick_type_enabled.rb

@@ -1,6 +1,6 @@
 class AddDefaultValueToBrickTypeEnabled < ActiveRecord::Migration
   def change
-    rename_column :kuhsaft_brick_types, :disabled, :enabled
-    change_column :kuhsaft_brick_types, :enabled, :boolean, :default => true
+    rename_column :qbrick_brick_types, :disabled, :enabled
+    change_column :qbrick_brick_types, :enabled, :boolean, :default => true
   end
 end

data/db/migrate/08_add_display_styles_to_bricks.rb

@@ -1,5 +1,5 @@
 class AddDisplayStylesToBricks < ActiveRecord::Migration
   def change
-    add_column :kuhsaft_bricks, :display_styles, :text
+    add_column :qbrick_bricks, :display_styles, :text
   end
 end

data/db/migrate/09_add_additional_fields_to_qbrick_bricks.rb

@@ -0,0 +1,6 @@
+class AddAdditionalFieldsToQbrickBricks < ActiveRecord::Migration
+  def change
+    add_column :qbrick_bricks, :asset, :string
+    add_column :qbrick_bricks, :open_in_new_window, :boolean
+  end
+end

data/db/migrate/10_add_redirect_url_to_qbrick_pages.rb

@@ -0,0 +1,7 @@
+class AddRedirectUrlToQbrickPages < ActiveRecord::Migration
+  def change
+    I18n.available_locales.each do |locale|
+      add_column :qbrick_pages, "redirect_url_#{locale.to_s.underscore}", :text
+    end
+  end
+end

data/db/migrate/11_update_url_and_redirect_url_value.rb

@@ -1,13 +1,13 @@
 class UpdateUrlAndRedirectUrlValue < ActiveRecord::Migration
   def up
-    @redirect_pages = Kuhsaft::Page.where(:page_type => 'redirect')
+    @redirect_pages = Qbrick::Page.where(:page_type => 'redirect')
     I18n.available_locales.each do |locale|
       move_url_to_redirect_url(locale.to_s.underscore)
     end
   end
 
   def down
-    @redirect_pages = Kuhsaft::Page.where(:page_type => 'redirect')
+    @redirect_pages = Qbrick::Page.where(:page_type => 'redirect')
     I18n.available_locales.each do |locale|
       move_redirect_url_to_url(locale.to_s.underscore)
     end

data/db/migrate/12_regenerate_fulltext.rb

@@ -1,6 +1,6 @@
 class RegenerateFulltext < ActiveRecord::Migration
   def up
-    Kuhsaft::Page.all.each do |p|
+    Qbrick::Page.all.each do |p|
       I18n.available_locales.each do |locale|
         I18n.with_locale do
           puts "Save #{p.locale_attr(:fulltext)} #{p.link}"

data/db/migrate/13_add_page_title_to_pages.rb

@@ -1,7 +1,7 @@
 class AddPageTitleToPages < ActiveRecord::Migration
   def change
     I18n.available_locales.each do |locale|
-      add_column :kuhsaft_pages, "page_title_#{locale.to_s.underscore}", :text
+      add_column :qbrick_pages, "page_title_#{locale.to_s.underscore}", :text
     end
   end
 end

data/db/migrate/14_move_qbrick_assets.rb

@@ -0,0 +1,22 @@
+class MoveQbrickAssets < ActiveRecord::Migration
+  def old_qbrick_assets_dir
+    File.join(Rails.root,'public/uploads/qbrick')
+  end
+
+  def new_qbrick_assets_dir
+    File.join(Rails.root,'public/uploads/cms')
+  end
+
+  def up
+    if File.exists? old_qbrick_assets_dir
+      puts "Moving Qbrick Assets from #{old_qbrick_assets_dir} to #{new_qbrick_assets_dir}"
+      File.rename old_qbrick_assets_dir, new_qbrick_assets_dir
+    end
+  end
+
+  def down
+    if File.exists? new_qbrick_assets_dir
+      File.rename new_qbrick_assets_dir, old_qbrick_assets_dir
+    end
+  end
+end

data/db/migrate/15_add_alt_text_to_bricks.rb

@@ -1,5 +1,5 @@
 class AddAltTextToBricks < ActiveRecord::Migration
   def change
-    add_column :kuhsaft_bricks, :alt_text, :string
+    add_column :qbrick_bricks, :alt_text, :string
   end
 end

data/db/migrate/16_update_default_value_for_page_type.rb

@@ -1,9 +1,9 @@
 class UpdateDefaultValueForPageType < ActiveRecord::Migration
   def up
-    change_column :kuhsaft_pages, :page_type, :string, :default => Kuhsaft::PageType::CONTENT
+    change_column :qbrick_pages, :page_type, :string, :default => Qbrick::PageType::CONTENT
   end
 
   def down
-    change_column_default(:kuhsaft_pages, :page_type, nil)
+    change_column_default(:qbrick_pages, :page_type, nil)
   end
 end

data/db/migrate/17_set_page_type_to_content_for_empty_fields.rb

@@ -1,7 +1,7 @@
 class SetPageTypeToContentForEmptyFields < ActiveRecord::Migration
   def change
-    Kuhsaft::Page.where( "page_type is NULL or page_type = ''" ).each do |page|
-      page.update_attribute(:page_type, Kuhsaft::PageType::CONTENT)
+    Qbrick::Page.where( "page_type is NULL or page_type = ''" ).each do |page|
+      page.update_attribute(:page_type, Qbrick::PageType::CONTENT)
     end
   end
 end

data/db/migrate/18_add_identifier_to_qbrick_pages.rb

@@ -0,0 +1,6 @@
+class AddIdentifierToQbrickPages < ActiveRecord::Migration
+  def change
+    add_column :qbrick_pages, :identifier, :string
+    add_index :qbrick_pages, :identifier, unique: true
+  end
+end

data/db/migrate/19_add_col_count_to_bricks.rb

@@ -1,5 +1,5 @@
 class AddColCountToBricks < ActiveRecord::Migration
   def change
-    add_column :kuhsaft_bricks, :col_count, :integer, default: 0
+    add_column :qbrick_bricks, :col_count, :integer, default: 0
   end
 end

data/db/migrate/20_create_qbrick_ckimages.rb

@@ -0,0 +1,9 @@
+class CreateQbrickCkimages < ActiveRecord::Migration
+  def change
+    create_table :qbrick_ckimages do |t|
+      t.string :file
+
+      t.timestamps null: true
+    end
+  end
+end

data/db/migrate/21_add_google_verification_key_to_qbrick_pages.rb

@@ -0,0 +1,5 @@
+class AddGoogleVerificationKeyToQbrickPages < ActiveRecord::Migration
+  def change
+    add_column :qbrick_pages, :google_verification_key, :string
+  end
+end

data/db/migrate/22_create_settings.rb

@@ -0,0 +1,15 @@
+class CreateSettings < ActiveRecord::Migration
+  def self.up
+    create_table :qbrick_settings do |t|
+      t.string :key
+      t.text :value
+      t.integer :settings_collection_id
+    end
+    
+    add_index :qbrick_settings, :key, :unique => true
+  end
+ 
+  def self.down
+    drop_table :qbrick_settings
+  end
+end

data/db/migrate/22_create_settings_collections.rb

@@ -0,0 +1,11 @@
+class CreateSettingsCollections < ActiveRecord::Migration
+  def self.up
+    create_table :qbrick_settings_collections do |t|
+      t.string :collection_type
+    end
+  end
+ 
+  def self.down
+    drop_table :qbrick_settings_collections
+  end
+end

data/db/migrate/23_add_metadata_to_asset.rb

@@ -0,0 +1,6 @@
+class AddMetadataToAsset < ActiveRecord::Migration
+  def change
+    add_column :qbrick_bricks, :content_type, :string
+    add_column :qbrick_bricks, :file_size, :string
+  end
+end

data/db/migrate/23_devise_create_qbrick_admins.rb

@@ -0,0 +1,42 @@
+class DeviseCreateQbrickAdmins < ActiveRecord::Migration
+  def change
+    create_table(:qbrick_admins) do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+
+      t.timestamps null: true
+    end
+
+    add_index :qbrick_admins, :email,                unique: true
+    add_index :qbrick_admins, :reset_password_token, unique: true
+    # add_index :qbrick_admins, :confirmation_token,   unique: true
+    # add_index :qbrick_admins, :unlock_token,         unique: true
+  end
+end

data/db/seeds.rb

@@ -1,20 +1,43 @@
-# Add default kuhsaft brick types
+# Add default qbrick brick types
 brick_types = [
-  { class_name: 'Kuhsaft::TextBrick', group: 'elements' },
-  { class_name: 'Kuhsaft::LinkBrick', group: 'elements' },
-  { class_name: 'Kuhsaft::VideoBrick', group: 'elements' },
-  { class_name: 'Kuhsaft::AccordionBrick', group: 'elements' },
-  { class_name: 'Kuhsaft::AccordionItemBrick', group: 'elements' },
-  { class_name: 'Kuhsaft::TwoColumnBrick', group: 'layout_elements' },
-  { class_name: 'Kuhsaft::SliderBrick', group: 'elements' },
-  { class_name: 'Kuhsaft::ImageBrick', group: 'elements' },
-  { class_name: 'Kuhsaft::PlaceholderBrick', group: 'elements' },
-  { class_name: 'Kuhsaft::AnchorBrick', group: 'elements' },
-  { class_name: 'Kuhsaft::AssetBrick', group: 'elements' }
+  { class_name: 'Qbrick::TextBrick', group: 'elements' },
+  { class_name: 'Qbrick::LinkBrick', group: 'elements' },
+  { class_name: 'Qbrick::VideoBrick', group: 'elements' },
+  { class_name: 'Qbrick::AccordionBrick', group: 'elements' },
+  { class_name: 'Qbrick::AccordionItemBrick', group: 'elements' },
+  { class_name: 'Qbrick::TwoColumnBrick', group: 'layout_elements' },
+  { class_name: 'Qbrick::SliderBrick', group: 'elements' },
+  { class_name: 'Qbrick::ImageBrick', group: 'elements' },
+  { class_name: 'Qbrick::PlaceholderBrick', group: 'elements' },
+  { class_name: 'Qbrick::AnchorBrick', group: 'elements' },
+  { class_name: 'Qbrick::AssetBrick', group: 'elements' }
 ]
 
 brick_types.each do |bt|
-  brick_type = Kuhsaft::BrickType.find_or_create_by(class_name: bt[:class_name])
+  brick_type = Qbrick::BrickType.find_or_create_by(class_name: bt[:class_name])
   brick_type.update! bt
 end
 
+# Add default settings
+
+site_collection = Qbrick::SettingsCollection.find_or_create_by(collection_type: 'site')
+page_collection = Qbrick::SettingsCollection.find_or_create_by(collection_type: 'page')
+global_collection = Qbrick::SettingsCollection.find_or_create_by(collection_type: 'global')
+
+settings = [
+  { key: 'site_title', value: 'Default Site Title', settings_collection_id: site_collection.id },
+  { key: 'site_description', value: 'Default Site Description', settings_collection_id: site_collection.id },
+  { key: 'default_page_title', value: 'Default Page Title', settings_collection_id: page_collection.id },
+  { key: 'default_page_description', value: 'Default Page Description', settings_collection_id: page_collection.id },
+  { key: 'google_analytics_key', value: 'UA-xxxx-x', settings_collection_id: global_collection.id },
+  { key: 'typekit_id', value: 'xxxxxxx', settings_collection_id: global_collection.id }
+]
+
+settings.each do |s|
+  setting = Qbrick::Setting.find_or_create_by(key: s[:key])
+  setting.update! s
+end
+
+unless  Qbrick::Admin.any?
+  Qbrick::Admin.create(email: 'admin@admin.com', password: 'change-me-soon!')
+end