yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix TinyMCE 3.5

Browse Source
This commit is contained in:
sgay
2012-05-09 14:14:42 -02:00
parent 60c405e7e0
commit f8bef6880d
7 changed files with 217 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
umbraco/presentation/umbraco_client/tinymce3/themes/umbraco/editor_template_src.js
View File

@@ -731,9 +731,9 @@
getInfo : function() {
return {
longname : 'Umbraco theme',
author : 'Umbraco, based on Moxiecode Systems AB Advanced theme',
authorurl : 'http://umbraco.org',
version : tinymce.majorVersion + "." + tinymce.minorVersion
author : 'Umbraco, based on the advanced theme by Moxiecode Systems AB',
authorurl : 'http://umbraco.org',
version : tinymce.majorVersion + "." + tinymce.minorVersion
}
},
@@ -802,10 +802,8 @@
// Create external toolbar
/* UMBRACO MODIFIED */
if (lo == 'external') {
n = c = DOM.create('div', {style : 'position:relative'});
n = DOM.add(n, 'div', {id : ed.id + '_external', 'class' : 'mceExternalToolbar umbracoSkin'}); /* UMBRACO: Added add. class */
DOM.add(n, 'a', {id : ed.id + '_external_close', href : 'javascript:;', 'class' : 'mceExternalClose'});
n = DOM.add(n, 'table', {id : ed.id + '_tblext', cellSpacing : 0, cellPadding : 0});
n = c = DOM.create('div', { id: ed.id + '_external', 'class': 'mceToolbarExternal umbracoSkin' });
n = DOM.add(n, 'table', { id: ed.id + '_tblext', cellSpacing: 0, cellPadding: 0, style: 'margin-left: 10px' });
etb = DOM.add(n, 'tbody');
/* UMBRACO: Custom toolbar injection
@@ -816,8 +814,9 @@
*/
document.getElementById(ed.getParam("umbraco_toolbar_id", "*")).appendChild(c);
/* UMBRACO : Custom toolbar handling
t._addToolbars(etb, o);
/* UMBRACO: Custom toolbar handling
t._addToolbars(etb, o);
ed.onMouseUp.add(function() {
var e = DOM.get(ed.id + '_external');
@@ -852,6 +851,7 @@
emptyDiv.hide();
}
}
t._addToolbars(etb, o);
DOM.show(DOM.get(ed.id + '_external'));
} else {
@@ -865,8 +865,6 @@
jQuery(".tinymceMenuBar").hide();
jQuery("#" + ed.id + "_external").parent().show();
});
/* UMBRACO MODIFIED */
}
if (sl == 'top')
@@ -997,7 +995,7 @@
}
// Handle case when there are no toolbar buttons and ensure editor height is adjusted accordingly
if (!toolbarsExist)
o.deltaHeight -= s.theme_umbraco_row_height;
o.deltaHeight -= s.theme_advanced_row_height;
h.push(toolbarGroup.renderHTML());
h.push(DOM.createHTML('a', {href : '#', accesskey : 'z', title : ed.getLang("umbraco.toolbar_focus"), onfocus : 'tinyMCE.getInstanceById(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
DOM.setHTML(n, h.join(''));
@@ -1507,5 +1505,5 @@
}
});
tinymce.ThemeManager.add('umbraco', tinymce.themes.umbracoTheme);
tinymce.ThemeManager.add('umbraco', tinymce.themes.UmbracoTheme);
}(tinymce));

7
umbraco/presentation/umbraco_client/tinymce3/themes/umbraco/langs/en.js
View File

@@ -1,5 +1,4 @@
tinyMCE.addI18n('en.umbraco',
{"underline_desc":"Underline (Ctrl+U)",
tinyMCE.addI18n('en.umbraco',{"underline_desc":"Underline (Ctrl+U)",
"italic_desc":"Italic (Ctrl+I)",
"bold_desc":"Bold (Ctrl+B)",
dd:"Definition Description",
@@ -32,9 +31,7 @@ fontdefault:"Font Family",
"image_delta_height":"",
"image_delta_width":"",
"more_colors":"More Colors...",
"toolbar_focus":"Jump to tool buttons - Alt+Q,
Jump to editor - Alt-Z,
Jump to element path - Alt-X",
"toolbar_focus":"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",
newdocument:"Are you sure you want clear all contents?",
path:"Path",
"clipboard_msg":"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",

5
umbraco/presentation/umbraco_client/tinymce3/themes/umbraco/langs/en_dlg.js
View File

@@ -1,5 +1,4 @@
tinyMCE.addI18n('en.umbraco_dlg',
{"link_list":"Link List",
tinyMCE.addI18n('en.umbraco_dlg', {"link_list":"Link List",
"link_is_external":"The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",
"link_is_email":"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
"link_titlefield":"Title",
@@ -26,7 +25,7 @@ tinyMCE.addI18n('en.umbraco_dlg',
"image_src":"Image URL",
"image_title":"Insert/Edit Image",
"charmap_title":"Insert Character",
"charmap_usage":"Use left and right arrows to navigate.",
"charmap_usage":"Use left and right arrows to navigate.",
"colorpicker_name":"Name:",
"colorpicker_color":"Color:",
"colorpicker_named_title":"Named Colors",

27
umbraco/presentation/umbraco_client/tinymce3/themes/umbraco/skins/umbraco/content.css
View File

@@ -1,7 +1,6 @@
body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}
body {background:#FFF;}
body.mceForceColors {background:#FFF; color:#000;}
body.mceBrowserDefaults {background:transparent; color:inherit; font-size:inherit; font-family:inherit;}
h1 {font-size: 2em}
h2 {font-size: 1.5em}
h3 {font-size: 1.17em}
@@ -9,17 +8,16 @@ h4 {font-size: 1em}
h5 {font-size: .83em}
h6 {font-size: .75em}
.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
a.mceItemAnchor {display:inline-block; -webkit-user-select:all; -webkit-user-modify:read-only; -moz-user-select:all; -moz-user-modify:read-only; width:11px !important; height:11px !important; background:url(img/items.gif) no-repeat center center}
span.mceItemNbsp {background: #DDD}
td.mceSelected, th.mceSelected {background-color:#3399ff !important}
a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(img/items.gif) no-repeat bottom left;}
img.mceItemAnchor {width:12px; height:12px; background:url(img/items.gif) no-repeat;}
img {border:0;}
table, img, hr, .mceItemAnchor {cursor:default}
table {cursor:default}
table td, table th {cursor:text}
ins {border-bottom:1px solid green; text-decoration: none; color:green}
del {color:red; text-decoration:line-through}
cite {border-bottom:1px dashed blue}
acronym {border-bottom:1px dotted #CCC; cursor:help}
abbr {border-bottom:1px dashed #CCC; cursor:help}
abbr, html\:abbr {border-bottom:1px dashed #CCC; cursor:help}
/* IE */
* html body {
@@ -33,21 +31,4 @@ scrollbar-shadow-color:#F0F0EE;
scrollbar-track-color:#F5F5F5;
}
img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}
font[face=mceinline] {font-family:inherit !important}
*[contentEditable]:focus {outline:0}
.mceItemMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc}
.mceItemShockWave {background-image:url(../../img/shockwave.gif)}
.mceItemFlash {background-image:url(../../img/flash.gif)}
.mceItemQuickTime {background-image:url(../../img/quicktime.gif)}
.mceItemWindowsMedia {background-image:url(../../img/windowsmedia.gif)}
.mceItemRealMedia {background-image:url(../../img/realmedia.gif)}
.mceItemVideo {background-image:url(../../img/video.gif)}
.mceItemAudio {background-image:url(../../img/video.gif)}
.mceItemEmbeddedAudio {background-image:url(../../img/video.gif)}
.mceItemIframe {background-image:url(../../img/iframe.gif)}
.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;}
/* UMBRACO */
.umbMacroHolder {border: 3px dotted orange; padding: 5px;}

382
umbraco/presentation/umbraco_client/tinymce3/themes/umbraco/skins/umbraco/ui.css
View File

@@ -1,229 +1,225 @@
/* Reset */
.defaultSkin table, .defaultSkin tbody, .defaultSkin a, .defaultSkin img, .defaultSkin tr, .defaultSkin div, .defaultSkin td, .defaultSkin iframe, .defaultSkin span, .defaultSkin *, .defaultSkin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}
.defaultSkin a:hover, .defaultSkin a:link, .defaultSkin a:visited, .defaultSkin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}
.defaultSkin table td {vertical-align:middle; padding: 0; margin:0;}
.umbracoSkin table, .umbracoSkin tbody, .umbracoSkin a, .umbracoSkin img, .umbracoSkin tr, .umbracoSkin div, .umbracoSkin td, .umbracoSkin iframe, .umbracoSkin span, .umbracoSkin *, .umbracoSkin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}
.umbracoSkin a:hover, .umbracoSkin a:link, .umbracoSkin a:visited, .umbracoSkin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}
.umbracoSkin table td {vertical-align:middle; padding: 0; margin:0;}
/* Containers */
/*.defaultSkin table {background:#F0F0EE} */
.defaultSkin iframe {display:block; background:#FFF}
.defaultSkin .mceToolbar {height:26px}
.defaultSkin .mceLeft {text-align:left}
.defaultSkin .mceRight {text-align:right}
/*.umbracoSkin table {background:#F0F0EE} */
.umbracoSkin iframe {display:block; background:#FFF}
.umbracoSkin .mceToolbar {height:26px}
.umbracoSkin .mceLeft {text-align:left}
.umbracoSkin .mceRight {text-align:right}
/* External */
.defaultSkin .mceToolbarExternal {padding-left: 6px;}
.defaultSkin .mceExternalToolbar {position:absolute; border:1px solid #CCC; border-bottom:0; display:none;}
.defaultSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
.defaultSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}
.umbracoSkin .mceToolbarExternal {padding-left: 6px;}
.umbracoSkin .mceExternalToolbar {position:absolute; border:1px solid #CCC; border-bottom:0; display:none; }
.umbracoSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
.umbracoSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}
/* Layout */
.defaultSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC}
.defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC}
.defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC}
.defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;}
.defaultSkin td.mceToolbar {background:#F0F0EE; padding-top:1px; vertical-align:top}
.defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC}
.defaultSkin .mceStatusbar {background:#F0F0EE; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}
.defaultSkin .mceStatusbar div {float:left; margin:2px}
.defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0}
.defaultSkin .mceStatusbar a:hover {text-decoration:underline}
.defaultSkin table.mceToolbar {margin-left:3px}
.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {display:block; width:20px; height:20px}
.defaultSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
.defaultSkin td.mceCenter {text-align:center;}
.defaultSkin td.mceCenter table {margin:0 auto; text-align:left;}
.defaultSkin td.mceRight table {margin:0 0 0 auto;}
.umbracoSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC}
.umbracoSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC}
.umbracoSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC}
.umbracoSkin table.mceToolbar, .umbracoSkin tr.mceFirst .mceToolbar tr td, .umbracoSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;}
.umbracoSkin td.mceToolbar {padding-top:1px; vertical-align:top}
.umbracoSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC}
.umbracoSkin .mceStatusbar {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}
.umbracoSkin .mceStatusbar div {float:left; margin:2px}
.umbracoSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize}
.umbracoSkin .mceStatusbar a:hover {text-decoration:underline}
.umbracoSkin table.mceToolbar {margin-left:3px}
.umbracoSkin span.mceIcon, .umbracoSkin img.mceIcon {display:block; width:20px; height:20px}
.umbracoSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
.umbracoSkin td.mceCenter {text-align:center;}
.umbracoSkin td.mceCenter table {margin:0 auto; text-align:left;}
.umbracoSkin td.mceRight table {margin:0 0 0 auto;}
/* Button */
.defaultSkin .mceButton {display:block; width:20px; height:20px; margin:2px;
.umbracoSkin .mceButton {display:block; width:20px; height:20px; margin:2px;
}
.defaultSkin a.mceButtonEnabled:hover {margin: 1px;
.umbracoSkin a.mceButtonEnabled:hover {margin: 1px;
background: #EAEAEA;
border: 1px solid #CAC9C9 !Important;}
.defaultSkin a.mceButtonActive, .defaultSkin a.mceButtonSelected {cursor: hand;
.umbracoSkin a.mceButtonActive, .umbracoSkin a.mceButtonSelected {cursor: hand;
margin: 1px;
background: #D5EFFC;
border: 1px solid #99DEFD !Important;}
.defaultSkin .mceButtonDisabled .mceIcon {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
.defaultSkin .mceButtonLabeled {width:auto}
.defaultSkin .mceButtonLabeled span.mceIcon {float:left}
.defaultSkin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica}
.defaultSkin .mceButtonDisabled .mceButtonLabel {color:#888}
.umbracoSkin .mceButtonDisabled .mceIcon {opacity:0.3; filter:alpha(opacity=30)}
.umbracoSkin .mceButtonLabeled {width:auto}
.umbracoSkin .mceButtonLabeled span.mceIcon {float:left}
.umbracoSkin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica}
.umbracoSkin .mceButtonDisabled .mceButtonLabel {color:#888}
/* Separator */
.defaultSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:2px 2px 0 4px}
.umbracoSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:2px 4px 0 4px}
/* ListBox */
.defaultSkin .mceListBox, .defaultSkin .mceListBox a {display:block}
.defaultSkin .mceListBox .mceText {padding-left:4px; width:70px; text-align:left; border:1px solid #CCC; border-right:0; background:#FFF; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
.defaultSkin .mceListBox .mceOpen {width:9px; height:20px; background:url(../../img/icons.gif) -741px 0; margin-right:2px; border:1px solid #CCC;}
.defaultSkin table.mceListBoxEnabled:hover .mceText, .defaultSkin .mceListBoxHover .mceText, .defaultSkin .mceListBoxSelected .mceText {border:1px solid #A2ABC0; border-right:0; background:#FFF}
.defaultSkin table.mceListBoxEnabled:hover .mceOpen, .defaultSkin .mceListBoxHover .mceOpen, .defaultSkin .mceListBoxSelected .mceOpen {background-color:#FFF; border:1px solid #A2ABC0}
.defaultSkin .mceListBoxDisabled a.mceText {color:gray; background-color:transparent;}
.defaultSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
.defaultSkin .mceOldBoxModel .mceListBox .mceText {height:22px}
.defaultSkin .mceOldBoxModel .mceListBox .mceOpen {width:11px; height:22px;}
.defaultSkin select.mceNativeListBox {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:7pt; background:#F0F0EE; border:1px solid gray; margin-right:2px;}
.umbracoSkin .mceListBox {direction:ltr}
.umbracoSkin .mceListBox, .umbracoSkin .mceListBox a {display:block}
.umbracoSkin .mceListBox .mceText {padding-left:4px; width:70px; text-align:left; border:1px solid #CCC; border-right:0; background:#FFF; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
.umbracoSkin .mceListBox .mceOpen {width:9px; height:20px; background:url(../../img/icons.gif) -741px 0; margin-right:2px; border:1px solid #CCC;}
.umbracoSkin table.mceListBoxEnabled:hover .mceText, .umbracoSkin .mceListBoxHover .mceText, .umbracoSkin .mceListBoxSelected .mceText {border:1px solid #A2ABC0; border-right:0; background:#FFF}
.umbracoSkin table.mceListBoxEnabled:hover .mceOpen, .umbracoSkin .mceListBoxHover .mceOpen, .umbracoSkin .mceListBoxSelected .mceOpen {background-color:#FFF; border:1px solid #A2ABC0}
.umbracoSkin .mceListBoxDisabled a.mceText {color:gray; background-color:transparent;}
.umbracoSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
.umbracoSkin .mceOldBoxModel .mceListBox .mceText {height:22px}
.umbracoSkin .mceOldBoxModel .mceListBox .mceOpen {width:11px; height:22px;}
.umbracoSkin select.mceNativeListBox {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:7pt; background:#F0F0EE; border:1px solid gray; margin-right:2px;}
/* SplitButton */
.defaultSkin .mceSplitButton {width:32px; height:20px; direction:ltr}
.defaultSkin .mceSplitButton a, .defaultSkin .mceSplitButton span {height:20px; display:block}
.defaultSkin .mceSplitButton a.mceAction {width:20px; border:1px solid #F0F0EE; border-right:0;}
.defaultSkin .mceSplitButton span.mceAction {width:20px; background-image:url(../../img/icons.gif);}
.defaultSkin .mceSplitButton a.mceOpen {width:9px; background:url(../../img/icons.gif) -741px 0; border:1px solid #F0F0EE;}
.defaultSkin .mceSplitButton span.mceOpen {display:none}
.defaultSkin table.mceSplitButtonEnabled:hover a.mceAction, .defaultSkin .mceSplitButtonHover a.mceAction, .defaultSkin .mceSplitButtonSelected a.mceAction {border:1px solid #0A246A; border-right:0; background-color:#B2BBD0}
.defaultSkin table.mceSplitButtonEnabled:hover a.mceOpen, .defaultSkin .mceSplitButtonHover a.mceOpen, .defaultSkin .mceSplitButtonSelected a.mceOpen {background-color:#B2BBD0; border:1px solid #0A246A;}
.defaultSkin .mceSplitButtonDisabled .mceAction, .defaultSkin .mceSplitButtonDisabled a.mceOpen {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
.defaultSkin .mceSplitButtonActive a.mceAction {border:1px solid #0A246A; background-color:#C2CBE0}
.defaultSkin .mceSplitButtonActive a.mceOpen {border-left:0;}
.umbracoSkin .mceSplitButton {width:32px; height:20px; direction:ltr}
.umbracoSkin .mceSplitButton a, .umbracoSkin .mceSplitButton span {height:20px; display:block}
.umbracoSkin .mceSplitButton a.mceAction {width:20px; border:1px solid #F0F0EE; border-right:0;}
.umbracoSkin .mceSplitButton span.mceAction {width:20px; background:url(../../img/icons.gif) 20px 20px;}
.umbracoSkin .mceSplitButton a.mceOpen {width:9px; border:1px solid #F0F0EE;}
.umbracoSkin .mceSplitButton span.mceOpen {width:9px; background:url(../../img/icons.gif) -741px 0;}
.umbracoSkin table.mceSplitButtonEnabled:hover a.mceAction, .umbracoSkin .mceSplitButtonHover a.mceAction, .umbracoSkin .mceSplitButtonSelected a.mceAction {border:1px solid #0A246A; border-right:0; background-color:#B2BBD0}
.umbracoSkin table.mceSplitButtonEnabled:hover a.mceOpen, .umbracoSkin .mceSplitButtonHover a.mceOpen, .umbracoSkin .mceSplitButtonSelected a.mceOpen {border:1px solid #0A246A;}
.umbracoSkin table.mceSplitButtonEnabled:hover span.mceOpen, .umbracoSkin .mceSplitButtonHover span.mceOpen, .umbracoSkin .mceSplitButtonSelected span.mceOpen {background-color:#B2BBD0}
.umbracoSkin .mceSplitButtonDisabled .mceAction, .umbracoSkin .mceSplitButtonDisabled span.mceOpen {opacity:0.3; filter:alpha(opacity=30)}
.umbracoSkin .mceSplitButtonActive a.mceAction {border:1px solid #0A246A; background-color:#C2CBE0}
.umbracoSkin .mceSplitButtonActive a.mceOpen {border-left:0;}
/* ColorSplitButton */
.defaultSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray}
.defaultSkin .mceColorSplitMenu td {padding:2px}
.defaultSkin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080}
.defaultSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
.defaultSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}
.defaultSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2}
.defaultSkin a.mceMoreColors:hover {border:1px solid #0A246A}
.defaultSkin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a}
.defaultSkin .mce_forecolor span.mceAction, .defaultSkin .mce_backcolor span.mceAction {overflow:hidden; height:16px}
.umbracoSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray}
.umbracoSkin .mceColorSplitMenu td {padding:2px}
.umbracoSkin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080}
.umbracoSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
.umbracoSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}
.umbracoSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2}
.umbracoSkin a.mceMoreColors:hover {border:1px solid #0A246A}
.umbracoSkin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a}
.umbracoSkin .mce_forecolor span.mceAction, .umbracoSkin .mce_backcolor span.mceAction {overflow:hidden; height:16px}
/* Menu */
.defaultSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #D4D0C8; direction:ltr}
.defaultSkin .mceNoIcons span.mceIcon {width:0;}
.defaultSkin .mceNoIcons a .mceText {padding-left:10px}
.defaultSkin .mceMenu table {background:#FFF}
.defaultSkin .mceMenu a, .defaultSkin .mceMenu span, .defaultSkin .mceMenu {display:block}
.defaultSkin .mceMenu td {height:20px}
.defaultSkin .mceMenu a {position:relative;padding:3px 0 4px 0}
.defaultSkin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block}
.defaultSkin .mceMenu span.mceText, .defaultSkin .mceMenu .mcePreview {font-size:11px}
.defaultSkin .mceMenu pre.mceText {font-family:Monospace}
.defaultSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
.defaultSkin .mceMenu .mceMenuItemEnabled a:hover, .defaultSkin .mceMenu .mceMenuItemActive {background-color:#dbecf3}
.defaultSkin td.mceMenuItemSeparator {background:#DDD; height:1px}
.defaultSkin .mceMenuItemTitle a {border:0; background:#EEE; border-bottom:1px solid #DDD}
.defaultSkin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px}
.defaultSkin .mceMenuItemDisabled .mceText {color:#888}
.defaultSkin .mceMenuItemSelected .mceIcon {background:url(img/menu_check.gif)}
.defaultSkin .mceNoIcons .mceMenuItemSelected a {background:url(img/menu_arrow.gif) no-repeat -6px center}
.defaultSkin .mceMenu span.mceMenuLine {display:none}
.defaultSkin .mceMenuItemSub a {background:url(img/menu_arrow.gif) no-repeat top right;}
.defaultSkin .mceMenuItem td, .defaultSkin .mceMenuItem th {line-height: normal}
.umbracoSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #D4D0C8}
.umbracoSkin .mceNoIcons span.mceIcon {width:0;}
.umbracoSkin .mceNoIcons a .mceText {padding-left:10px}
.umbracoSkin .mceMenu table {background:#FFF}
.umbracoSkin .mceMenu a, .umbracoSkin .mceMenu span, .umbracoSkin .mceMenu {display:block}
.umbracoSkin .mceMenu td {height:20px}
.umbracoSkin .mceMenu a {position:relative;padding:3px 0 4px 0}
.umbracoSkin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block}
.umbracoSkin .mceMenu span.mceText, .umbracoSkin .mceMenu .mcePreview {font-size:11px}
.umbracoSkin .mceMenu pre.mceText {font-family:Monospace}
.umbracoSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
.umbracoSkin .mceMenu .mceMenuItemEnabled a:hover, .umbracoSkin .mceMenu .mceMenuItemActive {background-color:#dbecf3}
.umbracoSkin td.mceMenuItemSeparator {background:#DDD; height:1px}
.umbracoSkin .mceMenuItemTitle a {border:0; background:#EEE; border-bottom:1px solid #DDD}
.umbracoSkin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px}
.umbracoSkin .mceMenuItemDisabled .mceText {color:#888}
.umbracoSkin .mceMenuItemSelected .mceIcon {background:url(img/menu_check.gif)}
.umbracoSkin .mceNoIcons .mceMenuItemSelected a {background:url(img/menu_arrow.gif) no-repeat -6px center}
.umbracoSkin .mceMenu span.mceMenuLine {display:none}
.umbracoSkin .mceMenuItemSub a {background:url(img/menu_arrow.gif) no-repeat top right;}
/* Progress,Resize */
.defaultSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=50)'; filter:alpha(opacity=50); background:#FFF}
.defaultSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
/* Rtl */
.mceRtl .mceListBox .mceText {text-align: right; padding: 0 4px 0 0}
.mceRtl .mceMenuItem .mceText {text-align: right}
.umbracoSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; filter:alpha(opacity=50); background:#FFF}
.umbracoSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
.umbracoSkin .mcePlaceHolder {border:1px dotted gray}
/* Formats */
.defaultSkin .mce_formatPreview a {font-size:10px}
.defaultSkin .mce_p span.mceText {}
.defaultSkin .mce_address span.mceText {font-style:italic}
.defaultSkin .mce_pre span.mceText {font-family:monospace}
.defaultSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
.defaultSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
.defaultSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
.defaultSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
.defaultSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
.defaultSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
.umbracoSkin .mce_formatPreview a {font-size:10px}
.umbracoSkin .mce_p span.mceText {}
.umbracoSkin .mce_address span.mceText {font-style:italic}
.umbracoSkin .mce_pre span.mceText {font-family:monospace}
.umbracoSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
.umbracoSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
.umbracoSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
.umbracoSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
.umbracoSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
.umbracoSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
/* Theme */
.defaultSkin span.mce_bold {background-position:0 0}
.defaultSkin span.mce_italic {background-position:-60px 0}
.defaultSkin span.mce_underline {background-position:-140px 0}
.defaultSkin span.mce_strikethrough {background-position:-120px 0}
.defaultSkin span.mce_undo {background-position:-160px 0}
.defaultSkin span.mce_redo {background-position:-100px 0}
.defaultSkin span.mce_cleanup {background-position:-40px 0}
.defaultSkin span.mce_bullist {background-position:-20px 0}
.defaultSkin span.mce_numlist {background-position:-80px 0}
.defaultSkin span.mce_justifyleft {background-position:-460px 0}
.defaultSkin span.mce_justifyright {background-position:-480px 0}
.defaultSkin span.mce_justifycenter {background-position:-420px 0}
.defaultSkin span.mce_justifyfull {background-position:-440px 0}
.defaultSkin span.mce_anchor {background-position:-200px 0}
.defaultSkin span.mce_indent {background-position:-400px 0}
.defaultSkin span.mce_outdent {background-position:-540px 0}
.defaultSkin span.mce_link {background-position:-500px 0}
.defaultSkin span.mce_unlink {background-position:-640px 0}
.defaultSkin span.mce_sub {background-position:-600px 0}
.defaultSkin span.mce_sup {background-position:-620px 0}
.defaultSkin span.mce_removeformat {background-position:-580px 0}
.defaultSkin span.mce_newdocument {background-position:-520px 0}
.defaultSkin span.mce_image {background-position:-380px 0}
.defaultSkin span.mce_help {background-position:-340px 0}
.defaultSkin span.mce_code {background-position:-260px 0}
.defaultSkin span.mce_hr {background-position:-360px 0}
.defaultSkin span.mce_visualaid {background-position:-660px 0}
.defaultSkin span.mce_charmap {background-position:-240px 0}
.defaultSkin span.mce_paste {background-position:-560px 0}
.defaultSkin span.mce_copy {background-position:-700px 0}
.defaultSkin span.mce_cut {background-position:-680px 0}
.defaultSkin span.mce_blockquote {background-position:-220px 0}
.defaultSkin .mce_forecolor span.mceAction {background-position:-720px 0}
.defaultSkin .mce_backcolor span.mceAction {background-position:-760px 0}
.defaultSkin span.mce_forecolorpicker {background-position:-720px 0}
.defaultSkin span.mce_backcolorpicker {background-position:-760px 0}
.umbracoSkin span.mce_bold {background-position:0 0}
.umbracoSkin span.mce_italic {background-position:-60px 0}
.umbracoSkin span.mce_underline {background-position:-140px 0}
.umbracoSkin span.mce_strikethrough {background-position:-120px 0}
.umbracoSkin span.mce_undo {background-position:-160px 0}
.umbracoSkin span.mce_redo {background-position:-100px 0}
.umbracoSkin span.mce_cleanup {background-position:-40px 0}
.umbracoSkin span.mce_bullist {background-position:-20px 0}
.umbracoSkin span.mce_numlist {background-position:-80px 0}
.umbracoSkin span.mce_justifyleft {background-position:-460px 0}
.umbracoSkin span.mce_justifyright {background-position:-480px 0}
.umbracoSkin span.mce_justifycenter {background-position:-420px 0}
.umbracoSkin span.mce_justifyfull {background-position:-440px 0}
.umbracoSkin span.mce_anchor {background-position:-200px 0}
.umbracoSkin span.mce_indent {background-position:-400px 0}
.umbracoSkin span.mce_outdent {background-position:-540px 0}
.umbracoSkin span.mce_link {background-position:-500px 0}
.umbracoSkin span.mce_unlink {background-position:-640px 0}
.umbracoSkin span.mce_sub {background-position:-600px 0}
.umbracoSkin span.mce_sup {background-position:-620px 0}
.umbracoSkin span.mce_removeformat {background-position:-580px 0}
.umbracoSkin span.mce_newdocument {background-position:-520px 0}
.umbracoSkin span.mce_image {background-position:-380px 0}
.umbracoSkin span.mce_help {background-position:-340px 0}
.umbracoSkin span.mce_code {background-position:-260px 0}
.umbracoSkin span.mce_hr {background-position:-360px 0}
.umbracoSkin span.mce_visualaid {background-position:-660px 0}
.umbracoSkin span.mce_charmap {background-position:-240px 0}
.umbracoSkin span.mce_paste {background-position:-560px 0}
.umbracoSkin span.mce_copy {background-position:-700px 0}
.umbracoSkin span.mce_cut {background-position:-680px 0}
.umbracoSkin span.mce_blockquote {background-position:-220px 0}
.umbracoSkin .mce_forecolor span.mceAction {background-position:-720px 0}
.umbracoSkin .mce_backcolor span.mceAction {background-position:-760px 0}
.umbracoSkin span.mce_forecolorpicker {background-position:-720px 0}
.umbracoSkin span.mce_backcolorpicker {background-position:-760px 0}
/* Plugins */
.defaultSkin span.mce_advhr {background-position:-0px -20px}
.defaultSkin span.mce_ltr {background-position:-20px -20px}
.defaultSkin span.mce_rtl {background-position:-40px -20px}
.defaultSkin span.mce_emotions {background-position:-60px -20px}
.defaultSkin span.mce_fullpage {background-position:-80px -20px}
.defaultSkin span.mce_fullscreen {background-position:-100px -20px}
.defaultSkin span.mce_iespell {background-position:-120px -20px}
.defaultSkin span.mce_insertdate {background-position:-140px -20px}
.defaultSkin span.mce_inserttime {background-position:-160px -20px}
.defaultSkin span.mce_absolute {background-position:-180px -20px}
.defaultSkin span.mce_backward {background-position:-200px -20px}
.defaultSkin span.mce_forward {background-position:-220px -20px}
.defaultSkin span.mce_insert_layer {background-position:-240px -20px}
.defaultSkin span.mce_insertlayer {background-position:-260px -20px}
.defaultSkin span.mce_movebackward {background-position:-280px -20px}
.defaultSkin span.mce_moveforward {background-position:-300px -20px}
.defaultSkin span.mce_media {background-position:-320px -20px}
.defaultSkin span.mce_nonbreaking {background-position:-340px -20px}
.defaultSkin span.mce_pastetext {background-position:-360px -20px}
.defaultSkin span.mce_pasteword {background-position:-380px -20px}
.defaultSkin span.mce_selectall {background-position:-400px -20px}
.defaultSkin span.mce_preview {background-position:-420px -20px}
.defaultSkin span.mce_print {background-position:-440px -20px}
.defaultSkin span.mce_cancel {background-position:-460px -20px}
.defaultSkin span.mce_save {background-position:-480px -20px}
.defaultSkin span.mce_replace {background-position:-500px -20px}
.defaultSkin span.mce_search {background-position:-520px -20px}
.defaultSkin span.mce_styleprops {background-position:-560px -20px}
.defaultSkin span.mce_table {background-position:-580px -20px}
.defaultSkin span.mce_cell_props {background-position:-600px -20px}
.defaultSkin span.mce_delete_table {background-position:-620px -20px}
.defaultSkin span.mce_delete_col {background-position:-640px -20px}
.defaultSkin span.mce_delete_row {background-position:-660px -20px}
.defaultSkin span.mce_col_after {background-position:-680px -20px}
.defaultSkin span.mce_col_before {background-position:-700px -20px}
.defaultSkin span.mce_row_after {background-position:-720px -20px}
.defaultSkin span.mce_row_before {background-position:-740px -20px}
.defaultSkin span.mce_merge_cells {background-position:-760px -20px}
.defaultSkin span.mce_table_props {background-position:-980px -20px}
.defaultSkin span.mce_row_props {background-position:-780px -20px}
.defaultSkin span.mce_split_cells {background-position:-800px -20px}
.defaultSkin span.mce_template {background-position:-820px -20px}
.defaultSkin span.mce_visualchars {background-position:-840px -20px}
.defaultSkin span.mce_abbr {background-position:-860px -20px}
.defaultSkin span.mce_acronym {background-position:-880px -20px}
.defaultSkin span.mce_attribs {background-position:-900px -20px}
.defaultSkin span.mce_cite {background-position:-920px -20px}
.defaultSkin span.mce_del {background-position:-940px -20px}
.defaultSkin span.mce_ins {background-position:-960px -20px}
.defaultSkin span.mce_pagebreak {background-position:0 -40px}
.defaultSkin span.mce_restoredraft {background-position:-20px -40px}
.defaultSkin span.mce_spellchecker {background-position:-540px -20px}
.defaultSkin span.mce_visualblocks {background-position: -40px -40px}
.umbracoSkin span.mce_advhr {background-position:-0px -20px}
.umbracoSkin span.mce_ltr {background-position:-20px -20px}
.umbracoSkin span.mce_rtl {background-position:-40px -20px}
.umbracoSkin span.mce_emotions {background-position:-60px -20px}
.umbracoSkin span.mce_fullpage {background-position:-80px -20px}
.umbracoSkin span.mce_fullscreen {background-position:-100px -20px}
.umbracoSkin span.mce_iespell {background-position:-120px -20px}
.umbracoSkin span.mce_insertdate {background-position:-140px -20px}
.umbracoSkin span.mce_inserttime {background-position:-160px -20px}
.umbracoSkin span.mce_absolute {background-position:-180px -20px}
.umbracoSkin span.mce_backward {background-position:-200px -20px}
.umbracoSkin span.mce_forward {background-position:-220px -20px}
.umbracoSkin span.mce_insert_layer {background-position:-240px -20px}
.umbracoSkin span.mce_insertlayer {background-position:-260px -20px}
.umbracoSkin span.mce_movebackward {background-position:-280px -20px}
.umbracoSkin span.mce_moveforward {background-position:-300px -20px}
.umbracoSkin span.mce_media {background-position:-320px -20px}
.umbracoSkin span.mce_nonbreaking {background-position:-340px -20px}
.umbracoSkin span.mce_pastetext {background-position:-360px -20px}
.umbracoSkin span.mce_pasteword {background-position:-560px 0}
.umbracoSkin span.mce_selectall {background-position:-400px -20px}
.umbracoSkin span.mce_preview {background-position:-420px -20px}
.umbracoSkin span.mce_print {background-position:-440px -20px}
.umbracoSkin span.mce_cancel {background-position:-460px -20px}
.umbracoSkin span.mce_save {background-position:-480px -20px}
.umbracoSkin span.mce_replace {background-position:-500px -20px}
.umbracoSkin span.mce_search {background-position:-520px -20px}
.umbracoSkin span.mce_styleprops {background-position:-560px -20px}
.umbracoSkin span.mce_table {background-position:-580px -20px}
.umbracoSkin span.mce_cell_props {background-position:-600px -20px}
.umbracoSkin span.mce_delete_table {background-position:-620px -20px}
.umbracoSkin span.mce_delete_col {background-position:-640px -20px}
.umbracoSkin span.mce_delete_row {background-position:-660px -20px}
.umbracoSkin span.mce_col_after {background-position:-680px -20px}
.umbracoSkin span.mce_col_before {background-position:-700px -20px}
.umbracoSkin span.mce_row_after {background-position:-720px -20px}
.umbracoSkin span.mce_row_before {background-position:-740px -20px}
.umbracoSkin span.mce_merge_cells {background-position:-760px -20px}
.umbracoSkin span.mce_table_props {background-position:-980px -20px}
.umbracoSkin span.mce_row_props {background-position:-780px -20px}
.umbracoSkin span.mce_split_cells {background-position:-800px -20px}
.umbracoSkin span.mce_template {background-position:-820px -20px}
.umbracoSkin span.mce_visualchars {background-position:-840px -20px}
.umbracoSkin span.mce_abbr {background-position:-860px -20px}
.umbracoSkin span.mce_acronym {background-position:-880px -20px}
.umbracoSkin span.mce_attribs {background-position:-900px -20px}
.umbracoSkin span.mce_cite {background-position:-920px -20px}
.umbracoSkin span.mce_del {background-position:-940px -20px}
.umbracoSkin span.mce_ins {background-position:-960px -20px}
.umbracoSkin span.mce_pagebreak {background-position:0 -40px}
.umbracoSkin .mce_spellchecker span.mceAction {background-position:-540px -20px}

1
umbraco/presentation/umbraco_client/tinymce3/themes/umbraco/source_editor.htm
View File

@@ -14,6 +14,7 @@
<input type="checkbox" name="wraped" id="wraped" onclick="toggleWordWrap(this);" class="wordWrapCode" /><label for="wraped">{#umbraco_dlg.code_wordwrap}</label>
</div>
<br style="clear: both" />
<textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,monospace; font-size: 12px;" dir="ltr" wrap="off" class="mceFocus"></textarea>

10
umbraco/presentation/umbraco_client/tinymce3/umbraco-implementation-notes.txt
View File

@@ -69,6 +69,12 @@ The following instruction appear to be obsolete
4. EXTRA NOTES BY SGAY - MIGRATING TOWARDS 3.5
Migration performed by merging TinyMCE changes into Umbraco + TinyMCE-3.4.7.
All compressed .js files removed, since they are not used anyway, to keep things clean. Umbraco expressely uses _src.js files, see the modified compressor code.
All compressed .js files removed, since they are not used anyway, to keep things clean.
Umbraco expressely uses _src.js files, see the modified compressor code.
Only tiny_mce_popup.js remains compressed, because that is how it is used, plus the original Umbraco Code used the stock 3.4 version so Umbraco does not seem to patch it. In any case, source is in TinyMCE dev package, under "classes", Popup.js.
Only tiny_mce_popup.js remains compressed, because that is how it is used, plus the original Umbraco Code used the stock 3.4 version so Umbraco does not seem to patch it. In any case, source is in TinyMCE dev package, under "classes", Popup.js.
Currently at TinyMCE 3.5
Still some work needs to be done on the Umbraco template, ui.css and editor_template.js
Especially to fix the external toolbar, to get it closer to the 'avanced' theme
The idea being to have as little differences as possible with 'advanced'