Merge branch 'master' into dev10
This commit is contained in:
commit
2fdb566fe1
4
core/vendor/tinymce/init.js
vendored
4
core/vendor/tinymce/init.js
vendored
@ -47,8 +47,8 @@ tinymce.init({
|
||||
cssFiles: [
|
||||
/*'theme/ambiance.css',*/
|
||||
],
|
||||
width: 1000, // Default value is 800
|
||||
height: 600 // Default value is 550
|
||||
width: 800, // Default value is 800
|
||||
height: 500 // Default value is 550
|
||||
},
|
||||
// Cibles de la target
|
||||
target_list: [
|
||||
|
@ -1,8 +1,8 @@
|
||||
tinymce.addI18n('fr_FR',{
|
||||
'HTML source code': 'Code source HTML',
|
||||
'Start search': 'Rechercher',
|
||||
'Find next': 'Chercher suiv.',
|
||||
'Find previous': 'Chercher préc.',
|
||||
'Replace': 'Replace',
|
||||
'Replace all': 'Replace all'
|
||||
});
|
||||
'HTML source code': 'Code source HTML',
|
||||
'Start search': 'Rechercher',
|
||||
'Find next': 'Chercher suiv.',
|
||||
'Find previous': 'Chercher préc.',
|
||||
'Replace': 'Remplacer',
|
||||
'Replace all': 'Remplacer tout'
|
||||
});
|
@ -148,7 +148,7 @@ function start()
|
||||
div = parent.document.createElement('div'),
|
||||
td1 = '<td style="font-size:11px;background:#777;color:#fff;padding:0 4px">',
|
||||
td2 = '<td style="font-size:11px;padding-right:5px">';
|
||||
div.innerHTML = '<table cellspacing="0" cellpadding="0" style="border-spacing:4px"><tr>' + td1 + (isMac ? '⌘-F' : 'Ctrl-F</td>') + td2 + tinymce.translate('Start search') + '</td>' + td1 + (isMac ? '⌘-G' : 'Ctrl-G') + '</td>' + td2 + tinymce.translate('Find next') + '</td>' + td1 + (isMac ? '⌘-Alt-F' : 'Shift-Ctrl-F') + '</td>' + td2 + tinymce.translate('Find previous') + '</td></tr>' + '<tr>' + td1 + (isMac ? '⌘-Alt-F' : 'Shift-Ctrl-F') + '</td>' + td2 + tinymce.translate('Replace') + '</td>' + td1 + (isMac ? 'Shift-⌘-Alt-F' : 'Shift-Ctrl-R') +'</td>' + td2 + tinymce.translate('Replace all') + '</td></tr></table>';
|
||||
div.innerHTML = '<table cellspacing="0" cellpadding="0" style="border-spacing:4px"><tr>' + td1 + (isMac ? '⌘-F' : 'Ctrl-F</td>') + td2 + tinymce.translate('Start search') + '</td>' + td1 + (isMac ? '⌘-G' : 'Ctrl-G') + '</td>' + td2 + tinymce.translate('Find next') + '</td>' + td1 + (isMac ? '⌘-Alt-G' : 'Shift-Ctrl-G') + '</td>' + td2 + tinymce.translate('Find previous') + '</td></tr>' + '<tr>' + td1 + (isMac ? '⌘-Alt-F' : 'Shift-Ctrl-F') + '</td>' + td2 + tinymce.translate('Replace') + '</td>' + td1 + (isMac ? 'Shift-⌘-Alt-F' : 'Shift-Ctrl-R') +'</td>' + td2 + tinymce.translate('Replace all') + '</td></tr></table>';
|
||||
div.style.position = 'absolute';
|
||||
div.style.left = div.style.bottom = '5px';
|
||||
head.appendChild(div);
|
||||
|
Loading…
Reference in New Issue
Block a user