8
0
Dieser Commit ist enthalten in:
Marat Bedoev 2014-09-04 15:59:55 +02:00
Ursprung 828a30083d
Commit dd7f1a5a9c
11 geänderte Dateien mit 36 neuen und 18 gelöschten Zeilen

Datei anzeigen

@ -1,5 +1,5 @@
## TinyMCE 4.1.3 for OXID eShop
### hdi-tinymce module version 1.3 from 2014-08-20
## TinyMCE 4.1.4 for OXID eShop
### hdi-tinymce module version 1.3.1 from 2014-09-04
TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under LGPL.
More information here: http://www.tinymce.com/
and here: https://github.com/tinymce

Datei anzeigen

@ -110,7 +110,11 @@ class blaTinyMceOxViewConfig extends blaTinyMceOxViewConfig_parent
"fullscreen" => "fullscreen",
"preview" => "preview"
);
if ($this->getActiveClassName()=="newsletter_main") $aPlugins["legacyoutput"] = false;
if ($this->getActiveClassName()=="newsletter_main")
{
$aPlugins["legacyoutput"] = false;
$aPlugins["fullpage"] = "fullpage";
}
// plugin override
if($aOverride = $cfg->getConfigParam("aTinyMCE_plugins_override"))

4
copy_this/modules/bla/bla-tinymce/metadata.php Normale Datei → Ausführbare Datei
Datei anzeigen

@ -22,7 +22,7 @@
'title' => '<strong style="color:#95b900;font-size:125%;">best</strong><strong style="color:#c4ca77;font-size:125%;">life</strong> <strong>TinyMCE</strong>',
'description' => 'TinyMCE 4.1.3 WYSIWYG Editor for OXID eShop 4.7 & 4.8<br/>visit <a href="http://www.tinymce.com/" target="_blank">http://www.tinymce.com/</a> for demo and more details<hr/><b style="display: inline-block; float:left;">newest version:</b><img src="' . $v . '" style=" float:left;"/><a style="display: inline-block; padding: 1px 25px; background: dodgerblue; border: 1px solid #585858; color: white;" href="http://bit.ly/bla-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/bla-tinymce/archive/master.zip">download</a>',
'thumbnail' => 'tinymce.png',
'version' => '1.3.0 (2014-08-20)',
'version' => '1.3.1 (2014-09-04)',
'author' => 'Marat Bedoev, bestlife AG',
'email' => 'oxid@bestlife.ag',
'url' => 'http://www.bestlife.ag',
@ -94,7 +94,7 @@
array(
'group' => 'tinyMceSettings',
'name' => 'aTinyMCE_external_plugins',
'type' => 'arr',
'type' => 'aarr',
'value' => null,
'position' => 2
),

Datei anzeigen

@ -135,6 +135,7 @@ tinymce.addI18n('cs',{
"Height": "V\u00fd\u0161ka",
"Paste row after": "Vlo\u017eit \u0159\u00e1dek pod",
"Alignment": "Zarovn\u00e1n\u00ed",
"Border color": "Barva r\u00e1me\u010dku",
"Column group": "Skupina sloupc\u016f",
"Row": "\u0158\u00e1dek",
"Insert column before": "Vlo\u017eit sloupec vlevo",

Datei anzeigen

@ -1,8 +1,11 @@
tinymce.addI18n('fr_FR',{
"Cut": "Couper",
"Heading 5": "En-t\u00eate 5",
"Header 2": "Titre 2",
"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Votre navigateur ne supporte pas la copie directe. Merci d'utiliser les touches Ctrl+X\/C\/V.",
"Heading 4": "En-t\u00eate 4",
"Div": "Div",
"Heading 2": "En-t\u00eate 2",
"Paste": "Coller",
"Close": "Fermer",
"Font Family": "Polices de caract\u00e8res",
@ -11,6 +14,8 @@ tinymce.addI18n('fr_FR',{
"New document": "Nouveau document",
"Blockquote": "Citation",
"Numbered list": "Num\u00e9rotation",
"Heading 1": "En-t\u00eate 1",
"Headings": "En-t\u00eates",
"Increase indent": "Augmenter le retrait",
"Formats": "Formats",
"Headers": "Titres",
@ -34,6 +39,8 @@ tinymce.addI18n('fr_FR',{
"Italic": "Italique",
"Align center": "Aligner au centre",
"Header 5": "Titre 5",
"Heading 6": "En-t\u00eate 6",
"Heading 3": "En-t\u00eate 3",
"Decrease indent": "Diminuer le retrait",
"Header 4": "Titre 4",
"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Le presse-papiers est maintenant en mode \"texte plein\". Les contenus seront coll\u00e9s sans retenir les formatages jusqu'\u00e0 ce que vous d\u00e9sactiviez cette option.",
@ -59,6 +66,7 @@ tinymce.addI18n('fr_FR',{
"Restore last draft": "Restaurer le dernier brouillon",
"Special character": "Caract\u00e8res sp\u00e9ciaux",
"Source code": "Code source",
"Color": "Couleur",
"Right to left": "Droite \u00e0 gauche",
"Left to right": "Gauche \u00e0 droite",
"Emoticons": "Emotic\u00f4nes",
@ -121,11 +129,13 @@ tinymce.addI18n('fr_FR',{
"Finish": "Finie",
"Ignore all": "Tout ignorer",
"Ignore": "Ignorer",
"Add to Dictionary": "Ajouter au dictionnaire",
"Insert row before": "Ins\u00e9rer une ligne avant",
"Rows": "Lignes",
"Height": "Hauteur",
"Paste row after": "Coller la ligne apr\u00e8s",
"Alignment": "Alignement",
"Border color": "Couleur de la bordure",
"Column group": "Groupe de colonnes",
"Row": "Ligne",
"Insert column before": "Ins\u00e9rer une colonne avant",
@ -169,6 +179,9 @@ tinymce.addI18n('fr_FR',{
"Insert template": "Ajouter un th\u00e8me",
"Templates": "Th\u00e8mes",
"Background color": "Couleur d'arri\u00e8re-plan",
"Custom...": "Personnalis\u00e9...",
"Custom color": "Couleur personnalis\u00e9e",
"No color": "Aucune couleur",
"Text color": "Couleur du texte",
"Show blocks": "Afficher les blocs",
"Show invisible characters": "Afficher les caract\u00e8res invisibles",

Dateidiff unterdrückt, weil mindestens eine Zeile zu lang ist

Dateidiff unterdrückt, weil mindestens eine Zeile zu lang ist

Dateidiff unterdrückt, weil mindestens eine Zeile zu lang ist

Dateidiff unterdrückt, weil mindestens eine Zeile zu lang ist

Dateidiff unterdrückt, weil mindestens eine Zeile zu lang ist

Binäre Datei nicht angezeigt.

Vorher

Breite:  |  Höhe:  |  Größe: 2.0 KiB

Nachher

Breite:  |  Höhe:  |  Größe: 2.1 KiB