From ec17a928c3f5894ff6273e9ee4f2d1655c427a8b Mon Sep 17 00:00:00 2001 From: "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
visit http://www.tinymce.com/ for demo and more details', 'thumbnail' => 'hdi.png', 'version' => '1.1.4 (2013-10-01) / newest version:
- info  + info  download', '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' => '', '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 & Plugins   ( ? )', @@ -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' => '
  • list of backend classes, TinyMCE will be active for:
  • article_main (product description)
  • content_main (CMS pages)
  • category_text (category description)
  • newsletter_main (newsletter)
  • news_text (news text)
', '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 & Plugins
   ( ? )', @@ -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 @@ - + - + [{assign var=tinyMCE value=1 }]