spree_editor 0.50.1 → 0.70.0

data/.gitignore

@@ -8,3 +8,5 @@ tmp
 nbproject
 *.swp
 *.gem
+Gemfile.lock
+.rvmrc

data/Gemfile

@@ -0,0 +1,4 @@
+source :rubygems
+
+gemspec
+

data/README.md

@@ -1,10 +1,29 @@
 SpreeEditor
 ===========
 
-Rich editor for Spree. It implements different types of Rich Editors:
+# Summary #
 
-- YUI Rich Editor
-- WYM Editor
-- TinyMCE
+This extension provides an inline rich-text editor for Spree. It implements different types of editors:
+
+- [WYM Editor](http://www.wymeditor.org/)
+- [TinyMCE](http://www.tinymce.com/)
+- [YUI Rich Editor](http://developer.yahoo.com/yui/editor/) (N.B. not currently available in Spree 0.70.x and newer)
+
+# Installation #
+
+1. Add the Spree Editor gem to your Gemfile:
+
+    gem 'spree_editor', :git => 'git://raw.github.com/spree/spree_editor.git'
+
+2. Install the gem:
+
+    bundle install
+
+3. Install the assets:
+
+    rails g spree_editor:install
+
+*NOTE:* currently YUI Rich Editor is not yet 3.1 asset ready.
+The only editors currently working on Spree 0.70.x are WYMEditor and TinyMCE.
 
 Copyright (c) 2010 [divineforest], released under the New BSD License

data/Versionfile

@@ -1,3 +1,4 @@
+"0.70.x" => { :branch => "master" }
 "0.60.x" => { :version => '0.50.0', :ref => 'da5c7fcb980d39a2e0f71a7f132463c28ef8c665' }
 "0.50.x" => { :version => '0.50.0', :ref => 'da5c7fcb980d39a2e0f71a7f132463c28ef8c665' }
 "0.40.x" => { :version => '0.50.0', :ref => 'da5c7fcb980d39a2e0f71a7f132463c28ef8c665' }

data/app/assets/javascripts/admin/spree_editor.js

@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require_tree .
+//= require admin/spree_core
+//= require tinymce-jquery

data/app/assets/stylesheets/admin/spree_editor.css

@@ -0,0 +1,10 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+*/
+
+form.edit_product div.left { width: 67%; }
+form.edit_product div.right { width: 30%; }

data/app/overrides/add_rich_editor_link.rb

@@ -0,0 +1,7 @@
+Deface::Override.new(:virtual_path => "admin/configurations/index",
+                     :name => "add_rich_editor_link",
+                     :insert_after => "[data-hook='admin_configurations_menu'], #admin_configurations_menu[data-hook]",
+                     :text => "<tr>
+      <td><%= link_to t(\"rich_editor\"), admin_editor_settings_path %></td>
+      <td><%= t(\"rich_editor_description\") %></td>
+      </tr>")

data/app/overrides/add_rich_editor_tab.rb

@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => "admin/shared/_configuration_menu",
+                     :name => "add_rich_editor_tab",
+                     :insert_bottom => "[data-hook='admin_configurations_sidebar_menu'], #admin_configurations_sidebar_menu[data-hook]",
+                     :text => "<li<%== ' class=\"active\"' if controller.controller_name == 'editor_settings' %>><%= link_to t(\"rich_editor\"), admin_editor_settings_path %></li>")

data/app/overrides/include_rich_text_js.rb

@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => "layouts/admin",
+                     :name => "include_rich_text_js",
+                     :insert_after => "[data-hook='admin_inside_head'], #admin_inside_head[data-hook]",
+                     :text => "<%= render :partial => 'shared/rich_editor_javascript' %>")

data/app/views/shared/editor_engines/_tiny_mce.html.erb

@@ -1,6 +1,3 @@
-<script type="text/javascript" src="/javascripts/tinymce/tiny_mce.js"></script>
-<script type="text/javascript" src="/javascripts/tinymce/jquery.tinymce.js"></script>
-
 <script type="text/javascript">
     $(function() {
         var myConfig = { dompath: true };
@@ -11,28 +8,20 @@
                     mode : "exact",
                     elements : id,
                     theme : "advanced",
-                    language : '<%= I18n.locale.to_s.downcase %>',
+                    language : '<%= I18n.locale.to_s.split('-')[0].downcase %>',
                     skin : "o2k7",
+                    width : "594",
                     plugins : "safari,style,layer,table,advhr,advimage,inlinepopups,insertdatetime,preview,media,searchreplace,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template",
 
                     // Theme options
-                    theme_advanced_buttons1 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,fullscreen,|,charmap,media,advhr,|,visualchars,nonbreaking,blockquote",
-                    theme_advanced_buttons2 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,sub,sup,|,bullist,numlist,|,outdent,indent,blockquote,|,styleselect,formatselect,fontselect,fontsizeselect,|,forecolor,backcolor",
-                    theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid",
-                    theme_advanced_buttons4 : "",
+                    theme_advanced_buttons1 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,fullscreen,|,charmap,media,advhr,|,visualchars,blockquote",
+                    theme_advanced_buttons2 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,sub,sup,|,bullist,numlist,|,outdent,indent,blockquote,|,",
+                    theme_advanced_buttons3 : "styleselect,formatselect,fontselect,fontsizeselect,|,forecolor,backcolor",
+                    theme_advanced_buttons4 : "tablecontrols,|,hr,removeformat,visualaid",
                     theme_advanced_toolbar_location : "top",
                     theme_advanced_toolbar_align : "left",
                     theme_advanced_statusbar_location : "bottom",
-                    theme_advanced_resizing : true,
-
-                    // Example content CSS (should be your site CSS)
-                    content_css : "css/example.css",
-
-                    // Drop lists for link/image/media/template dialogs
-                    template_external_list_url : "js/template_list.js",
-                    external_link_list_url : "js/link_list.js",
-                    external_image_list_url : "js/image_list.js",
-                    media_external_list_url : "js/media_list.js",
+                    theme_advanced_resizing : false
                 });
             }
         });

data/app/views/shared/editor_engines/_wym_editor.html.erb

@@ -1,8 +1,14 @@
-<script type="text/javascript" src="/javascripts/wymeditor/jquery.wymeditor.min.js"></script>
+<%= javascript_include_tag 'admin/wymeditor/jquery.wymeditor.min.js' %>
 
 <script type="text/javascript">
   $(function() {
       var ids = [<%= ids.map{|id| "'textarea##{id}'"}.join(', ') %>]
-      $(ids.join(', ')).wymeditor({ lang: '<%= I18n.locale.to_s.downcase %>', skin: 'compact' });
+      $(ids.join(', ')).wymeditor({
+        lang: '<%= I18n.locale.to_s.downcase %>',
+        skin: 'compact',
+        updateSelector: 'form',
+        updateEvent: 'submit',
+        jQueryPath: 'https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js'
+      });
   });
 </script>

data/app/views/shared/editor_engines/_yui_rich_editor.html.erb

@@ -1,7 +1,3 @@
-<div class="editor-mask-container">
-  <div class="editor-mask"></div>
-  <div class="editor-mask-label"><%= t("editor.loading") %></div>
-</div>
 
 <!-- Skin CSS file -->
 
@@ -9,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.8.2r1/build/menu/assets/skins/sam/menu.css"/>
 <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.8.2r1/build/button/assets/skins/sam/button.css"/>
 <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.8.2r1/build/container/assets/skins/sam/container.css"/>
-<%= stylesheet_link_tag 'editor' %>
+<%= stylesheet_link_tag 'admin/spree_editor' %>
 
 <!-- Utility Dependencies -->
 <script src="http://yui.yahooapis.com/2.8.2r1/build/yahoo-dom-event/yahoo-dom-event.js"></script>
@@ -21,7 +17,7 @@
 <!-- Source file for Rich Text Editor-->
 <script src="http://yui.yahooapis.com/2.8.2r1/build/editor/editor-min.js"></script>
 
-<%= javascript_include_tag 'jquery.ocupload' %>
+<%= javascript_include_tag 'admin/jquery.ocupload' %>
 
 <script type="text/javascript">
     $(function() {

data/config/locales/en-AU.yml

@@ -0,0 +1,47 @@
+---
+en-AU:
+  editor:
+    align_center: Align Center
+    align_left: Align Left
+    align_right: Align Right
+    alignment: Alignment
+    background_color: Background Color
+    bold: Bold
+    create_an_ordered_list: Create an Ordered List
+    create_an_unordered_list: Create an Unordered List
+    edit_html_code: Edit HTML code
+    enter_file_name: Enter file name
+    font_name_and_size: Font Name and Size
+    font_color: Font Color
+    font_style: Font Style
+    footer: Footer
+    header: Header
+    hide_more_fields: Hide more fields
+    html_link: HTML Link
+    indenting_and_lists: "Indenting/Lists"
+    insert_item: Insert Item
+    insert_image: Insert Image
+    indent: Indent
+    italic: Italic
+    justify: Justify
+    loading: Loading
+    normal: Normal
+    outdent: Outdent
+    paragraph_style: Paragraph Style
+    remove_formatting: Remove Formatting
+    show_hide_hidden_elements: "Show/Hide Hidden Elements"
+    show_more_fields: Show more fields
+    sidebar: Sidebar
+    subscript: Subscript
+    superscript: Superscript
+    underline: Underline
+    upload: Upload
+    upload_image: Upload Image
+    upload_file: Upload File
+    
+  enable_rich_editor: "Enable Rich Editor"
+  rich_editor: "Rich Editor"
+  rich_editor_description: "Configure Rich Editor settings."
+  rich_editor_engine: "Rich Editor engine"
+  rich_editor_ids: "Rich Editor Identificators"
+  rich_editor_ids_description: "List textarea's ids splitted by spaces here"

data/lib/editor_configuration.rb

@@ -1,5 +1,5 @@
 class EditorConfiguration < Configuration
   preference :enabled, :boolean, :default => true
-  preference :current_editor, :string, :default => 'YUIRichEditor'
+  preference :current_editor, :string, :default => 'TinyMCE'
   preference :ids, :text, :default => 'product_description page_body'
 end

data/lib/generators/spree_editor/install_generator.rb

@@ -0,0 +1,15 @@
+module SpreeEditor
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+
+      def add_javascripts
+        append_file "app/assets/javascripts/admin/all.js", "//= require admin/spree_editor\n"
+      end
+
+      def add_stylesheets
+        inject_into_file "app/assets/stylesheets/admin/all.css", " *= require admin/spree_editor\n", :before => /\*\//, :verbose => true
+      end
+
+    end
+  end
+end

data/lib/spree_editor.rb

@@ -1,5 +1,4 @@
 require 'spree_core'
-require 'spree_editor_hooks'
 
 module SpreeEditor
   class Engine < Rails::Engine
@@ -7,12 +6,16 @@ module SpreeEditor
 
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
-        Rails.env.production? ? require(c) : load(c)
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
+
+      Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/**/*.rb")) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
       end
     end
 
     config.to_prepare &method(:activate).to_proc
   end
 
-  EditorEngines = %w(YUIRichEditor WYMEditor TinyMCE)
+  EditorEngines = %w(WYMEditor TinyMCE)
 end

data/spree_editor.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_editor'
-  s.version     = '0.50.1'
+  s.version     = '0.70.0'
   s.summary     = 'Adds support of several WYSIWYG editors to Spree'
   s.description = 'Atm supported: YUIRichEditor, WYMEditor, TinyMCE'
   s.required_ruby_version = '>= 1.8.7'
@@ -16,5 +16,6 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency('spree_core', '>= 0.40.0')
+  s.add_dependency('spree_core', '>= 0.70.0')
+  s.add_dependency('tinymce-rails', '>= 3.4.7')
 end

data/vendor/assets/javascripts/tinymce/langs/fr.js

@@ -0,0 +1 @@
+tinyMCE.addI18n({fr:{common:{"more_colors":"Plus de couleurs","invalid_data":"Erreur : saisie de valeurs incorrectes. Elles sont mises en \u00e9vidence en rouge.","popup_blocked":"D\u00e9sol\u00e9, nous avons d\u00e9tect\u00e9 que votre bloqueur de popup a bloqu\u00e9 une fen\u00eatre dont l\'application a besoin. Vous devez d\u00e9sactiver votre bloqueur de popup pour pouvoir utiliser cet outil.","clipboard_no_support":"Actuellement non support\u00e9 par votre navigateur.\n Veuillez utiliser les raccourcis clavier \u00e0 la place.","clipboard_msg":"Les fonctions Copier/Couper/Coller ne sont pas valables sur Mozilla et Firefox.\nSouhaitez-vous avoir plus d\'informations sur ce sujet ?","not_set":"-- non d\u00e9fini --","class_name":"Classe",browse:"parcourir",close:"Fermer",cancel:"Annuler",update:"Mettre \u00e0 jour",insert:"Ins\u00e9rer",apply:"Appliquer","edit_confirm":"Souhaitez-vous utiliser le mode WYSIWYG pour cette zone de texte ?","invalid_data_number":"{#field} doit \u00eatre un nombre","invalid_data_min":"{#field} doit \u00eatre un nombre plus grand que {#min}","invalid_data_size":"{#field} doit \u00eatre un nombre ou un pourcentage",value:"(valeur)"},contextmenu:{full:"Justifi\u00e9",right:"Droite",center:"Centr\u00e9",left:"Gauche",align:"Alignement"},insertdatetime:{"day_short":"Dim,Lun,Mar,Mer,Jeu,Ven,Sam,Dim","day_long":"Dimanche,Lundi,Mardi,Mercredi,Jeudi,Vendredi,Samedi,Dimanche","months_short":"Jan,F\u00e9v,Mar,Avr,Mai,Juin,Juil,Ao\u00fbt,Sep,Oct,Nov,D\u00e9c","months_long":"Janvier,F\u00e9vrier,Mars,Avril,Mai,Juin,Juillet,Ao\u00fbt,Septembre,Octobre,Novembre,D\u00e9cembre","inserttime_desc":"Ins\u00e9rer l\'heure","insertdate_desc":"Ins\u00e9rer la date","time_fmt":"%H:%M:%S","date_fmt":"%d-%m-%Y"},print:{"print_desc":"Imprimer"},preview:{"preview_desc":"Pr\u00e9visualiser"},directionality:{"rtl_desc":"\u00c9criture de droite \u00e0 gauche","ltr_desc":"\u00c9criture de gauche \u00e0 droite"},layer:{content:"Nouvelle couche\u2026","absolute_desc":"Activer le positionnement absolu","backward_desc":"D\u00e9placer vers l\'arri\u00e8re","forward_desc":"D\u00e9placer vers l\'avant","insertlayer_desc":"Ins\u00e9rer une nouvelle couche"},save:{"save_desc":"Enregistrer","cancel_desc":"Annuler toutes les modifications"},nonbreaking:{"nonbreaking_desc":"Ins\u00e9rer une espace ins\u00e9cable"},iespell:{download:"ieSpell n\'est pas install\u00e9. Souhaitez-vous l\'installer maintenant ?","iespell_desc":"Lancer le v\u00e9rificateur d\'orthographe"},advhr:{"delta_height":"Ecart de hauteur","delta_width":"Ecart de largeur","advhr_desc":"Ins\u00e9rer un trait horizontal"},emotions:{"delta_height":"delta_height","delta_width":"delta_width","emotions_desc":"\u00c9motic\u00f4nes"},searchreplace:{"replace_desc":"Rechercher / remplacer","search_desc":"Rechercher","delta_width":"","delta_height":""},advimage:{"image_desc":"Ins\u00e9rer / \u00e9diter une image","delta_width":"","delta_height":""},advlink:{"link_desc":"Ins\u00e9rer / \u00e9diter un lien","delta_height":"","delta_width":""},xhtmlxtras:{"attribs_desc":"Ins\u00e9rer / \u00e9diter les attributs","ins_desc":"Ins\u00e9r\u00e9","del_desc":"Barr\u00e9","acronym_desc":"Acronyme","abbr_desc":"Abr\u00e9viation","cite_desc":"Citation","attribs_delta_height":"","attribs_delta_width":"","ins_delta_height":"","ins_delta_width":"","del_delta_height":"","del_delta_width":"","acronym_delta_height":"","acronym_delta_width":"","abbr_delta_height":"","abbr_delta_width":"","cite_delta_height":"","cite_delta_width":""},style:{desc:"\u00c9diter la feuille de style (CSS)","delta_height":"","delta_width":""},paste:{"plaintext_mode":"Le collage est actuellement en mode texte non format\u00e9. Cliquez \u00e0 nouveau pour revenir en mode de collage ordinaire.","plaintext_mode_sticky":"Le collage est actuellement en mode texte non format\u00e9. Cliquez \u00e0 nouveau pour revenir en mode de collage ordinaire. Apr\u00e8s avoir coll\u00e9 quelque chose, vous retournerez en mode de collage ordinaire.","selectall_desc":"Tout s\u00e9lectionner","paste_word_desc":"Coller un texte cr\u00e9\u00e9 sous Word","paste_text_desc":"Coller comme texte brut"},"paste_dlg":{"word_title":"Utilisez CTRL+V sur votre clavier pour coller le texte dans la fen\u00eatre.","text_linebreaks":"Conserver les retours \u00e0 la ligne","text_title":"Utilisez CTRL+V sur votre clavier pour coller le texte dans la fen\u00eatre."},table:{cell:"Cellule",col:"Colonne",row:"Ligne",del:"Effacer le tableau","copy_row_desc":"Copier la ligne","cut_row_desc":"Couper la ligne","paste_row_after_desc":"Coller la ligne apr\u00e8s","paste_row_before_desc":"Coller la ligne avant","props_desc":"Propri\u00e9t\u00e9s du tableau","cell_desc":"Propri\u00e9t\u00e9s de la cellule","row_desc":"Propri\u00e9t\u00e9s de la ligne","merge_cells_desc":"Fusionner les cellules","split_cells_desc":"Scinder les cellules fusionn\u00e9es","delete_col_desc":"Effacer la colonne","col_after_desc":"Ins\u00e9rer une colonne apr\u00e8s","col_before_desc":"Ins\u00e9rer une colonne avant","delete_row_desc":"Effacer la ligne","row_after_desc":"Ins\u00e9rer une ligne apr\u00e8s","row_before_desc":"Ins\u00e9rer une ligne avant",desc:"Ins\u00e9rer un nouveau tableau","merge_cells_delta_height":"","merge_cells_delta_width":"","table_delta_height":"","table_delta_width":"","cellprops_delta_height":"","cellprops_delta_width":"","rowprops_delta_height":"","rowprops_delta_width":""},autosave:{"warning_message":"Si vous restaurez le contenu sauv\u00e9, vous perdrez le contenu qui est actuellement dans l\'\u00e9diteur.\n\n\u00cates-vous s\u00fbr de vouloir restaurer le contenu sauv\u00e9 ?","restore_content":"Restaurer le contenu auto-sauvegard\u00e9.","unload_msg":"Les modifications apport\u00e9es seront perdues si vous quittez cette page."},fullscreen:{desc:"Passer en mode plein \u00e9cran"},media:{edit:"\u00c9diter un m\u00e9dia incorpor\u00e9",desc:"Ins\u00e9rer / \u00e9diter un m\u00e9dia incorpor\u00e9","delta_height":"","delta_width":""},fullpage:{desc:"Propri\u00e9t\u00e9s du document","delta_width":"","delta_height":""},template:{desc:"Ins\u00e9rer un mod\u00e8le pr\u00e9d\u00e9fini."},visualchars:{desc:"Activer les caract\u00e8res de mise en page."},spellchecker:{desc:"Activer le v\u00e9rificateur d\'orthographe",menu:"Param\u00e8tres du v\u00e9rificateur d\'orthographe","ignore_word":"Ignorer le mot","ignore_words":"Tout ignorer",langs:"Langues",wait:"Veuillez patienter\u2026",sug:"Suggestions","no_sug":"Aucune suggestion","no_mpell":"Aucune erreur trouv\u00e9e.","learn_word":"Apprendre le mot"},pagebreak:{desc:"Ins\u00e9rer un saut de page."},advlist:{types:"Types",def:"D\u00e9faut","lower_alpha":"Alpha minuscule","lower_greek":"Grec minuscule","lower_roman":"Romain minuscule","upper_alpha":"Alpha majuscule","upper_roman":"Romain majuscule",circle:"Cercle",disc:"Disque",square:"Carr\u00e9"},colors:{"333300":"Olive fonc\u00e9","993300":"Orange br\u00fbl\u00e9","000000":"Noir","003300":"Vert fonc\u00e9","003366":"Azur fonc\u00e9","000080":"Bleu marine","333399":"Indigo","333333":"Gris tr\u00e8s fonc\u00e9","800000":"Bordeaux",FF6600:"Orange","808000":"Olive","008000":"Vert","008080":"Sarcelle","0000FF":"Bleu","666699":"Bleu gris\u00e2tre","808080":"Gris",FF0000:"Rouge",FF9900:"Ambre","99CC00":"Jaune vert","339966":"Mer verte","33CCCC":"Turquoise","3366FF":"Bleu royal","800080":"Violet","999999":"Gris moyen",FF00FF:"Magenta",FFCC00:"Or",FFFF00:"Jaune","00FF00":"Lime","00FFFF":"Bleu vert","00CCFF":"Bleu ciel","993366":"Brun",C0C0C0:"Argent",FF99CC:"Rose",FFCC99:"P\u00eache",FFFF99:"Jaune clair",CCFFCC:"Vert p\u00e2le",CCFFFF:"Cyan p\u00e2le","99CCFF":"Bleu ciel clair",CC99FF:"Prune",FFFFFF:"Blanc"},aria:{"rich_text_area":"Texte riche"},wordcount:{words:"Mots:"}}});

data/vendor/assets/javascripts/tinymce/plugins/advhr/langs/fr_dlg.js

@@ -0,0 +1 @@
+tinyMCE.addI18n('fr.advhr_dlg',{size:"Hauteur",noshade:"Pas d\'ombre",width:"Largeur",normal:"Normal",widthunits:"Unit\u00e9s"});