From ec17a928c3f5894ff6273e9ee4f2d1655c427a8b Mon Sep 17 00:00:00 2001
From: "Marat.Bedoev@heiner-direct.com" <Marat.Bedoev@heiner-direct.com>
Date: Wed, 2 Oct 2013 18:11:58 +0200
Subject: [PATCH] update to 1.1.4

---
 README.md                                     |  0
 .../modules/hdi/hdi-tinymce/metadata.php      |  9 ++-
 .../hdi/hdi-tinymce/tinymce/tinymce.min.js    |  0
 .../views/admin/de/module_options.php         |  3 +-
 .../views/admin/en/module_options.php         |  3 +-
 .../modules/hdi/hdi-tinymce/views/tinymce.tpl | 78 ++++++++-----------
 6 files changed, 41 insertions(+), 52 deletions(-)
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 copy_this/modules/hdi/hdi-tinymce/metadata.php
 mode change 100644 => 100755 copy_this/modules/hdi/hdi-tinymce/tinymce/tinymce.min.js
 mode change 100644 => 100755 copy_this/modules/hdi/hdi-tinymce/views/admin/de/module_options.php
 mode change 100644 => 100755 copy_this/modules/hdi/hdi-tinymce/views/admin/en/module_options.php
 mode change 100644 => 100755 copy_this/modules/hdi/hdi-tinymce/views/tinymce.tpl

diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/copy_this/modules/hdi/hdi-tinymce/metadata.php b/copy_this/modules/hdi/hdi-tinymce/metadata.php
old mode 100644
new mode 100755
index 7dbc9fe..80d823d
--- a/copy_this/modules/hdi/hdi-tinymce/metadata.php
+++ b/copy_this/modules/hdi/hdi-tinymce/metadata.php
@@ -21,7 +21,7 @@
 		'description' => 'backend implementation of TinyMCE Editor<br/>visit <a href="http://www.tinymce.com/" target="_blank">http://www.tinymce.com/</a> for demo and more details',
 		'thumbnail'   => 'hdi.png',
 		'version'     => '1.1.4 (2013-10-01) / newest version: <img src="https://raw.github.com/vanilla-thunder/hdi-tinymce/master/copy_this/modules/hdi/hdi-tinymce/version.jpg" style="float:right;"/><br/>
-							<a style="display: inline-block; padding: 1px 25px; background: dodgerblue; border: 1px solid #585858; color: white;" href="https://github.com/vanilla-thunder/hdi-tinymce/" target="_blank">info</a>&nbsp;
+							<a style="display: inline-block; padding: 1px 25px; background: dodgerblue; border: 1px solid #585858; color: white;" href="http://bit.ly/hdi-tinymce" target="_blank">info</a>&nbsp;
 							<a style="display: inline-block; padding: 1px 25px; background: forestgreen; border: 1px solid #585858; color: white;" href="https://github.com/vanilla-thunder/hdi-tinymce/archive/master.zip">download</a>',
 		'author'      => 'Marat Bedoev, HEINER DIRECT GmbH & Co. KG',
 		'email'       => 'oxid@heiner-direct.com',
@@ -54,8 +54,10 @@
                 "oxrighttocancellegend", "oxrighttocancellegend2", // widerrufsrecht
                 "oxstartmetadescription", "oxstartmetakeywords" // META Tags
                 ), 'position' => 1),
-			array('group' => 'tinyMceMain', 'name' => 'sTinyMCE_height',  'type' => 'str', 'value' => '300', 'position' => 2),
-			array('group' => 'tinyMceMain', 'name' => 'sTinyMCE_cssfile', 'type' => 'str', 'value' => '/weiss/ich/noch/nicht.css', 'position' => 3),
+            array('group' => 'tinyMceMain', 'name' => 'sTinyMCE_height',  'type' => 'str', 'value' => '300', 'position' => 2),
+            array('group' => 'tinyMceMain', 'name' => 'bTinyMCE_smallui', 'type' => 'bool', 'value' => true, 'position' => 3),
+            array('group' => 'tinyMceMain', 'name' => 'bTinyMCE_legacyoutput', 'type' => 'bool', 'value' => true, 'position' => 4),
+			array('group' => 'tinyMceMain', 'name' => 'sTinyMCE_cssfile', 'type' => 'str', 'value' => '/weiss/ich/noch/nicht.css', 'position' => 5),
 
 			/* TinyMCE Settings */
 
@@ -82,7 +84,6 @@
 			array('group' => 'tinyMceSettings', 'name' => 'bTinyMCE_image', 'type' => 'bool', 'value' => true, 'position' => 19),
 			array('group' => 'tinyMceSettings', 'name' => 'bTinyMCE_insertdatetime', 'type' => 'bool', 'value' => true, 'position' => 20),
 			//array('group' => 'tinyMceSettings', 'name' => 'bTinyMCE_layer', 'type' => 'bool', 'value' => true, 'position' => 21),   // doenst really works, gonna be removed in the future
-			array('group' => 'tinyMceSettings', 'name' => 'bTinyMCE_legacyoutput', 'type' => 'bool', 'value' => true, 'position' => 22),
 			array('group' => 'tinyMceSettings', 'name' => 'bTinyMCE_link', 'type' => 'bool', 'value' => true, 'position' => 23),
 			array('group' => 'tinyMceSettings', 'name' => 'bTinyMCE_lists', 'type' => 'bool', 'value' => true, 'position' => 24),
 			array('group' => 'tinyMceSettings', 'name' => 'bTinyMCE_media', 'type' => 'bool', 'value' => true, 'position' => 25),
diff --git a/copy_this/modules/hdi/hdi-tinymce/tinymce/tinymce.min.js b/copy_this/modules/hdi/hdi-tinymce/tinymce/tinymce.min.js
old mode 100644
new mode 100755
diff --git a/copy_this/modules/hdi/hdi-tinymce/views/admin/de/module_options.php b/copy_this/modules/hdi/hdi-tinymce/views/admin/de/module_options.php
old mode 100644
new mode 100755
index 809239b..be67c45
--- a/copy_this/modules/hdi/hdi-tinymce/views/admin/de/module_options.php
+++ b/copy_this/modules/hdi/hdi-tinymce/views/admin/de/module_options.php
@@ -21,6 +21,8 @@ $aLang     = array(
     'SHOP_MODULE_aTinyMCE_classes'            => '<ul style="list-style:none;"><li><strong style="font-size:125%;">Liste der Backend-Klassen, wo TinyMCE angezeigt werden soll:</strong></li><li>article_main (Artikelbeschreibung)</li><li>content_main (CMS Seiten)</li><li>category_text (Kategorienbeschreibung)</li><li>newsletter_main (Newsletter)</li><li>news_text (Nachrichten-Text)</li></ul>',
     'SHOP_MODULE_aTinyMCE_plaincms'           => 'Idents der CMS Seiten, wo TinyMCE nicht geladen werden soll (plain Emails etc)',
     'SHOP_MODULE_sTinyMCE_height'             => 'Höhe des Editors (eine reine Zahl ohne Einheiten)',
+    'SHOP_MODULE_bTinyMCE_smallui'            => 'kleine Menü-Knöpfe verwenden',
+    'SHOP_MODULE_bTinyMCE_legacyoutput'       => 'HTML4 Standard im Newsletter-Inhalt verwenden',
     'SHOP_MODULE_sTinyMCE_cssfile'            => 'Pfad zu der CSS Datei mit den Stylesheets für Texte',
 
     'SHOP_MODULE_GROUP_tinyMceSettings'       => 'TinyMCE Einstellungen &amp; Plugins</b></a>&nbsp;&nbsp;&nbsp;<a href="http://www.tinymce.com/wiki.php/Configuration" target="_blank" title="mehr Infos"><b>( ? )',
@@ -47,7 +49,6 @@ $aLang     = array(
     'SHOP_MODULE_bTinyMCE_image'              => 'image',
     'SHOP_MODULE_bTinyMCE_insertdatetime'     => 'insertdatetime',
     'SHOP_MODULE_bTinyMCE_layer'              => 'layer',
-    'SHOP_MODULE_bTinyMCE_legacyoutput'       => 'legacyoutput',
     'SHOP_MODULE_bTinyMCE_link'               => 'link',
     'SHOP_MODULE_bTinyMCE_lists'              => 'lists',
     'SHOP_MODULE_bTinyMCE_media'              => 'media',
diff --git a/copy_this/modules/hdi/hdi-tinymce/views/admin/en/module_options.php b/copy_this/modules/hdi/hdi-tinymce/views/admin/en/module_options.php
old mode 100644
new mode 100755
index 60fd074..5deff29
--- a/copy_this/modules/hdi/hdi-tinymce/views/admin/en/module_options.php
+++ b/copy_this/modules/hdi/hdi-tinymce/views/admin/en/module_options.php
@@ -21,6 +21,8 @@ $aLang     = array(
     'SHOP_MODULE_aTinyMCE_classes'            => '<ul style="list-style:none;"><li><strong style="font-size:125%;">list of backend classes, TinyMCE will be active for:</strong></li><li>article_main (product description)</li><li>content_main (CMS pages)</li><li>category_text (category description)</li><li>newsletter_main (newsletter)</li><li>news_text (news text)</li></ul>',
     'SHOP_MODULE_aTinyMCE_plaincms'           => 'Idents of CMS pages TinyMCE will be excluded for ( e.g. plain Emails etc)',
     'SHOP_MODULE_sTinyMCE_height'             => 'editor height in px (without units)',
+    'SHOP_MODULE_bTinyMCE_smallui'            => 'use small menu buttons',
+    'SHOP_MODULE_bTinyMCE_legacyoutput'       => 'use  HTML4 standards for newsletter contents',
     'SHOP_MODULE_sTinyMCE_cssfile'            => 'path to the content css stylesheet',
 
     'SHOP_MODULE_GROUP_tinyMceSettings'       => 'TinyMCE Settings &amp; Plugins</b></a>&nbsp;&nbsp;&nbsp;<a href="http://www.tinymce.com/wiki.php/Configuration" target="_blank" title="more info"><b>( ? )',
@@ -47,7 +49,6 @@ $aLang     = array(
     'SHOP_MODULE_bTinyMCE_image'              => 'image',
     'SHOP_MODULE_bTinyMCE_insertdatetime'     => 'insertdatetime',
     'SHOP_MODULE_bTinyMCE_layer'              => 'layer',
-    'SHOP_MODULE_bTinyMCE_legacyoutput'       => 'legacyoutput',
     'SHOP_MODULE_bTinyMCE_link'               => 'link',
     'SHOP_MODULE_bTinyMCE_lists'              => 'lists',
     'SHOP_MODULE_bTinyMCE_media'              => 'media',
diff --git a/copy_this/modules/hdi/hdi-tinymce/views/tinymce.tpl b/copy_this/modules/hdi/hdi-tinymce/views/tinymce.tpl
old mode 100644
new mode 100755
index c140629..f9b2d45
--- a/copy_this/modules/hdi/hdi-tinymce/views/tinymce.tpl
+++ b/copy_this/modules/hdi/hdi-tinymce/views/tinymce.tpl
@@ -1,9 +1,4 @@
 <!-- TinyMCE -->
-<style type="text/css">
-    .mce-btn button { padding: 2px 5px; }
-    .mce-path, .mce-wordcount { padding: 5px; }
-
-</style>
 <script type="text/javascript">
     var tinyMCE = null;
     function copyLongDescFromTinyMCE(sIdent)
@@ -20,12 +15,12 @@
                 {
                         for (var i = 0; i < aSmartyParts.length; i++)
                 {
-                    aSubParts = aSmartyParts[i].split('}]');
+                    aSubParts = aSmartyParts[i].split("}]");
                     if (aSubParts.length > 1)
                         aSubParts[0] = aSubParts[0].replace(/&gt;/gi, ">").replace(/&lt;/gi, "<").replace(/&amp;/gi, "&").replace(/&quot;/gi, '"');
                     aSmartyParts[i] = aSubParts.join("}" + "]");
                 }
-                content = aSmartyParts.join('[' + '{');
+                content = aSmartyParts.join("[" + "{");
                 }
                 document.getElementsByName('editval[' + sIdent + ']').item(0).value = content;
                 return true;
@@ -39,23 +34,17 @@
         if ( copyLongDescFromTinyMCE( sIdent ) ) return;
         origCopyLongDesc( sIdent );
     }
-</script>
 
+</script>
 <script type="text/javascript" src="[{$oViewConf->getModuleUrl('hdi-tinymce','tinymce/tinymce.min.js') }]"></script>
 <script type="text/javascript">
     tinyMCE.init({
-        language: '[{$sEditorLang}]',
+        language: "[{$sEditorLang}]",
         selector: "textarea",
         height: [{ $cfg->getConfigParam("sTinyMCE_height")}],
-        // url stuff
-        document_base_url: '[{$oViewConf->getBaseDir()}]',
+        document_base_url: "[{$oViewConf->getBaseDir()}]",
         relative_urls: [{if $cfg->getConfigParam("bTinyMCE_relative_urls") == 1}]true[{else}]false[{/if}],
 
-        [{if $oViewConf->getActiveClassName() == "newsletter_main"}]
-            // use legacy html tags for newsletteri
-            plugins: "legacyoutput",
-        [{/if}]
-
         //some weird stuff
         //entity_encoding : "raw",
         plugin_preview_width: window.innerWidth,
@@ -65,8 +54,6 @@
         moxiemanager_fullscreen: true,
 
         [{if $cfg->getConfigParam("bTinyMCE_browser_spellcheck")}]browser_spellcheck : true,[{/if}]
-
-        [{strip}]
         plugins: ["
                 [{if $cfg->getConfigParam("bTinyMCE_advlist")}]advlist, [{/if}]
                 [{if $cfg->getConfigParam("bTinyMCE_anchor")}]anchor, [{/if}]
@@ -76,55 +63,54 @@
                 [{if $cfg->getConfigParam("bTinyMCE_bbcode")}]bbcode, [{/if}]
                 [{if $cfg->getConfigParam("bTinyMCE_charmap")}]charmap, [{/if}]
                 [{if $cfg->getConfigParam("bTinyMCE_code")}]code, [{/if}]
-                [{* [{if $cfg->getConfigParam("bTinyMCE_compat3x")}]compat3x, [{/if}] *}]
                 [{if $cfg->getConfigParam("bTinyMCE_contextmenu")}]contextmenu, [{/if}]
                 [{* [{if $cfg->getConfigParam("bTinyMCE_directionality")}]directionality, [{/if}] *}]
                 [{if $cfg->getConfigParam("bTinyMCE_emoticons")}]emoticons, [{/if}]
-                [{* [{if $cfg->getConfigParam("bTinyMCE_example")}]example, [{/if}]
                 [{if $cfg->getConfigParam("bTinyMCE_example_dependency")}]example_dependency, [{/if}] *}]
                 [{* [{if $cfg->getConfigParam("bTinyMCE_fullpage")}]fullpage, [{/if}] *}]
                 [{if $cfg->getConfigParam("bTinyMCE_fullscreen")}]fullscreen, [{/if}]
                 [{if $cfg->getConfigParam("bTinyMCE_hr")}]hr, [{/if}]
                 [{if $cfg->getConfigParam("bTinyMCE_image")}]image, [{/if}]
                 [{if $cfg->getConfigParam("bTinyMCE_insertdatetime")}]insertdatetime, [{/if}]
-                [{* [{if $cfg->getConfigParam("bTinyMCE_layer")}]layer, [{/if}] *}]
-                [{if $cfg->getConfigParam("bTinyMCE_legacyoutput")}]legacyoutput, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_link")}]link, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_lists")}]lists, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_media")}]media, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_nonbreaking")}]nonbreaking, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_noneditable")}]noneditable, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_pagebreak")}]pagebreak, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_paste")}]paste, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_preview")}]preview, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_print")}]print, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_save")}]save, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_searchreplace")}]searchreplace, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_spellchecker")}]spellchecker, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_tabfocus")}]tabfocus, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_table")}]table, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_template")}]template, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_textcolor")}]textcolor, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_visualblocks")}]visualblocks, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_visualchars")}]visualchars, [{/if}]
-                [{if $cfg->getConfigParam("bTinyMCE_wordcount")}]wordcount[{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_link")}]link [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_lists")}]lists [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_media")}]media [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_nonbreaking")}]nonbreaking [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_noneditable")}]noneditable [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_pagebreak")}]pagebreak [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_paste")}]paste [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_preview")}]preview [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_print")}]print [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_save")}]save [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_searchreplace")}]searchreplace [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_spellchecker")}]spellchecker [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_tabfocus")}]tabfocus [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_table")}]table [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_template")}]template [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_textcolor")}]textcolor [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_visualblocks")}]visualblocks [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_visualchars")}]visualchars [{/if}]
+                [{if $cfg->getConfigParam("bTinyMCE_wordcount")}]wordcount [{/if}]
+                [{if $oViewConf->getActiveClassName() == "newsletter_main" && $cfg->getConfigParam("bTinyMCE_legacyoutput")}]legacyoutput, /* use legacy html tags for newsletter */[{/if}]
                 "],
-            [{/strip}]
 
-        [{if $extPlugins}][{strip}]
+        [{if $extPlugins}]
         external_plugins: {
+            [{strip}]
             [{foreach from=$extPlugins key="plugin" item="file" }]
                 "[{$plugin}]": "[{$file}]",
             [{/foreach}]
+            [{/strip}]
         },
-        [{/strip}][{/if}]
+        [{/if}]
 
-        toolbar1: "undo redo searchreplace preview fullscreen code | image media emoticons table bullist numlist outdent indent blockquote subscript superscript hr anchor link unlink [{if $extControls}] | [{$extControls}][{/if}]",
+        toolbar1: "undo redo searchreplace preview fullscreen code | image media emoticons table bullist numlist outdent indent blockquote subscript superscript [{if $cfg->getConfigParam("bTinyMCE_charmap")}]charmap[{/if}] hr anchor link unlink [{if $extControls}] | [{$extControls}][{/if}]",
         toolbar2: "bold italic underline strikethrough | forecolor backcolor | alignleft aligncenter alignright alignjustify | fontselect fontsizeselect formatselect | removeformat | spellchecker",
         image_advtab: true,
         menubar: false,
+        [{if $cfg->getConfigParam("bTinyMCE_smallui")}]toolbar_items_size: "small"[{/if}]
     });
 </script>
-<textarea id='editor_[{$sField}]' name="content" style='width:[{$iWidth}]; height:[{$iHeight}];'>[{$sContent}]</textarea>
+<textarea id="editor_[{$sField}]" name="content" style="width:[{$iWidth}]; height:[{$iHeight}];">[{$sContent}]</textarea>
 [{assign var=tinyMCE value=1 }]
 <!-- /TinyMCE -->