comfortable_mexican_sofa 1.5.11 → 1.6.0

data/test/unit/tags/page_string_test.rb

@@ -6,15 +6,15 @@ class PageStringTagTest < ActiveSupport::TestCase
     assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
       cms_pages(:default), '{{ cms:page:content:string }}'
     )
-    assert_equal 'content', tag.label
+    assert_equal 'content', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
       cms_pages(:default), '{{cms:page:content:string}}'
     )
-    assert_equal 'content', tag.label
+    assert_equal 'content', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
       cms_pages(:default), '{{cms:page:dash-content:string}}'
     )
-    assert_equal 'dash-content', tag.label
+    assert_equal 'dash-content', tag.identifier
   end
   
   def test_initialize_tag_failure

data/test/unit/tags/page_text_test.rb

@@ -6,19 +6,19 @@ class PageTextTagTest < ActiveSupport::TestCase
     assert tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
       cms_pages(:default), '{{ cms:page:content:text }}'
     )
-    assert_equal 'content', tag.label
+    assert_equal 'content', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
       cms_pages(:default), '{{cms:page:content}}'
     )
-    assert_equal 'content', tag.label
+    assert_equal 'content', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
       cms_pages(:default), '{{cms:page:content:text}}'
     )
-    assert_equal 'content', tag.label
+    assert_equal 'content', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
       cms_pages(:default), '{{cms:page:dash-content}}'
     )
-    assert_equal 'dash-content', tag.label
+    assert_equal 'dash-content', tag.identifier
   end
   
   def test_initialize_tag_failure

data/test/unit/tags/partial_test.rb

@@ -6,22 +6,22 @@ class PartialTagTest < ActiveSupport::TestCase
     assert tag = ComfortableMexicanSofa::Tag::Partial.initialize_tag(
       cms_pages(:default), '{{ cms:partial:partial_name }}'
     )
-    assert_equal 'partial_name', tag.label
+    assert_equal 'partial_name', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::Partial.initialize_tag(
       cms_pages(:default), '{{cms:partial:path/to/partial}}'
     )
-    assert_equal 'path/to/partial', tag.label
+    assert_equal 'path/to/partial', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::Partial.initialize_tag(
       cms_pages(:default), '{{cms:partial:path/to/dashed-partial}}'
     )
-    assert_equal 'path/to/dashed-partial', tag.label
+    assert_equal 'path/to/dashed-partial', tag.identifier
   end
   
   def test_initialize_tag_with_parameters
     assert tag = ComfortableMexicanSofa::Tag::Partial.initialize_tag(
       cms_pages(:default), '{{cms:partial:path/to/partial:param1:param2}}'
     )
-    assert tag.label = 'path/to/partial'
+    assert tag.identifier = 'path/to/partial'
     assert tag.params = 'param1:param2'
   end
   

data/test/unit/tags/snippet_test.rb

@@ -6,15 +6,15 @@ class SnippetTagTest < ActiveSupport::TestCase
     assert tag = ComfortableMexicanSofa::Tag::Snippet.initialize_tag(
       cms_pages(:default), '{{ cms:snippet:label }}'
     )
-    assert_equal 'label', tag.label
+    assert_equal 'label', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::Snippet.initialize_tag(
       cms_pages(:default), '{{cms:snippet:label}}'
     )
-    assert_equal 'label', tag.label
+    assert_equal 'label', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::Snippet.initialize_tag(
       cms_pages(:default), '{{cms:snippet:dash-label}}'
     )
-    assert_equal 'dash-label', tag.label
+    assert_equal 'dash-label', tag.identifier
   end
   
   def test_initialize_tag_failure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.5.11
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000Z
+date: 2011-12-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70264886592940 !ruby/object:Gem::Requirement
+  requirement: &70322361500400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70264886592940
+  version_requirements: *70322361500400
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70264886591540 !ruby/object:Gem::Requirement
+  requirement: &70322361499680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,18 +33,18 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70264886591540
+  version_requirements: *70322361499680
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70264886588600 !ruby/object:Gem::Requirement
+  requirement: &70322361498520 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70264886588600
+  version_requirements: *70322361498520
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -61,6 +61,31 @@ files:
 - VERSION
 - app/assets/images/comfortable_mexican_sofa/arrow_bottom.gif
 - app/assets/images/comfortable_mexican_sofa/arrow_right.gif
+- app/assets/images/comfortable_mexican_sofa/checkerboard.gif
+- app/assets/images/comfortable_mexican_sofa/elrte/elrte-toolbar.png
+- app/assets/images/comfortable_mexican_sofa/elrte/google-maps.png
+- app/assets/images/comfortable_mexican_sofa/elrte/iframe.png
+- app/assets/images/comfortable_mexican_sofa/elrte/media-director.png
+- app/assets/images/comfortable_mexican_sofa/elrte/media-flash.png
+- app/assets/images/comfortable_mexican_sofa/elrte/media-quicktime.png
+- app/assets/images/comfortable_mexican_sofa/elrte/media-realaudio.png
+- app/assets/images/comfortable_mexican_sofa/elrte/media-rutube.png
+- app/assets/images/comfortable_mexican_sofa/elrte/media-vimeo.png
+- app/assets/images/comfortable_mexican_sofa/elrte/media-winmedia.png
+- app/assets/images/comfortable_mexican_sofa/elrte/media-youtube.png
+- app/assets/images/comfortable_mexican_sofa/elrte/outline-div.png
+- app/assets/images/comfortable_mexican_sofa/elrte/outline-p.png
+- app/assets/images/comfortable_mexican_sofa/elrte/pagebreak.gif
+- app/assets/images/comfortable_mexican_sofa/elrte/pixel.gif
+- app/assets/images/comfortable_mexican_sofa/elrte/smileys/evilgrin.png
+- app/assets/images/comfortable_mexican_sofa/elrte/smileys/grin.png
+- app/assets/images/comfortable_mexican_sofa/elrte/smileys/happy.png
+- app/assets/images/comfortable_mexican_sofa/elrte/smileys/smile.png
+- app/assets/images/comfortable_mexican_sofa/elrte/smileys/surprised.png
+- app/assets/images/comfortable_mexican_sofa/elrte/smileys/tongue.png
+- app/assets/images/comfortable_mexican_sofa/elrte/smileys/unhappy.png
+- app/assets/images/comfortable_mexican_sofa/elrte/smileys/waii.png
+- app/assets/images/comfortable_mexican_sofa/elrte/smileys/wink.png
 - app/assets/images/comfortable_mexican_sofa/icon_layout.gif
 - app/assets/images/comfortable_mexican_sofa/icon_move.gif
 - app/assets/images/comfortable_mexican_sofa/icon_regular.gif
@@ -79,55 +104,23 @@ files:
 - app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_454545_256x240.png
 - app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_888888_256x240.png
 - app/assets/images/comfortable_mexican_sofa/jquery_ui/ui-icons_cd0a0a_256x240.png
-- app/assets/images/comfortable_mexican_sofa/wym_icons.png
+- app/assets/images/comfortable_mexican_sofa/x.png
 - app/assets/javascripts/comfortable_mexican_sofa/application.js
 - app/assets/javascripts/comfortable_mexican_sofa/codemirror/codemirror.js
+- app/assets/javascripts/comfortable_mexican_sofa/elrte/elrte.codemirror.js
+- app/assets/javascripts/comfortable_mexican_sofa/elrte/elrte.js
+- app/assets/javascripts/comfortable_mexican_sofa/elrte/elrte.sofa_image.js
+- app/assets/javascripts/comfortable_mexican_sofa/elrte/elrte.sofa_link.js
 - app/assets/javascripts/comfortable_mexican_sofa/jquery.js
 - app/assets/javascripts/comfortable_mexican_sofa/jquery_ui.js
 - app/assets/javascripts/comfortable_mexican_sofa/jquery_ui_timepicker.js
 - app/assets/javascripts/comfortable_mexican_sofa/rails.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-blockquote.png
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h1.png
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h2.png
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h3.png
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h4.png
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h5.png
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h6.png
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-p.png
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-pre.png
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/wymiframe.css
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/wymiframe.html
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.embed.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.pack.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/bg.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/ca.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/cs.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/cy.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/de.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/en.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/es.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/fa.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/fi.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/fr.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/gl.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/he.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/hr.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/hu.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/it.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/nb.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/nl.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/nn.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/pl.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/pt-br.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/pt.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/ru.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/sv.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/tr.js
-- app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/zh_cn.js
 - app/assets/stylesheets/comfortable_mexican_sofa/application.css
 - app/assets/stylesheets/comfortable_mexican_sofa/codemirror.css
 - app/assets/stylesheets/comfortable_mexican_sofa/content.css
+- app/assets/stylesheets/comfortable_mexican_sofa/dialogs.css
+- app/assets/stylesheets/comfortable_mexican_sofa/elrte.css
+- app/assets/stylesheets/comfortable_mexican_sofa/files.css
 - app/assets/stylesheets/comfortable_mexican_sofa/form.css
 - app/assets/stylesheets/comfortable_mexican_sofa/jquery_ui.css
 - app/assets/stylesheets/comfortable_mexican_sofa/reset.css
@@ -137,6 +130,7 @@ files:
 - app/controllers/application_controller.rb
 - app/controllers/cms_admin/base_controller.rb
 - app/controllers/cms_admin/categories_controller.rb
+- app/controllers/cms_admin/dialogs_controller.rb
 - app/controllers/cms_admin/files_controller.rb
 - app/controllers/cms_admin/layouts_controller.rb
 - app/controllers/cms_admin/pages_controller.rb
@@ -162,6 +156,8 @@ files:
 - app/views/cms_admin/categories/destroy.js.erb
 - app/views/cms_admin/categories/edit.js.erb
 - app/views/cms_admin/categories/update.js.erb
+- app/views/cms_admin/dialogs/image.html.erb
+- app/views/cms_admin/dialogs/link.html.erb
 - app/views/cms_admin/files/_file.html.erb
 - app/views/cms_admin/files/_form.html.erb
 - app/views/cms_admin/files/_index.html.erb
@@ -235,6 +231,7 @@ files:
 - db/migrate/upgrades/04_upgrade_to_1_3_0.rb
 - db/migrate/upgrades/05_upgrade_to_1_4_0.rb
 - db/migrate/upgrades/06_upgrade_to_1_5_0.rb
+- db/migrate/upgrades/07_upgrade_to_1_6_0.rb
 - db/seeds.rb
 - doc/preview.png
 - doc/sofa.png
@@ -287,6 +284,7 @@ files:
 - test/fixtures/cms/revisions.yml
 - test/fixtures/cms/sites.yml
 - test/fixtures/cms/snippets.yml
+- test/fixtures/files/data.zip
 - test/fixtures/files/document.pdf
 - test/fixtures/files/image.gif
 - test/fixtures/files/image.jpg
@@ -296,6 +294,7 @@ files:
 - test/fixtures/views/render_test/render_layout.html.erb
 - test/functional/cms_admin/base_controller_test.rb
 - test/functional/cms_admin/categories_controller_test.rb
+- test/functional/cms_admin/dialogs_controller_test.rb
 - test/functional/cms_admin/files_controller_test.rb
 - test/functional/cms_admin/layouts_controller_test.rb
 - test/functional/cms_admin/pages_controller_test.rb
@@ -303,8 +302,8 @@ files:
 - test/functional/cms_admin/sites_controller_test.rb
 - test/functional/cms_admin/snippets_controller_test.rb
 - test/functional/cms_content_controller_test.rb
-- test/gemfiles/Gemfile.rails-3.0.10
-- test/gemfiles/Gemfile.rails-3.1.1
+- test/gemfiles/Gemfile.rails-3.0
+- test/gemfiles/Gemfile.rails-3.1
 - test/integration/authentication_test.rb
 - test/integration/fixtures_test.rb
 - test/integration/mirrors_test.rb
@@ -359,7 +358,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3416423876498059333
+      hash: -3203141432806971480
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/wymiframe.css

@@ -1,52 +0,0 @@
-/* Reset */
-html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;}
-
-body {
-  padding: 5px;
-  background: #fff;
-  font: 14px Arial, sans-serif;
-}
- 
-p, h1, h2, h3, h4, h5, h6, ul, ol, table, blockquote, pre { 
-  outline: 1px dotted #e1e1e1;
-  background: #fff no-repeat 2px 2px;
-  padding: 5px;
-  margin-bottom: 10px;
-}
-
-h1 { font: bold 24px Times, serif }
-h2 { font: bold 20px Times, serif }
-h3 { font: bold 16px Times, serif }
-
-p { letter-spacing: 0.5px }
-
-ul, ol  { margin-left: 25px }
-ul li   { list-style: disc }
-ol li   { list-style: decimal }
-
-table {
-  width: 100%;
-}
-th, td {
-  height: 20px;
-  width: 20px;
-  border: 1px dotted #ccc;
-}
-
-p           { background-image: url(lbl-p.png); }
-h1          { background-image: url(lbl-h1.png); }
-h2          { background-image: url(lbl-h2.png); }
-h3          { background-image: url(lbl-h3.png); }
-h4          { background-image: url(lbl-h4.png); }
-h5          { background-image: url(lbl-h5.png); }
-h6          { background-image: url(lbl-h6.png); }
-blockquote  { background-image: url(lbl-blockquote.png); }
-pre         { background-image: url(lbl-pre.png); }
-
-/* Custom Classes */
-*.align_left    { float: left }
-*.align_center  { display: block; margin: auto }
-*.align_right   { float: right }
-p.align_left    { float: none; text-align: left }
-p.align_center  { float: none; text-align: center }
-p.align_right   { float: none; text-align: right }

data/app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/wymiframe.html

@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!--
- * WYMeditor : what you see is What You Mean web-based editor
- * Copyright (c) 2005 - 2009 Jean-Francois Hovinne, http://www.wymeditor.org/
- * Dual licensed under the MIT (MIT-license.txt)
- * and GPL (GPL-license.txt) licenses.
- *
- * For further information visit:
- *        http://www.wymeditor.org/
- *
- * File Name:
- *        wymiframe.html
- *        Iframe used by designMode.
- *        See the documentation for more info.
- *
- * File Authors:
- *        Jean-Francois Hovinne (jf.hovinne a-t wymeditor dotorg)
--->
-<html>
-<head>
-<title>WYMeditor iframe</title>
-<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
-<link rel="stylesheet" type="text/css" media="screen" href="wymiframe.css" />
-</head>
-<body class="wym_iframe"></body>
-</html>

data/app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js

@@ -1,342 +0,0 @@
-//= require comfortable_mexican_sofa/wymeditor/jquery.wymeditor.embed.js
-
-// -- Options overrides -----------------------------------------------------
-var cms_wym_options = {
-  
-  initSkin:         false,
-  lang:             $('meta[name="cms-locale"]').attr('content'),
-  
-  basePath:   $('meta[name="cms-js-assets-base-path"]').attr('content') + '/wymeditor/',
-  wymPath:    'disabled',
-  jQueryPath: 'disabled',
-  
-  updateSelector:    'form',
-  updateEvent:       'submit',
-  
-  containersItems: [
-    { 'name': 'H1',   'title': 'Heading_1',     'css': 'wym_containers_h1' },
-    { 'name': 'H2',   'title': 'Heading_2',     'css': 'wym_containers_h2' },
-    { 'name': 'H3',   'title': 'Heading_3',     'css': 'wym_containers_h3' },
-    { 'name': 'P',    'title': 'Paragraph',     'css': 'wym_containers_p' },
-    { 'name': 'PRE',  'title': 'Preformatted',  'css': 'wym_containers_pre' }
-  ],
-  
-  toolsItems: [
-    { 'name': 'Bold',                 'title': 'Strong',          'css': 'wym_tools_strong' }, 
-    { 'name': 'Italic',               'title': 'Emphasis',        'css': 'wym_tools_emphasis' },
-    { 'name': 'InsertOrderedList',    'title': 'Ordered_List',    'css': 'wym_tools_ordered_list' },
-    { 'name': 'InsertUnorderedList',  'title': 'Unordered_List',  'css': 'wym_tools_unordered_list' },
-    { 'name': 'InsertTable',          'title': 'Table',           'css': 'wym_tools_table' },
-    { 'name': 'CreateLink',           'title': 'Link',            'css': 'wym_tools_link' },
-    { 'name': 'Unlink',               'title': 'Unlink',          'css': 'wym_tools_unlink' },
-    { 'name': 'InsertImage',          'title': 'Image',           'css': 'wym_tools_image' },
-    { 'name': 'Paste',                'title': 'Paste_From_Word', 'css': 'wym_tools_paste' },
-    { 'name': 'ToggleHtml',           'title': 'HTML',            'css': 'wym_tools_html' }
-  ],
-  
-  classesItems: [
-    { 'name': 'align_left',    'title': 'Align_Left',    'expr': '*' },
-    { 'name': 'align_center',  'title': 'Align_Center',  'expr': '*' },
-    { 'name': 'align_right',   'title': 'Align_Left',    'expr': '*' }
-  ],
-  
-  dialog:           jQuery(jQuery('#cms_dialog').get(0) || jQuery('<div id="cms_dialog"></div>')),
-  
-  boxHtml:            '<div class="wym_box">'
-                    +   '<div class="wym_toolbar">'
-                    +     WYMeditor.CONTAINERS
-                    +     WYMeditor.CLASSES
-                    +     WYMeditor.TOOLS
-                    +   '</div>'
-                    +   '<div class="wym_area_main">'
-                    +     WYMeditor.HTML
-                    +     WYMeditor.IFRAME
-                    +   '</div>'
-                    + '</div>',
-                    
-  containersHtml:     '<ul class="wym_containers wym_toolbar_section">'
-                    +   WYMeditor.CONTAINERS_ITEMS
-                    + '</ul>',
-                    
-  toolsHtml:          '<ul class="wym_tools wym_toolbar_section">'
-                    +   WYMeditor.TOOLS_ITEMS
-                    + '</ul>',
-                    
-  classesHtml:        '<ul class="wym_classes wym_toolbar_section">'
-                    +   WYMeditor.CLASSES_ITEMS
-                    + '</ul>',
-                    
-  htmlHtml:           '<div class="wym_html">'
-                    +   '<textarea class="wym_html_val"></textarea>'
-                    + '</div>',
-                    
-  dialogLinkHtml:     '<form id="wym_dialog_form">'
-                    +   '<div class="form_element">'
-                    +     '<div class="label">'
-                    +       '<label>{URL}</label>'
-                    +     '</div>'
-                    +     '<div class="value">'
-                    +       '<input type="text" name="href"/>'
-                    +     '</div>'
-                    +   '</div>'
-                    +   '<div class="form_element">'
-                    +     '<div class="label">'
-                    +       '<label>{Title}</label>'
-                    +     '</div>'
-                    +     '<div class="value">'
-                    +       '<input type="text" name="title"/>'
-                    +     '</div>'
-                    +   '</div>'
-                    +   '<div class="form_element submit_element">'
-                    +     '<div class="value">'
-                    +       '<input name="commit" type="submit" value="{Submit}" />'
-                    +     '</div>'
-                    +   '</div>'
-                    + '</form>',
-  
-  dialogImageHtml:    '<form id="wym_dialog_form">'
-                    +   '<div class="form_element">'
-                    +     '<div class="label">'
-                    +       '<label>{URL}</label>'
-                    +     '</div>'
-                    +     '<div class="value">'
-                    +       '<input type="text" name="src"/>'
-                    +     '</div>'
-                    +   '</div>'
-                    +   '<div class="form_element">'
-                    +     '<div class="label">'
-                    +       '<label>{Alternative_Text}</label>'
-                    +     '</div>'
-                    +     '<div class="value">'
-                    +       '<input type="text" name="alt"/>'
-                    +     '</div>'
-                    +   '</div>'
-                    +   '<div class="form_element">'
-                    +     '<div class="label">'
-                    +       '<label>{Title}</label>'
-                    +     '</div>'
-                    +     '<div class="value">'
-                    +       '<input type="text" name="title"/>'
-                    +     '</div>'
-                    +   '</div>'
-                    +   '<div class="form_element submit_element">'
-                    +     '<div class="value">'
-                    +       '<input name="commit" type="submit" value="{Submit}" />'
-                    +     '</div>'
-                    +   '</div>'
-                    + '</form>',
-  
-  dialogTableHtml:    '<form id="wym_dialog_form">'
-                    +   '<div class="form_element">'
-                    +     '<div class="label">'
-                    +       '<label>{Caption}</label>'
-                    +     '</div>'
-                    +     '<div class="value">'
-                    +       '<input type="text" name="caption"></textarea>'
-                    +     '</div>'
-                    +   '</div>'
-                    +   '<div class="form_element">'
-                    +     '<div class="label">'
-                    +       '<label>{Summary}</label>'
-                    +     '</div>'
-                    +     '<div class="value">'
-                    +       '<input type="text" name="summary"></textarea>'
-                    +     '</div>'
-                    +   '</div>'
-                    +   '<div class="form_element">'
-                    +     '<div class="label">'
-                    +       '<label>{Number_Of_Rows}</label>'
-                    +     '</div>'
-                    +     '<div class="value">'
-                    +       '<input type="text" name="rows"></textarea>'
-                    +     '</div>'
-                    +   '</div>'
-                    +   '<div class="form_element">'
-                    +     '<div class="label">'
-                    +       '<label>{Number_Of_Cols}</label>'
-                    +     '</div>'
-                    +     '<div class="value">'
-                    +       '<input type="text" name="cols"></textarea>'
-                    +     '</div>'
-                    +   '</div>'
-                    +   '<div class="form_element submit_element">'
-                    +     '<div class="value">'
-                    +       '<input name="commit" type="submit" value="{Submit}" />'
-                    +     '</div>'
-                    +   '</div>'
-                    + '</form>',
-  
-  dialogPasteHtml:    '<form id="wym_dialog_form">'
-                    +   '<div class="form_element">'
-                    +     '<div class="label">'
-                    +       '<label>{Paste_From_Word}</label>'
-                    +     '</div>'
-                    +     '<div class="value">'
-                    +       '<textarea name="paste"></textarea>'
-                    +     '</div>'
-                    +   '</div>'
-                    +   '<div class="form_element submit_element">'
-                    +     '<div class="value">'
-                    +       '<input name="commit" type="submit" value="{Submit}" />'
-                    +     '</div>'
-                    +   '</div>'
-                    + '</form>'
-};
-
-// -- New dialog pop-up -----------------------------------------------------
-WYMeditor.editor.prototype.dialog = function( dialogType, dialogFeatures, bodyHtml ) {
-  
-  var body = '';
-  switch(dialogType) {
-    case WYMeditor.DIALOG_LINK:
-      body = this._options.dialogLinkHtml;
-    break;
-    case WYMeditor.DIALOG_IMAGE:
-      body = this._options.dialogImageHtml;
-    break;
-    case WYMeditor.DIALOG_TABLE:
-      body = this._options.dialogTableHtml;
-    break;
-    case WYMeditor.DIALOG_PASTE:
-      body = this._options.dialogPasteHtml;
-    break;
-    default:
-      body = bodyHtmls;
-  }
-  
-  this._options.dialog.html(this.replaceStrings(body));
-  this._options.dialog.dialog({
-    title:      this.replaceStrings(this.encloseString(dialogType)),
-    modal:      true,
-    width:      800,
-    resizable:  false
-  });
-  
-  WYMeditor.INIT_DIALOG(this, dialogType);
-};
-
-// -- Dialog processing -----------------------------------------------------
-WYMeditor.INIT_DIALOG = function(wym, type) {
-  var form = jQuery('form#wym_dialog_form');
-  var selected = wym.selected();
-  
-  if(selected) {
-    form.find('input[name="href"]').val(jQuery(selected).attr(WYMeditor.HREF));
-    form.find('input[name="src"]').val(jQuery(selected).attr(WYMeditor.SRC));
-    form.find('input[name="title"]').val(jQuery(selected).attr(WYMeditor.TITLE));
-    form.find('input[name="alt"]').val(jQuery(selected).attr(WYMeditor.ALT));
-  }
-  if(wym._selected_image) {
-    form.find('input[name="src"]').val(jQuery(wym._selected_image).attr(WYMeditor.SRC));
-    form.find('input[name="alt"]').val(jQuery(wym._selected_image).attr(WYMeditor.ALT));
-    form.find('input[name="title"]').val(jQuery(wym._selected_image).attr(WYMeditor.TITLE));
-  }
-  
-  form.submit(function(){
-    var data = { };
-    var form_data = $(this).serializeArray();
-    jQuery.each(form_data, function(){
-      if (data[this.name] !== undefined) {
-        if (!data[this.name].push) {
-          data[this.name] = [data[this.name]];
-        }
-        data[this.name].push(this.value || '');
-      } else {
-        data[this.name] = this.value || '';
-      }
-    });
-    
-    switch(type){
-      case WYMeditor.DIALOG_LINK:
-        WYMeditor.PROCESS_DIALOG_LINK(wym, data);
-      break;
-      case WYMeditor.DIALOG_IMAGE:
-        WYMeditor.PROCESS_DIALOG_IMAGE(wym, data);
-      break;
-      case WYMeditor.DIALOG_TABLE:
-        WYMeditor.PROCESS_DIALOG_TABLE(wym, data);
-      break;
-      case WYMeditor.DIALOG_PASTE:
-        WYMeditor.PROCESS_DIALOG_PASTE(wym, data);
-      break;
-    }
-    
-    wym._options.dialog.dialog('close');
-    return false;
-  })
-}
-
-WYMeditor.PROCESS_DIALOG_LINK = function(wym, data) {
-  var sStamp = wym.uniqueStamp();
-  var selected = wym.selected();
-  
-  //ensure that we select the link to populate the fields
-  if(selected && selected.tagName && selected.tagName.toLowerCase != WYMeditor.A) {
-    selected = jQuery(selected).parentsOrSelf(WYMeditor.A);
-  }
-  //fix MSIE selection if link image has been clicked
-  if(!selected && wym._selected_image){
-    selected = jQuery(wym._selected_image).parentsOrSelf(WYMeditor.A);
-  }
-  
-  var sUrl = data['href'];
-  if(sUrl.length > 0) {
-    var link;
-    if (selected[0] && selected[0].tagName.toLowerCase() == WYMeditor.A) {
-      link = selected;
-    } else {
-      wym._exec(WYMeditor.CREATE_LINK, sStamp);
-      link = jQuery("a[href=" + sStamp + "]", wym._doc.body);
-    }
-    link.attr(WYMeditor.HREF, sUrl).attr(WYMeditor.TITLE, data['title']);
-  }
-}
-
-WYMeditor.PROCESS_DIALOG_IMAGE = function(wym, data) {
-  var sStamp = wym.uniqueStamp();
-  
-  var sUrl = data['src'];
-  if(sUrl.length > 0) {
-    wym._exec(WYMeditor.INSERT_IMAGE, sStamp);
-    
-    jQuery("img[src$=" + sStamp + "]", wym._doc.body)
-        .attr(WYMeditor.SRC, sUrl)
-        .attr(WYMeditor.TITLE, data['title'])
-        .attr(WYMeditor.ALT, data['alt']);
-  }
-}
-
-WYMeditor.PROCESS_DIALOG_TABLE = function(wym, data) {
-  var iRows = data['rows'];
-  var iCols = data['cols'];
-  if(iRows > 0 && iCols > 0) {
-    var table = wym._doc.createElement(WYMeditor.TABLE);
-    var newRow = null;
-    var newCol = null;
-    var sCaption = data['caption'];
-    var newCaption = table.createCaption();
-    newCaption.innerHTML = sCaption;
-    for(x=0; x<iRows; x++) {
-      newRow = table.insertRow(x);
-      for(y=0; y<iCols; y++) {newRow.insertCell(y);}
-    }
-    jQuery(table).attr('summary', data['summary']);
-    var node = jQuery(wym.findUp(wym.container(), WYMeditor.MAIN_CONTAINERS)).get(0);
-    if(!node || !node.parentNode){
-      jQuery(wym._doc.body).append(table);
-    } else {
-      jQuery(node).after(table);
-    }
-  }
-}
-
-WYMeditor.PROCESS_DIALOG_PASTE = function(wym, data) {
-  wym.paste(data['paste']);
-}
-
-WYMeditor.editor.prototype.xhtml = function() {
-  var html = this.parser.parse(this.html());
-  var reg = /(>)(<)(\/*)/g;
-  html = html.replace(reg, '$1\r\n$2$3');
-  return html;
-};