th_simple_content_management 0.2.1 → 0.2.2

data/app/controllers/redactor_rails/documents_controller.rb

@@ -0,0 +1,28 @@
+require "redactor-rails"
+
+class RedactorRails::DocumentsController < ApplicationController
+  before_filter :redactor_authenticate_user! if RedactorRails.document_model.new.respond_to?(RedactorRails.devise_user)
+
+  def index
+    @documents = RedactorRails.document_model.where(
+        RedactorRails.document_model.new.respond_to?(RedactorRails.devise_user) ? { RedactorRails.devise_user_key => redactor_current_user.id } : { })
+    render :json => @documents.to_json
+  end
+
+  def create
+    @document = RedactorRails.document_model.new
+
+    file = params[:file]
+    @document.data = RedactorRails::Http.normalize_param(file, request)
+    if @document.respond_to?(RedactorRails.devise_user)
+      @document.send("#{RedactorRails.devise_user}=", redactor_current_user)
+      @document.assetable = redactor_current_user
+    end
+
+    if @document.save
+      render :text => { :filelink => @document.url, :filename => @document.filename }.to_json
+    else
+      render :nothing => true
+    end
+  end
+end

data/app/controllers/redactor_rails/pictures_controller.rb

@@ -0,0 +1,28 @@
+require "redactor-rails"
+
+class RedactorRails::PicturesController < ApplicationController
+  before_filter :redactor_authenticate_user! if RedactorRails.picture_model.new.respond_to?(RedactorRails.devise_user)
+
+  def index
+    @pictures = RedactorRails.picture_model.where(
+        RedactorRails.picture_model.new.respond_to?(RedactorRails.devise_user) ? { RedactorRails.devise_user_key => redactor_current_user.id } : { })
+    render :json => @pictures.to_json
+  end
+
+  def create
+    @picture = RedactorRails.picture_model.new
+
+    file = params[:file]
+    @picture.data = RedactorRails::Http.normalize_param(file, request)
+    if @picture.respond_to?(RedactorRails.devise_user)
+      @picture.send("#{RedactorRails.devise_user}=", redactor_current_user)
+      @picture.assetable = redactor_current_user
+    end
+
+    if @picture.save
+      render :text => { :filelink => @picture.url }.to_json
+    else
+      render :nothing => true
+    end
+  end
+end

data/app/helpers/simple_content_management/simple_pages_helper.rb

@@ -2,4 +2,8 @@ module SimpleContentManagement::SimplePagesHelper
 	def render_page_by_name name
 		SimpleContentManagement::SimplePage.where(name: name).first.try(:content_html).try(:html_safe)
 	end
+
+	def render_page_by_path path
+		SimpleContentManagement::SimplePage.search(simple_routes_path_equals: path).first.try(:content_html).try(:html_safe)
+	end
 end

data/app/models/redactor/asset.rb

@@ -0,0 +1,5 @@
+class RedactorRails::Asset < ActiveRecord::Base
+  include RedactorRails::Orm::ActiveRecord::AssetBase
+  delegate :url, :current_path, :size, :content_type, :filename, :to => :data
+  validates_presence_of :data
+end

data/app/models/redactor/document.rb

@@ -0,0 +1,11 @@
+class RedactorRails::Document < RedactorRails::Asset
+  mount_uploader :data, RedactorRailsDocumentUploader, :mount_on => :data_file_name
+
+  def url_content
+    url(:content)
+  end
+
+  def as_json_methods
+    [:image]
+  end
+end

data/app/models/redactor/picture.rb

@@ -0,0 +1,7 @@
+class RedactorRails::Picture < RedactorRails::Asset
+  mount_uploader :data, RedactorRailsPictureUploader, :mount_on => :data_file_name
+
+  def url_content
+    url(:content)
+  end
+end

data/app/models/simple_content_management/simple_menu.rb

@@ -38,7 +38,7 @@ class SimpleContentManagement::SimpleMenu
 
 	def simple_menu_items_data= smis_data_string
 		smis_data = JSON.parse smis_data_string
-		existing_smis = simple_menu_items.to_a
+		existing_smis = SimpleContentManagement::SimpleMenuItem.where(simple_menu_id: id).all
 		smis_data.each_with_index do |smi_data, position|
 			smi_data["simple_menu_id"] = id
 			smi_data["position"] = position

data/app/models/simple_content_management/simple_page.rb

@@ -1,4 +1,6 @@
 class SimpleContentManagement::SimplePage < ActiveRecord::Base
+	include SimpleContentManagement::ContentText
+
 	has_many :simple_routes, conditions: { deleted: false }, class_name: "SimpleContentManagement::SimpleRoute"
 
 	attr_accessible :name, :title, :content_html, :simple_routes_list
@@ -39,6 +41,10 @@ class SimpleContentManagement::SimplePage < ActiveRecord::Base
 		update_attribute :deleted, true
 	end
 
+	def label
+		title
+	end
+
 	class << self
 		def registered_content_pages
 			@registered_content_pages ||= YAML.load_file File.join Rails.root, "config", "content_pages.yml"

data/app/views/simple_content_management/simple_pages/_form.html.erb

@@ -1,9 +1,54 @@
-<%= simple_form_for [:admin, @simple_page], url: @simple_page.new_record? ? simple_content_management_simple_pages_path : simple_content_management_simple_page_path(@simple_page) do |f| %>
+<div data-iframe-style-path="<%= stylesheet_path "iframe.css" %>"></div>
+<%= simple_form_for [:admin, @simple_page], url: @simple_page.new_record? ? simple_content_management_simple_pages_path : simple_content_management_simple_page_path(@simple_page), html: { class: "simple-page-form" } do |f| %>
 	<%= f.input :simple_routes_list, input_html: { data: { simple_routes_list: true } }, wrapper_html: { class: "simple-routes-list" }, hint: "Voeg één of meerdere URL paden toe." %>
 	<%= f.input :title, hint: "Wordt gebruikt als HTML titel." %>
-	<%= f.input :content_html, input_html: { cols: 120, rows: 7, class: "input-xxlarge redactor" } %>
+	<%= f.input :content_html, as: :hidden %>
+
+	<div class="content-html-container">
+		<%== @simple_page.content_html %>
+	</div>
 
 	<div class="form-actions">
 		<%= f.button :submit %>
 	</div>
-<% end %>
+<% end %>
+
+<div id="content-editor" class="modal hide" role="dialog" aria-labelledby="content-editor-label" aria-hidden="true">
+	<div class="modal-header">
+		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+		<h3 id="content-editor-label">Inhoud bewerken</h3>
+		<ul class="nav nav-tabs">
+			<li class="active"><a href="#editor-html-content" data-toggle="tab">Tekst</a></li>
+			<li><a href="#editor-container" data-toggle="tab">Container</a></li>
+			<li><a href="#editor-bloc-component" data-toggle="tab">Linkbanner</a></li>
+		</ul>
+	</div>
+	<div class="modal-body">
+		<div class="tab-content">
+			<div class="tab-pane active" id="editor-html-content">
+				<textarea cols=140 rows=12></textarea>
+			</div>
+			<div class="tab-pane" id="editor-container">
+				<h2>Converteer dit blok naar een container</h2>
+				<p class=lead>
+					Dit blok wordt dan omsloten door een nieuwe container waaraan kolommen en regels toegevoegd kunnen worden.
+				</p>
+				<p>
+					Klik op toepassen om dit blok te converteren. Er zal geen informatie verloren gaan, maar deze actie kan niet ongedaan worden.
+				</p>
+			</div>
+			<div class="tab-pane" id="editor-bloc-component">
+				<h2>Linkbanner</h2>
+				Hier komen nog invulvelden voor:<br>
+				- afbeelding<br>
+				- koptekst regel 1 &amp; 2<br>
+				- link
+				- formaat (groot, 9 kolommen of klein, 3 kolommen)
+			</div>
+		</div>
+	</div>
+	<div class="modal-footer">
+		<button class="btn" data-dismiss="modal" aria-hidden="true">Annuleren</button>
+		<button class="btn btn-primary" data-save-button>Toepassen</button>
+	</div>
+</div>

data/config/routes.rb

@@ -1,4 +1,8 @@
 Rails.application.routes.draw do
+	namespace :redactor_rails, path: "redactor_rails" do
+		resources :pictures,  :only => [:index, :create]
+		resources :documents, :only => [:index, :create]
+	end
 	namespace :simple_content_management, path: "admin" do
 		resources :simple_content_pages
 		resources :simple_pages

data/lib/generators/redactor/config_generator.rb

@@ -0,0 +1,18 @@
+require 'rails/generators'
+module Redactor
+  module Generators
+    class ConfigGenerator < ::Rails::Generators::Base
+      desc "Generates redactor-rails config"
+
+      def self.source_root
+	@source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      end
+
+
+      def create_config
+	template "config.js",
+	  File.join('app/assets/javascripts/redactor-rails', "config.js")
+      end
+    end
+  end
+end

data/lib/generators/redactor/install_generator.rb

@@ -0,0 +1,75 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+module Redactor
+  module Generators
+    class InstallGenerator < ::Rails::Generators::Base
+      include ::Rails::Generators::Migration
+      desc "Generates migration for Tag and Tagging models"
+
+      class_option :orm, :type => :string, :default => "active_record",
+  :desc => "Backend processor for upload support"
+
+      class_option :backend, :type => :string, :default => 'carrierwave',
+  :desc => "carrierwave(default)"
+
+      def self.source_root
+  @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      end
+
+      def self.next_migration_number(dirname)
+  Time.now.strftime("%Y%m%d%H%M%S")
+      end
+
+      def mount_engine
+  route "mount RedactorRails::Engine => '/redactor_rails'"
+      end
+
+      def create_models
+  [:asset, :picture, :document].each do |filename|
+    template "#{generator_dir}/redactor/#{filename}.rb",
+    File.join('app/models', redactor_dir, "#{filename}.rb")
+  end
+
+  if backend == "carrierwave"
+    [:picture, :document].each do |filename|
+      template "#{uploaders_dir}/uploaders/redactor_rails_#{filename}_uploader.rb",
+        File.join("app/uploaders", "redactor_rails_#{filename}_uploader.rb")
+    end
+  end
+      end
+
+      def create_migration
+        if orm.to_s == "active_record"
+          if ARGV.include?('--devise')
+            migration_template "#{generator_dir}/devise_migration.rb", File.join('db/migrate', "create_redactor_assets.rb")
+          else
+            migration_template "#{generator_dir}/migration.rb", File.join('db/migrate', "create_redactor_assets.rb")
+          end
+        end
+      end
+
+      protected
+
+      def redactor_dir
+  'redactor_rails'
+      end
+
+      def generator_dir
+  @generator_dir ||= [orm, backend].join('/')
+      end
+
+      def uploaders_dir
+  @uploaders_dir ||= ['base', 'carrierwave'].join('/')
+      end
+
+      def orm
+  options[:orm] || "active_record"
+      end
+
+      def backend
+  options[:backend] || "carrierwave"
+      end
+
+    end
+  end
+end

data/lib/generators/redactor/templates/active_record/carrierwave/devise_migration.rb

@@ -0,0 +1,30 @@
+class CreateRedactorAssets < ActiveRecord::Migration
+  def self.up
+    create_table :redactor_assets do |t|
+      t.integer :user_id
+      t.string  :data_file_name, :null => false
+      t.string  :data_content_type
+      t.integer :data_file_size
+
+      t.integer :assetable_id
+      t.string  :assetable_type, :limit => 30
+      t.string  :type, :limit => 30
+
+      # Uncomment	it to save images dimensions, if your need it
+      t.integer :width
+      t.integer :height
+
+      t.timestamps
+    end
+
+    # Uncomment it to add foreign key. gem 'foreigner' is required in your .Gemfile
+    # add_foreign_key(:redactor_assets, :users, dependent: :delete)
+    add_index "redactor_assets", ["assetable_type", "type", "assetable_id"], :name => "idx_redactor_assetable_type"
+    add_index "redactor_assets", ["assetable_type", "assetable_id"], :name => "idx_redactor_assetable"
+  end
+
+  def self.down
+    drop_table :redactor_assets
+  end
+end
+

data/lib/generators/redactor/templates/active_record/carrierwave/migration.rb

@@ -0,0 +1,30 @@
+class CreateRedactorAssets < ActiveRecord::Migration
+  def self.up
+    create_table :redactor_assets do |t|
+      t.integer :user_id
+      t.string  :data_file_name, :null => false
+      t.string  :data_content_type
+      t.integer :data_file_size
+
+      t.integer :assetable_id
+      t.string  :assetable_type, :limit => 30
+      t.string  :type, :limit => 30
+
+      # Uncomment	it to save images dimensions, if your need it
+      t.integer :width
+      t.integer :height
+
+      t.timestamps
+    end
+
+    # Uncomment it to add foreign key. gem 'foreigner' is required in your .Gemfile
+    # add_foreign_key(:redactor_assets, :users, dependent: :delete)
+    add_index "redactor_assets", ["assetable_type", "type", "assetable_id"], :name => "idx_redactor_assetable_type"
+    add_index "redactor_assets", ["assetable_type", "assetable_id"], :name => "idx_redactor_assetable"
+  end
+
+  def self.down
+    drop_table :redactor_assets
+  end
+end
+

data/lib/generators/redactor/templates/active_record/carrierwave/redactor/asset.rb

@@ -0,0 +1,5 @@
+class RedactorRails::Asset < ActiveRecord::Base
+  include RedactorRails::Orm::ActiveRecord::AssetBase
+  delegate :url, :current_path, :size, :content_type, :filename, :to => :data
+  validates_presence_of :data
+end

data/lib/generators/redactor/templates/active_record/carrierwave/redactor/document.rb

@@ -0,0 +1,11 @@
+class RedactorRails::Document < RedactorRails::Asset
+  mount_uploader :data, RedactorRailsDocumentUploader, :mount_on => :data_file_name
+
+  def url_content
+    url(:content)
+  end
+
+  def as_json_methods
+    [:image]
+  end
+end

data/lib/generators/redactor/templates/active_record/carrierwave/redactor/picture.rb

@@ -0,0 +1,7 @@
+class RedactorRails::Picture < RedactorRails::Asset
+  mount_uploader :data, RedactorRailsPictureUploader, :mount_on => :data_file_name
+
+  def url_content
+    url(:content)
+  end
+end

data/lib/generators/redactor/templates/base/carrierwave/uploaders/redactor_rails_document_uploader.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+class RedactorRailsDocumentUploader < CarrierWave::Uploader::Base
+  include RedactorRails::Backend::CarrierWave
+
+  # storage :fog
+  storage :file
+
+  def store_dir
+    "system/redactor_assets/documents/#{model.id}"
+  end
+
+  def extension_white_list
+    RedactorRails.document_file_types
+  end
+end

data/lib/generators/redactor/templates/base/carrierwave/uploaders/redactor_rails_picture_uploader.rb

@@ -0,0 +1,53 @@
+# encoding: utf-8
+class RedactorRailsPictureUploader < CarrierWave::Uploader::Base
+  include RedactorRails::Backend::CarrierWave
+
+  # Include RMagick or ImageScience support:
+  # include CarrierWave::RMagick
+  include CarrierWave::MiniMagick
+  # include CarrierWave::ImageScience
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "system/redactor_assets/pictures/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  process :read_dimensions
+
+  # Create different versions of your uploaded files:
+  version :thumb do
+    process :resize_to_fill => [118, 100]
+  end
+
+  version :content do
+    process :resize_to_limit => [800, 800]
+  end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_white_list
+    RedactorRails.image_file_types
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+end