spree_editor 0.50.0 → 0.50.1

data/Versionfile

@@ -0,0 +1,3 @@
+"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/controllers/admin/editor_settings_controller.rb

@@ -1,14 +1,8 @@
 class Admin::EditorSettingsController < Admin::BaseController
   def update
-    preferences = params[:preferences] || {}
-    enable_editor = preferences[:enabled].nil? ? false : true;
-    preferences.update(:enabled => enable_editor)
-    Spree::Editor::Config.set(preferences)
-
-    respond_to do |format|
-      format.html {
-        redirect_to admin_editor_settings_path
-      }
-    end
+    @config = Spree::Editor::Config.instance
+    @config.update_attributes(params[@config.class.name.underscore])
+    Rails.cache.delete("configuration_#{@config.class.name}".to_sym)
+    redirect_to admin_editor_settings_path
   end
-end
+end

data/app/views/admin/editor_settings/edit.html.erb

@@ -2,22 +2,23 @@
 
 <h1><%= t('rich_editor') %></h1>
 
-<%= form_tag(admin_editor_settings_path, :method => :put) do %>
-    <p>
-      <label><%= t('enable_rich_editor') %>:</label>
-      <%= check_box_tag('preferences[enabled]', '1', Spree::Editor::Config[:enabled]) %>
-    </p>
-    <p>
-      <label><%= t('rich_editor_engine') %>:</label>
-      <%= select_tag 'preferences[current_editor]', options_for_select(SpreeEditor::EditorEngines, Spree::Editor::Config[:current_editor])  %>
-    </p>
-    <p>
-      <label><%= t('rich_editor_ids') %>:</label>
-      <%= text_field_tag 'preferences[ids]', Spree::Editor::Config[:ids] %>
-      <small><%= t('rich_editor_ids_description') %></small>
-    </p>
-    <p class="form-buttons">
-      <%= button t('update') %>
-      <%= t("or") %> <%= link_to t("cancel"), admin_editor_settings_url %>
-    </p>
-<% end %>
+<%= form_for(Spree::Editor::Config.instance, :url => admin_editor_settings_path) do |form| %>
+  <fieldset id="preferences">
+    <%= form.field_container :preferred_current_editor do %>
+      <%= form.label(:preferred_current_editor, t('rich_editor_engine')) %>
+      <%= form.select :preferred_current_editor, options_for_select(SpreeEditor::EditorEngines, Spree::Editor::Config[:current_editor])  %>
+    <% end %>
+    <%= form.field_container :preferred_enabled do %>
+      <%= preference_field(form, :preferred_enabled, :type => :boolean) %>
+      <%= form.label(:preferred_enabled, t(:enable_rich_editor)) %>
+    <% end %>
+    <%= form.field_container :preferred_ids do %>
+      <%= form.label(:preferred_ids, t(:rich_editor_ids_description)+": ") + tag(:br) %>
+      <%= preference_field(form, :preferred_ids, :type => :text) %>
+    <% end %>
+  </fieldset>
+  <p class="form-buttons">
+    <%= button t('update') %>
+    <%= t("or") %> <%= link_to t("cancel"), admin_editor_settings_url %>
+  </p>
+<% end %>

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

@@ -6,19 +6,19 @@
         var myConfig = { dompath: true };
         var ids = [<%= ids.map{|id| "'#{id}'"}.join(', ') %>]
         $.each(ids, function(index, id) {
-            if ($('textarea#' + id)) {
+            if ($('textarea#' + id).length) {
                 tinyMCE.init({
-                    // General options
-                    language : '<%= I18n.locale.to_s.downcase %>',
-                    element : id,
-                    mode : "textareas",
+                    mode : "exact",
+                    elements : id,
                     theme : "advanced",
-                    plugins : "table,inlinepopups",
+                    language : '<%= I18n.locale.to_s.downcase %>',
+                    skin : "o2k7",
+                    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 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,|,table,removeformat,code",
-                    theme_advanced_buttons2 : "",
-                    theme_advanced_buttons3 : "",
+                    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_toolbar_location : "top",
                     theme_advanced_toolbar_align : "left",
@@ -26,32 +26,15 @@
                     theme_advanced_resizing : true,
 
                     // Example content CSS (should be your site CSS)
-                    content_css : "/js/tinymce/examples/css/content.css",
-
-                    // Style formats
-                    style_formats : [
-                        {title : 'Bold text', inline : 'b'},
-                        {title : 'Red text', inline : 'span', styles : {color : '#ff0000'}},
-                        {title : 'Red header', block : 'h1', styles : {color : '#ff0000'}},
-                        {title : 'Example 1', inline : 'span', classes : 'example1'},
-                        {title : 'Example 2', inline : 'span', classes : 'example2'},
-                        {title : 'Table styles'},
-                        {title : 'Table row 1', selector : 'tr', classes : 'tablerow1'}
-                    ],
+                    content_css : "css/example.css",
 
-                    formats : {
-                        alignleft : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'left'},
-                        aligncenter : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'center'},
-                        alignright : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'right'},
-                        alignfull : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'full'},
-                        bold : {inline : 'span', 'classes' : 'bold'},
-                        italic : {inline : 'span', 'classes' : 'italic'},
-                        underline : {inline : 'span', 'classes' : 'underline', exact : true},
-                        strikethrough : {inline : 'del'},
-                        customformat : {inline : 'span', styles : {color : '#00ff00', fontSize : '20px'}, attributes : {title : 'My custom format'}}
-                    }
+                    // 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",
                 });
             }
         });
     });
-</script>
+</script>

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

@@ -25,11 +25,14 @@
 
 <script type="text/javascript">
     $(function() {
+        var Dom = YAHOO.util.Dom,
+  	        Event = YAHOO.util.Event;
         var myConfig = { dompath: true };
         var ids = [<%= ids.map{|id| "'#{id}'"}.join(', ') %>];
         $.each(ids, function(index, id) {
-            if ($('textarea#' + id)) {
-                window[id + '_editor'] = new YAHOO.widget.Editor(id, {
+            if ($('textarea#' + id).length) {
+                var state = 'off';
+                var newEditor = window[id + '_editor'] = new YAHOO.widget.Editor(id, {
                     height: '350px',
                     width: 'auto',
                     animate: true,
@@ -113,7 +116,8 @@
                             { group: 'insertitem', label: '<%= t("editor.insert_item") %>',
                                 buttons: [
                                     { type: 'push', label: '<%= t("editor.html_link") %> CTRL + SHIFT + L', value: 'createlink', disabled: true },
-                                    { type: 'push', label: '<%= t("editor.insert_image") %>', value: 'insertimage' }
+                                    { type: 'push', label: '<%= t("editor.insert_image") %>', value: 'insertimage' },
+                                    { type: 'push', label: '<%= t("editor.edit_html_code") %>', value: 'editcode' }
                                 ]
                             },
                             { type: 'separator' },
@@ -128,7 +132,7 @@
                     }
                 });
 
-                window[id + '_editor'].addListener('editorContentLoaded', function() {
+                newEditor.addListener('editorContentLoaded', function() {
                     $(".yui-toolbar-imageUpload").upload({
                         name: 'content_image[attachment]',
                         action: '/content_images',
@@ -140,7 +144,7 @@
                         },
                         onComplete: function(image_src) {
                             var img_html = "<img src='" + image_src + "'/>";
-                            window[id + '_editor'].execCommand('inserthtml', img_html);
+                            newEditor.execCommand('inserthtml', img_html);
                             $(".editor-mask-container").removeClass("active");
                         }
                     });
@@ -160,12 +164,61 @@
                             $(".editor-mask-container").removeClass("active");
                             var file_name = prompt('<%= t("editor.enter_file_name") %>', file_name_original);
                             var link_html = "<a href='" + file_url + "'/>" + file_name + "</a>";
-                            window[id + '_editor'].execCommand('inserthtml', link_html);
+                            newEditor.execCommand('inserthtml', link_html);
                         }
                     });
                 });
 
-                window[id + '_editor'].render();
+
+                newEditor.on('toolbarLoaded', function() {
+          	        this.toolbar.on('editcodeClick', function() {
+          	            var ta = this.get('element'),
+          	                iframe = this.get('iframe').get('element');
+
+          	            if (state == 'on') {
+          	                state = 'off';
+          	                this.toolbar.set('disabled', false);
+          	                this.setEditorHTML(ta.value);
+          	                if (!this.browser.ie) {
+          	                    this._setDesignMode('on');
+          	                }
+
+          	                Dom.removeClass(iframe, 'editor-hidden');
+          	                Dom.addClass(ta, 'editor-hidden');
+          	                this.show();
+          	                this._focusWindow();
+          	            } else {
+          	                state = 'on';
+          	                this.cleanHTML();
+          	                Dom.addClass(iframe, 'editor-hidden');
+          	                Dom.removeClass(ta, 'editor-hidden');
+          	                this.toolbar.set('disabled', true);
+          	                this.toolbar.getButtonByValue('editcode').set('disabled', false);
+          	                this.toolbar.selectButton('editcode');
+          	                this.dompath.innerHTML = 'Editing HTML Code';
+          	                this.hide();
+          	            }
+          	            return false;
+          	        }, this, true);
+
+          	        this.on('cleanHTML', function(ev) {
+          	            this.get('element').value = ev.html;
+          	        }, this, true);
+
+          	        this.on('afterRender', function() {
+          	            var wrapper = this.get('editor_wrapper');
+          	            wrapper.appendChild(this.get('element'));
+          	            this.setStyle('width', '100%');
+          	            this.setStyle('height', '100%');
+          	            this.setStyle('visibility', '');
+          	            this.setStyle('top', '');
+          	            this.setStyle('left', '');
+          	            this.setStyle('position', '');
+
+          	            this.addClass('editor-hidden');
+          	        }, this, true);
+                }, newEditor, true);
+                newEditor.render();
             }
         });
     });

data/config/locales/en.yml

@@ -9,6 +9,7 @@ en:
     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

data/config/locales/es.yml

@@ -0,0 +1,45 @@
+es:
+  editor:
+    align_center: Centrado
+    align_left: Alineación izquierda
+    align_right: Alineación derecha
+    alignment: Alineación
+    background_color: Color de fondo
+    bold: Negrita
+    create_an_ordered_list: Crear lista ordenada
+    create_an_unordered_list: Crear lista desordenada
+    enter_file_name: Nombre del archivo
+    font_name_and_size: Nombre y tamaño de la fuente
+    font_color: Color de la fuente
+    font_style: Estilo de  la fuente
+    footer: Pie
+    header: Cabecera
+    hide_more_fields: Ocultar más campos
+    html_link: Enlace HTML
+    indenting_and_lists: "Tabulaciones y listas"
+    insert_item: Insertar elemento
+    insert_image: Insertar imagen
+    indent: Tabular hacia dentro
+    italic: Cursiva
+    justify: Justificar
+    loading: Cargando
+    normal: Normal
+    outdent: Tabular hacia fuera
+    paragraph_style: Estilo de párrafo
+    remove_formatting: Eliminar formato
+    show_hide_hidden_elements: "Mostrar/ocultar elementos ocultos"
+    show_more_fields: Mostrar más campos
+    sidebar: Barra lateral
+    subscript: Subíndice
+    superscript: Superíndice
+    underline: Subrayar
+    upload: Subir
+    upload_image: Subir imagen
+    upload_file: Subir fichero
+
+  enable_rich_editor: "Activar editor avanzado"
+  rich_editor: "Editor avanzado"
+  rich_editor_description: "Configurar opciones del editor."
+  rich_editor_engine: "Motor del editor avanzado"
+  rich_editor_ids: "Identificadores del editor avanzado"
+  rich_editor_ids_description: "Listar aquí los ids de los textareas, separados por espacios"

data/config/locales/ru.yml

@@ -9,10 +9,12 @@ ru:
     bold: Полужирный
     create_an_ordered_list: Нумерованный список
     create_an_unordered_list: Ненумерованный список
+    edit_html_code: Редактировать HTML код
     enter_file_name: Введите имя файла
     font_name_and_size: Шрифт и размер
     font_color: Цвет шрифта
     font_style: Стиль шрифта
+    footer: Сноска
     header: Заголовок
     hide_more_fields: Скрыть дополнительные поля
     html_link: HTML ссылка

data/lib/editor_configuration.rb

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

data/public/javascripts/tinymce/langs/en.js

@@ -12,9 +12,54 @@ not_set:"-- Not set --",
 clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",
 clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",
 popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",
-invalid_data:"Error: Invalid values entered, these are marked in red.",
+invalid_data:"{#field} is invalid",
+invalid_data_number:"{#field} must be a number",
+invalid_data_min:"{#field} must be a number greater than {#min}",
+invalid_data_size:"{#field} must be a number or percentage",
 more_colors:"More colors"
 },
+colors:{
+'000000':'Black',
+'993300':'Burnt orange',
+'333300':'Dark olive',
+'003300':'Dark green',
+'003366':'Dark azure',
+'000080':'Navy Blue',
+'333399':'Indigo',
+'333333':'Very dark gray',
+'800000':'Maroon',
+'FF6600':'Orange',
+'808000':'Olive',
+'008000':'Green',
+'008080':'Teal',
+'0000FF':'Blue',
+'666699':'Grayish blue',
+'808080':'Gray',
+'FF0000':'Red',
+'FF9900':'Amber',
+'99CC00':'Yellow green',
+'339966':'Sea green',
+'33CCCC':'Turquoise',
+'3366FF':'Royal blue',
+'800080':'Purple',
+'999999':'Medium gray',
+'FF00FF':'Magenta',
+'FFCC00':'Gold',
+'FFFF00':'Yellow',
+'00FF00':'Lime',
+'00FFFF':'Aqua',
+'00CCFF':'Sky blue',
+'993366':'Brown',
+'C0C0C0':'Silver',
+'FF99CC':'Pink',
+'FFCC99':'Peach',
+'FFFF99':'Light yellow',
+'CCFFCC':'Pale green',
+'CCFFFF':'Pale cyan',
+'99CCFF':'Light sky blue',
+'CC99FF':'Plum',
+'FFFFFF':'White'
+},
 contextmenu:{
 align:"Alignment",
 left:"Left",
@@ -151,7 +196,8 @@ langs:"Languages",
 wait:"Please wait...",
 sug:"Suggestions",
 no_sug:"No suggestions",
-no_mpell:"No misspellings found."
+no_mpell:"No misspellings found.",
+learn_word:"Learn word" 
 },
 pagebreak:{
 desc:"Insert page break."
@@ -167,4 +213,11 @@ upper_roman:"Upper roman",
 circle:"Circle",
 disc:"Disc",
 square:"Square"
-}}});
+},
+aria:{
+rich_text_area:"Rich Text Area"
+},
+wordcount:{
+words: 'Words: '
+}
+}});

data/public/javascripts/tinymce/plugins/advhr/langs/en_dlg.js

@@ -1,5 +1,7 @@
 tinyMCE.addI18n('en.advhr_dlg',{
+normal:"Normal",
 width:"Width",
+widthunits:"Units",
 size:"Height",
 noshade:"No shadow"
 });

data/public/javascripts/tinymce/plugins/advhr/rule.htm

@@ -8,43 +8,44 @@
 	<script type="text/javascript" src="../../utils/form_utils.js"></script>
 	<link href="css/advhr.css" rel="stylesheet" type="text/css" />
 </head>
-<body>
+<body role="application">
 <form onsubmit="AdvHRDialog.update();return false;" action="#">
 	<div class="tabs">
 		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advhr.advhr_desc}</a></span></li>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advhr.advhr_desc}</a></span></li>
 		</ul>
 	</div>
 
 	<div class="panel_wrapper">
 		<div id="general_panel" class="panel current">
-			<table border="0" cellpadding="4" cellspacing="0">
-                    <tr>
-                        <td><label for="width">{#advhr_dlg.width}</label></td>
-                        <td class="nowrap">
-                            <input id="width" name="width" type="text" value="" class="mceFocus" />
-                            <select name="width2" id="width2">
-                                <option value="">px</option>
-                                <option value="%">%</option>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><label for="size">{#advhr_dlg.size}</label></td>
-                        <td><select id="size" name="size">
-                            <option value="">Normal</option>
-                            <option value="1">1</option>
-                            <option value="2">2</option>
-                            <option value="3">3</option>
-                            <option value="4">4</option>
-                            <option value="5">5</option>
-                        </select></td>
-                    </tr>
-                    <tr>
-                        <td><label for="noshade">{#advhr_dlg.noshade}</label></td>
-                        <td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>
-                    </tr>
-            </table>
+			<table role="presentation" border="0" cellpadding="4" cellspacing="0">
+					<tr role="group" aria-labelledby="width_label">
+						<td><label id="width_label" for="width">{#advhr_dlg.width}</label></td>
+						<td class="nowrap">
+							<input id="width" name="width" type="text" value="" class="mceFocus" />
+							<span style="display:none;" id="width_unit_label">{#advhr_dlg.widthunits}</span>
+							<select name="width2" id="width2" aria-labelledby="width_unit_label">
+								<option value="">px</option>
+								<option value="%">%</option>
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<td><label for="size">{#advhr_dlg.size}</label></td>
+						<td><select id="size" name="size">
+							<option value="">{#advhr_dlg.normal}</option>
+							<option value="1">1</option>
+							<option value="2">2</option>
+							<option value="3">3</option>
+							<option value="4">4</option>
+							<option value="5">5</option>
+						</select></td>
+					</tr>
+					<tr>
+						<td><label for="noshade">{#advhr_dlg.noshade}</label></td>
+						<td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>
+					</tr>
+			</table>
 		</div>
 	</div>