ckeditor 3.5.4 → 3.6.0.pre

data/app/controllers/ckeditor/pictures_controller.rb

@@ -1,12 +1,12 @@
 class Ckeditor::PicturesController < Ckeditor::BaseController
 
   def index
-    @pictures = Ckeditor.image_model.order("id DESC")
+    @pictures = Ckeditor.picture_model.find_all(ckeditor_pictures_scope)
     respond_with(@pictures) 
   end
   
   def create
-    @picture = Ckeditor.image_model.new
+    @picture = Ckeditor::Picture.new
 	  respond_with_asset(@picture)
   end
   
@@ -18,6 +18,6 @@ class Ckeditor::PicturesController < Ckeditor::BaseController
   protected
   
     def find_asset
-      @picture = Ckeditor.image_model.find(params[:id])
+      @picture = Ckeditor.picture_model.get!(params[:id])
     end
 end

data/app/views/ckeditor/attachment_files/index.html.erb

@@ -1,53 +1,15 @@
+<div id="fileupload" class="gal-holder">
+  <div class="gal-item">
+    <div class="fileupload-button gal-upload-holder">
+  		<%= link_to I18n.t(:upload, :scope => [:ckeditor, :buttons]), '#', :class => "add" %>
+		</div>
+	</div>
+  
+  <div class="fileupload-list">
+    <%= render :partial => 'ckeditor/shared/asset', :collection => @attachments %>		
+  </div>
+</div>
+
 <script type="text/javascript">
-  var upload_path = "<%=raw ckeditor_asset_path(:file) %>";
+  <%= Ckeditor::Utils.js_fileuploader('attachments') %>
 </script>
-
-<table width="100%" cellspacing="0" cellpadding="0">
-	<tbody>
-	<tr>
-		<td class="TB_ToolbarSet" id="nv"></td>
-	</tr>
-
-	<tr id="fj" style='display:none;'>
-		<td style="white-space: normal;" class="FCKUploadArea">
-			<div class="PopupTitle">
-				<span><%= I18n.t('upload_files', :scope => [:ckeditor]) %></span>
-			</div>
-			<div id="cY">
-				<table cellspacing="0" cellpadding="0" style="padding: 10px;">
-					<tbody>
-					<tr>
-						<td>
-              <span id='spanButtonPlaceholder'></span>
-              <div id="divFileProgressContainer" style="clear:both;"></div>
-              
-							<%= render :partial => "ckeditor/swfupload" %>
-						</td>
-					</tr>
-				  </tbody>
-			  </table>
-			  <div class="PopupButtons">
-				  <div style="width: 100%;">
-					  <table width="100%" cellspacing="0" cellpadding="0">
-						  <tbody><tr>
-							  <td width="100%"></td>
-							  <td nowrap="nowrap">
-								  <button onclick="uploadButton()" class="Button"><span ckf:lang="CancelBtn"><%= I18n.t('cancel', :scope => [:ckeditor, :buttons]) %></span></button>
-							  </td>
-						  </tr>
-					  </tbody></table>
-				  </div>
-			  </div>
-			</div>
-		</td>
-	</tr>
-
-	<tr>
-		<td style="height: 100%;" id="qu">
-		  <div style="overflow:auto; height:550px;" id='container'>
-			 <%= render :partial => "ckeditor/asset", :collection => @attachments, :as => :asset %>
-		  </div>
-		</td>
-	</tr>
-</tbody>
-</table>

data/app/views/ckeditor/pictures/index.html.erb

@@ -1,53 +1,15 @@
-<script type="text/javascript">	  
-  var upload_path = "<%=raw ckeditor_asset_path(:image) %>";
-</script>
-
-<table width="100%" cellspacing="0" cellpadding="0">
-	<tbody>
-	<tr>
-		<td class="TB_ToolbarSet" id="nv"></td>
-	</tr>
+<div id="fileupload" class="gal-holder">
+  <div class="gal-item">
+    <div class="fileupload-button gal-upload-holder">
+  		<%= link_to I18n.t(:upload, :scope => [:ckeditor, :buttons]), '#', :class => "add" %>
+		</div>
+	</div>
+  
+  <div class="fileupload-list">
+    <%= render :partial => 'ckeditor/shared/asset', :collection => @pictures %>		
+  </div>
+</div>
 
-	<tr id="fj" style='display:none;'>
-		<td style="white-space: normal;" class="FCKUploadArea">
-			<div class="PopupTitle">
-				<span><%= I18n.t('upload_files', :scope => [:ckeditor]) %></span>
-			</div>
-			<div id="cY">
-				<table cellspacing="0" cellpadding="0" style="padding: 10px;">
-					<tbody>
-					<tr>
-						<td>
-              <span id='spanButtonPlaceholder'></span>
-              <div id="divFileProgressContainer" style="clear:both;"></div>
-              
-							<%= render :partial => "ckeditor/swfupload" %>
-						</td>
-					</tr>
-				  </tbody>
-			  </table>
-			  <div class="PopupButtons">
-				  <div style="width: 100%;">
-					  <table width="100%" cellspacing="0" cellpadding="0">
-						  <tbody><tr>
-							  <td width="100%"></td>
-							  <td nowrap="nowrap">
-								  <button onclick="uploadButton()" class="Button"><span ckf:lang="CancelBtn"><%= I18n.t('cancel', :scope => [:ckeditor, :buttons]) %></span></button>
-							  </td>
-						  </tr>
-					  </tbody></table>
-				  </div>
-			  </div>
-			</div>
-		</td>
-	</tr>
-
-	<tr>
-		<td style="height: 100%;" id="qu">
-		  <div style="overflow:auto; height:550px;" id='container'>
-			 <%= render :partial => "ckeditor/asset", :collection => @pictures, :as => :asset %>
-		  </div>
-		</td>
-	</tr>
-</tbody>
-</table>
+<script type="text/javascript">
+  <%= Ckeditor::Utils.js_fileuploader('image') %>
+</script>

data/app/views/ckeditor/shared/_asset.html.erb

@@ -0,0 +1,19 @@
+<%= content_tag(:div, :id => dom_id(asset), :class => "gal-item", :"data-url" => asset.url_content) do %>
+  <%= link_to image_tag("/javascripts/ckeditor/filebrowser/images/gal_del.png", :title => I18n.t('ckeditor.buttons.delete')), 
+          polymorphic_path(asset, :format => :json), 
+          :remote => true,
+          :method => :delete, 
+          :confirm => t('ckeditor.confirm_delete'),
+          :class => "fileupload-cancel gal-del" %>
+	
+	<div class="fileupload-file gal-inner-holder">
+		<div class="img"><%= image_tag(asset.url_thumb, :title => asset.filename) %></div>
+		<div class="img-data">
+			<div class="img-name"><%= asset.filename %></div>
+			<div class="time-size">
+				<div class="time"><%= asset.format_created_at %></div>
+				<div class="fileupload-size size"><%= number_to_human_size(asset.size) %></div>
+			</div>
+		</div>
+	</div>
+<% end %>

data/app/views/ckeditor/shared/_asset_tmpl.html.erb

@@ -0,0 +1,21 @@
+<script id="fileupload_tmpl" type="text/x-jquery-tmpl">
+<div id="asset_${id}" class="gal-item" data-url="${url_content}">
+  <%= link_to image_tag("/javascripts/ckeditor/filebrowser/images/gal_del.png", :title => I18n.t('ckeditor.buttons.delete')), 
+          "/ckeditor/${controller}/${id}.json", 
+          :remote => true,
+          :method => :delete, 
+          :confirm => t('ckeditor.confirm_delete'),
+          :class => "fileupload-cancel gal-del" %>
+	
+	<div class="fileupload-file gal-inner-holder">
+		<div class="img"><img src="${url_thumb}" title="${filename}"></div>
+		<div class="img-data">
+			<div class="img-name">${filename}</div>
+			<div class="time-size">
+				<div class="time">${format_created_at}</div>
+				<div class="fileupload-size size">${size}</div>
+			</div>
+		</div>
+	</div>
+</div>
+</script>

data/app/views/layouts/ckeditor.html.erb

@@ -1,32 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title><%= I18n.t('page_title', :scope => [:ckeditor]) %></title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<meta name="robots" content="noindex, nofollow">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <meta name="robots" content="noindex, nofollow">
 	<%= csrf_meta_tag %>
-	
-	<link href="/javascripts/ckeditor/css/fck_editor.css" type="text/css" rel="stylesheet">
-	<link href="/javascripts/ckeditor/css/fck_dialog.css" type="text/css" rel="stylesheet">
-	<link href="/javascripts/ckeditor/css/ckfinder.css" type="text/css" rel="stylesheet">
-	<link href="/javascripts/ckeditor/css/swfupload.css" type="text/css" rel="stylesheet">
-	
-	<script src="/javascripts/ckeditor/swfupload/jquery-1.5.1.min.js" type="text/javascript"></script>
-	<script src="/javascripts/ckeditor/swfupload/swfupload.js" type="text/javascript"></script>
-	<script src="/javascripts/ckeditor/swfupload/swfupload.queue.js" type="text/javascript"></script>
-	<script src="/javascripts/ckeditor/swfupload/fileprogress.js" type="text/javascript"></script>
-	<script src="/javascripts/ckeditor/swfupload/handlers.js" type="text/javascript"></script>
-	<script src="/javascripts/ckeditor/swfupload/querystring.js" type="text/javascript"></script>
-	<script src="/javascripts/ckeditor/swfupload/rails.js" type="text/javascript"></script>
-  
+  <title><%= I18n.t('page_title', :scope => [:ckeditor]) %></title>
+  <link href="/javascripts/ckeditor/filebrowser/stylesheets/uploader.css" type="text/css" rel="stylesheet">
+  <script src="/javascripts/ckeditor/filebrowser/javascripts/jquery.js" type="text/javascript"></script>
+  <script src="/javascripts/ckeditor/filebrowser/javascripts/jquery.tmpl.js" type="text/javascript"></script>
+  <script src="/javascripts/ckeditor/filebrowser/javascripts/fileuploader.js" type="text/javascript"></script>
+  <script src="/javascripts/ckeditor/filebrowser/javascripts/rails.js" type="text/javascript"></script>
+  <script src="/javascripts/ckeditor/filebrowser/javascripts/application.js" type="text/javascript"></script>
   <script type="text/javascript">
-    var params = new Querystring();
-	  var CKEditorFuncNum = params.get("CKEditorFuncNum");
-	  var CKEditorName = params.get("CKEditor");
+	  var CKEditorFuncNum = $.QueryString["CKEditorFuncNum"];
+	  var CKEditorName = $.QueryString["CKEditor"];
 	  var CKEDITOR = window.opener.CKEDITOR;
-	  var editor = CKEDITOR.instances[CKEditorName];
+	  var EDITOR = CKEDITOR.instances[CKEditorName];
   </script>
 </head>
-<body style="margin: 0px; padding: 0px;">
-  <%= yield %>
+<body>
+	<%= yield %>
+	<%= render :partial => 'ckeditor/shared/asset_tmpl' %>
 </body>
 </html>

data/config/locales/en.ckeditor.yml

@@ -1,12 +1,8 @@
 en:
   ckeditor:
     page_title: "CKEditor Files Manager"
-    upload_files: "Upload New Files"
+    confirm_delete: "Delete file?"
     buttons:
       cancel: "Cancel"
-      refresh:
-        title: "Refresh"
-        hint: "Refresh page"
-      upload:
-        title: "Upload"
-        hint: "Upload New File"
+      upload: "Upload"
+      delete: "Delete"

data/config/locales/ru.ckeditor.yml

@@ -1,12 +1,8 @@
 ru:
   ckeditor:
-    page_title: "CKEditor Files Manager"
-    upload_files: "Загрузка новых файлов"
+    page_title: "CKEditor Загрузка файлов"
+    confirm_delete: "Удалить файл?"
     buttons:
       cancel: "Отмена"
-      refresh:
-        title: "Обновить"
-        hint: "Обновить страницу"
-      upload:
-        title: "Загрузить"
-        hint: "Загрузить файл"
+      upload: "Загрузить"
+      delete: "Удалить"

data/config/locales/uk.ckeditor.yml

@@ -1,12 +1,8 @@
 uk:
   ckeditor:
-    page_title: "CKEditor Files Manager"
-    upload_files: "Завантаження нових файлів"
+    page_title: "CKEditor Завантаження файлів"
+    confirm_delete: "Видалити файл?"
     buttons:
       cancel: "Відміна"
-      refresh:
-        title: "Оновити"
-        hint: "Оновити сторінку"
-      upload:
-        title: "Завантажити"
-        hint: "Завантажити новий файл"
+      upload: "Завантажити"
+      delete: "Видалити"

data/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
-  namespace :ckeditor do
-    resources :pictures, :only => [:index, :create, :destroy]
-    resources :attachment_files, :only => [:index, :create, :destroy]
+  namespace :ckeditor, :only => [:index, :create, :destroy] do
+    resources :pictures
+    resources :attachment_files
   end
 end

data/lib/ckeditor.rb

@@ -1,96 +1,47 @@
+require 'orm_adapter'
+
 module Ckeditor
-  autoload :ViewHelper,        'ckeditor/view_helper'
-  autoload :FormBuilder,       'ckeditor/form_builder'
-  autoload :Middleware,        'ckeditor/middleware'
-  autoload :Utils,             'ckeditor/utils'
-  
-  module Hooks
-    autoload :FormtasticBuilder, 'ckeditor/hooks/formtastic'
-    autoload :SimpleFormBuilder, 'ckeditor/hooks/simple_form'
-  end
-  
-  mattr_accessor :swf_file_post_name
-  @@swf_file_post_name = "data"
-  
-  mattr_accessor :swf_image_file_types_description
-  @@swf_image_file_types_description = "Images"
-  
-  mattr_accessor :swf_image_file_types
-  @@swf_image_file_types = "*.jpg;*.jpeg;*.png;*.gif"
-  
-  mattr_accessor :swf_image_file_size_limit
-  @@swf_image_file_size_limit = "5 MB"
-  
-  mattr_accessor :swf_image_file_upload_limit
-  @@swf_image_file_upload_limit = 10
-  
-  mattr_accessor :swf_file_types_description
-  @@swf_file_types_description = "Files"
-  
-  mattr_accessor :swf_file_types
-  @@swf_file_types = "*.doc;*.wpd;*.pdf;*.swf;*.xls"
-  
-  mattr_accessor :swf_file_size_limit
-  @@swf_file_size_limit = "10 MB"
-  
-  mattr_accessor :swf_file_upload_limit
-  @@swf_file_file_upload_limit = 5
-  
-  mattr_accessor :public_uri
-  @@public_uri = "/uploads"
-  
-  mattr_accessor :public_path
-  @@public_path = "public/uploads"
-  
-  mattr_accessor :file_manager_uri
-  @@file_manager_uri = "/ckeditor/attachment_files"
-  
-  mattr_accessor :file_manager_upload_uri
-  @@file_manager_upload_uri = "/ckeditor/attachment_files"
-  
-  mattr_accessor :file_manager_image_upload_uri
-  @@file_manager_image_upload_uri = "/ckeditor/pictures"
-  
-  mattr_accessor :file_manager_image_uri
-  @@file_manager_image_uri = "/ckeditor/pictures"
-  
   IMAGE_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/jpg', 'image/pjpeg', 'image/tiff', 'image/x-png']
   
-  # Get the image class from the image reference object.
-  def self.image_model
-    if self.class_variables.include?('@@image_model_ref')
-      @@image_model_ref.get 
-    else
-      self.file_manager_image_model = "Ckeditor::Picture"
-      @@image_model_ref.get
-    end
-  end
+  autoload :Utils, 'ckeditor/utils'
+  autoload :Http, 'ckeditor/http'
   
-  # Set the image model reference object to access the images.
-  def self.file_manager_image_model=(class_name)
-    @@image_model_ref = ActiveSupport::Dependencies.ref(class_name)
+  module Helpers
+    autoload :ViewHelper, 'ckeditor/helpers/view_helper'
+    autoload :FormHelper, 'ckeditor/helpers/form_helper'
+    autoload :FormBuilder, 'ckeditor/helpers/form_builder'
+    autoload :Controllers, 'ckeditor/helpers/controllers'
   end
   
-  # Get the file class from the file reference object.
-  def self.file_model
-    if self.class_variable_defined?('@@file_model_ref')
-      @@file_model_ref.get 
-    else
-      self.file_manager_file_model = "Ckeditor::AttachmentFile"
-      @@file_model_ref.get
-    end
+  module Hooks
+    autoload :FormtasticBuilder, 'ckeditor/hooks/formtastic'
+    autoload :SimpleFormBuilder, 'ckeditor/hooks/simple_form'
   end
   
-  # Set the file model reference object to access the files.
-  def self.file_manager_file_model=(class_name)
-    @@file_model_ref = ActiveSupport::Dependencies.ref(class_name)
-  end
+  # Allowed image file types for upload. 
+  # Set to nil or [] (empty array) for all file types
+  mattr_accessor :image_file_types
+  @@image_file_types = ["jpg", "jpeg", "png", "gif", "tiff"]
+  
+  # Allowed attachment file types for upload. 
+  # Set to nil or [] (empty array) for all file types
+  mattr_accessor :attachment_file_types
+  @@attachment_file_types = ["doc", "docx", "rar", "zip", "xls", "swf"]
   
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
   # a fresh initializer with all configuration values.
   def self.setup
     yield self
   end
+  
+  def self.picture_model
+    Ckeditor::Picture.to_adapter
+  end
+  
+  def self.attachment_file_model
+    Ckeditor::AttachmentFile.to_adapter
+  end
 end
 
 require 'ckeditor/engine'
+require 'ckeditor/version'

data/lib/ckeditor/engine.rb

@@ -1,21 +1,22 @@
 require 'rails'
-require 'ckeditor'
 
 module Ckeditor
   class Engine < ::Rails::Engine
-    initializer "ckeditor_engine.add_middleware" do |app|
-      app.middleware.insert_before(
-        ActionDispatch::Cookies,
-        "Ckeditor::Middleware",
-        app.config.send(:session_options)[:key])
+    config.action_view.javascript_expansions[:ckeditor] = "ckeditor/ckeditor"
+    
+    initializer "ckeditor.helpers" do
+      ActiveSupport.on_load(:action_controller) do
+        ActionController::Base.send :include, Ckeditor::Helpers::Controllers
+      end
+    
+      ActiveSupport.on_load :action_view do
+        ActionView::Base.send :include, Ckeditor::Helpers::ViewHelper
+        ActionView::Base.send :include, Ckeditor::Helpers::FormHelper
+        ActionView::Helpers::FormBuilder.send :include, Ckeditor::Helpers::FormBuilder
+      end
     end
-
-    config.after_initialize do
-      ActionView::Base.send :include, Ckeditor::ViewHelper
-      ActionView::Helpers::FormBuilder.send :include, Ckeditor::FormBuilder
-      
-      ActionView::Helpers::AssetTagHelper.register_javascript_expansion :ckeditor => ["ckeditor/ckeditor"]
-      
+    
+    initializer "ckeditor.hooks" do
       if Object.const_defined?("Formtastic")
         ::Formtastic::SemanticFormBuilder.send :include, Ckeditor::Hooks::FormtasticBuilder
       end