' );
Index: /CKEditor/branches/features/kama/_source/plugins/richcombo/plugin.js
===================================================================
--- /CKEditor/branches/features/kama/_source/plugins/richcombo/plugin.js (revision 3552)
+++ /CKEditor/branches/features/kama/_source/plugins/richcombo/plugin.js (revision 3553)
@@ -189,7 +189,5 @@
'' +
'' + ( this.voiceLabel ? this.voiceLabel + ' ' : '' ) + '' +
- '' +
- '' + this.label + '' +
- '' +
+ '' + this.label + '' +
'' +
'' +
@@ -278,8 +276,13 @@
this._.value = value;
+ var textElement = this.document.getById( 'cke_' + this.id + '_text' );
+
if ( !value )
- text = '' + this.label + '';
-
- var textElement = this.document.getById( 'cke_' + this.id + '_text' );
+ {
+ text = this.label;
+ textElement.addClass( 'cke_inline_label' );
+ }
+ else
+ textElement.removeClass( 'cke_inline_label' );
textElement.setHtml( typeof text != 'undefined' ? text : value );
},
Index: /CKEditor/branches/features/kama/_source/plugins/table/dialogs/table.js
===================================================================
--- /CKEditor/branches/features/kama/_source/plugins/table/dialogs/table.js (revision 3552)
+++ /CKEditor/branches/features/kama/_source/plugins/table/dialogs/table.js (revision 3553)
@@ -24,5 +24,5 @@
title : editor.lang.table.title,
minWidth : 250,
- minHeight : CKEDITOR.env.ie ? 280 : 275,
+ minHeight : CKEDITOR.env.ie ? 295 : 280,
onShow : function()
{
Index: /CKEditor/branches/features/kama/_source/plugins/uicolor/lang/en.js
===================================================================
--- /CKEditor/branches/features/kama/_source/plugins/uicolor/lang/en.js (revision 3553)
+++ /CKEditor/branches/features/kama/_source/plugins/uicolor/lang/en.js (revision 3553)
@@ -0,0 +1,15 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'uicolor', 'en',
+{
+ uicolor :
+ {
+ title : 'UI Color Picker',
+ preview : 'Live preview',
+ config : 'Paste this string into your config.js file',
+ predefined : 'Predefined color sets'
+ }
+});
Index: /CKEditor/branches/features/kama/_source/plugins/uicolor/plugin.js
===================================================================
--- /CKEditor/branches/features/kama/_source/plugins/uicolor/plugin.js (revision 3552)
+++ /CKEditor/branches/features/kama/_source/plugins/uicolor/plugin.js (revision 3553)
@@ -7,4 +7,5 @@
{
requires : [ 'dialog' ],
+ lang : [ 'en' ],
init : function( editor )
Index: /CKEditor/branches/features/kama/_source/skins/kama/elementspath.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/elementspath.css (revision 3552)
+++ /CKEditor/branches/features/kama/_source/skins/kama/elementspath.css (revision 3553)
@@ -19,5 +19,5 @@
}
-.cke_skin_v2 .cke_rtl .cke_path
+.cke_skin_kama .cke_rtl .cke_path
{
float: right;
Index: /CKEditor/branches/features/kama/_source/skins/kama/mainui.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/mainui.css (revision 3552)
+++ /CKEditor/branches/features/kama/_source/skins/kama/mainui.css (revision 3553)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -45,4 +45,9 @@
*/
display: inline-table;
+}
+
+.cke_skin_kama .cke_browser_ie iframe
+{
+ margin-right: -10px;
}
Index: /CKEditor/branches/features/kama/_source/skins/kama/menu.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/menu.css (revision 3552)
+++ /CKEditor/branches/features/kama/_source/skins/kama/menu.css (revision 3553)
@@ -36,6 +36,4 @@
.cke_skin_kama .cke_menuitem a.cke_disabled
{
- filter: alpha(opacity=30); /* IE */
- opacity : 0.3; /* Safari, Opera and Mozilla */
}
@@ -45,36 +43,46 @@
background-position: 100px;
background-repeat:no-repeat;
- background-color: #e3e3c7;
+ background-color: transparent;
width: 16px;
height: 16px;
float: left;
+}
+
+.cke_skin_kama .cke_menuitem .cke_disabled .cke_icon
+{
+ filter: alpha(opacity=70); /* IE */
+ opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+.cke_skin_kama .cke_menuitem .cke_icon_wrapper
+{
+ background-color: #e3e3c7;
border: solid 4px #e3e3c7;
- filter: alpha(opacity=70); /* IE */
- opacity: 0.70; /* Safari, Opera and Mozilla */
-}
-
-.cke_rtl .cke_skin_kama .cke_menuitem .cke_icon
+ width: 16px;
+ height: 16px;
+ float: left;
+ filter: alpha(opacity=70); /* IE */
+ opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+.cke_rtl .cke_skin_kama .cke_menuitem .cke_icon_wrapper
{
float: right;
}
-.cke_skin_kama .cke_menuitem a:hover .cke_icon,
-.cke_skin_kama .cke_menuitem a:focus .cke_icon,
-.cke_skin_kama .cke_menuitem a:active .cke_icon
+.cke_skin_kama .cke_menuitem a:hover .cke_icon_wrapper,
+.cke_skin_kama .cke_menuitem a:focus .cke_icon_wrapper,
+.cke_skin_kama .cke_menuitem a:active .cke_icon_wrapper
{
background-color: #9d9d9d;
border: solid 4px #9d9d9d;
- filter: alpha(opacity=100); /* IE */
- opacity: 1; /* Safari, Opera and Mozilla */
-}
-
-.cke_skin_kama .cke_menuitem a:hover.cke_disabled .cke_icon,
-.cke_skin_kama .cke_menuitem a:focus.cke_disabled .cke_icon,
-.cke_skin_kama .cke_menuitem a:active.cke_disabled .cke_icon
+}
+
+.cke_skin_kama .cke_menuitem a:hover.cke_disabled .cke_icon_wrapper,
+.cke_skin_kama .cke_menuitem a:focus.cke_disabled .cke_icon_wrapper,
+.cke_skin_kama .cke_menuitem a:active.cke_disabled .cke_icon_wrapper
{
background-color: #e3e3c7;
border: solid 4px #e3e3c7;
- filter: alpha(opacity=70); /* IE */
- opacity: 0.70; /* Safari, Opera and Mozilla */
}
@@ -84,9 +92,12 @@
padding-right: 3px;
padding-top: 5px;
+ padding-left: 4px;
height:19px;
- margin-left: 28px;
+ margin-left: 24px;
background-color: #fff;
_overflow: hidden;
_width: 86px;
+ filter: alpha(opacity=70); /* IE */
+ opacity: 0.70; /* Safari, Opera and Mozilla */
}
@@ -97,4 +108,10 @@
padding-left: 3px;
margin-right: 28px;
+}
+
+.cke_skin_kama .cke_menuitem a.cke_disabled .cke_label
+{
+ filter: alpha(opacity=30); /* IE */
+ opacity: 0.30; /* Safari, Opera and Mozilla */
}
@@ -141,2 +158,54 @@
background-image: url(images/arrowleft.gif);
}
+
+/* UI Color Support */
+/*.cke_skin_kama .cke_menuitem .cke_icon_wrapper*/
+/*{*/
+ /*background-color: #9AB8F3;*/
+ /*border: solid 4px #9AB8F3;*/
+/*}*/
+
+/*.cke_skin_kama .cke_menuitem a:hover .cke_icon_wrapper,*/
+/*.cke_skin_kama .cke_menuitem a:focus .cke_icon_wrapper,*/
+/*.cke_skin_kama .cke_menuitem a:active .cke_icon_wrapper*/
+/*{*/
+ /*background-color: #9AB8F3;*/
+ /*border: solid 4px #9AB8F3;*/
+ /*filter: alpha(opacity=100); *//* IE */
+ /*opacity: 1; *//* Safari, Opera and Mozilla */
+/*}*/
+
+/*.cke_skin_kama .cke_menuitem a:hover .cke_label,*/
+/*.cke_skin_kama .cke_menuitem a:focus .cke_label,*/
+/*.cke_skin_kama .cke_menuitem a:active .cke_label*/
+/*{*/
+ /*background-color: #9AB8F3;*/
+ /*filter: alpha(opacity=100); *//* IE */
+ /*opacity: 1; *//* Safari, Opera and Mozilla */
+/*}*/
+
+/*.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_label,*/
+/*.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_label,*/
+/*.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_label*/
+/*{*/
+ /*filter: alpha(opacity=30); *//* IE */
+ /*opacity: 0.30; *//* Safari, Opera and Mozilla */
+/*}*/
+
+/*.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_icon_wrapper,*/
+/*.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_icon_wrapper,*/
+/*.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_icon_wrapper*/
+/*{*/
+ /*background-color: #9AB8F3;*/
+ /*border: solid 4px #9AB8F3;*/
+ /*filter: alpha(opacity=70); *//* IE */
+ /*opacity: 0.70; *//* Safari, Opera and Mozilla */
+/*}*/
+
+/*.cke_skin_kama .cke_menuitem a.cke_disabled .cke_icon_wrapper*/
+/*{*/
+ /*background-color: #9AB8F3;*/
+ /*border: solid 4px #9AB8F3;*/
+ /*filter: alpha(opacity=70); *//* IE */
+ /*opacity: 0.70; *//* Safari, Opera and Mozilla */
+/*}*/
Index: /CKEditor/branches/features/kama/_source/skins/kama/richcombo.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/richcombo.css (revision 3552)
+++ /CKEditor/branches/features/kama/_source/skins/kama/richcombo.css (revision 3553)
@@ -78,4 +78,14 @@
}
+.cke_skin_kama .cke_browser_ie .cke_rcombo .cke_text
+{
+ float: left;
+}
+
+.cke_skin_kama .cke_browser_ie .cke_rtl .cke_rcombo .cke_text
+{
+ float: right;
+}
+
.cke_skin_kama .cke_hc .cke_rcombo .cke_label
{
@@ -104,5 +114,6 @@
}
-.cke_skin_kama .cke_browser_ie6 .cke_rcombo .cke_text
+.cke_skin_kama .cke_browser_ie6 .cke_rcombo .cke_text,
+.cke_skin_kama .cke_browser_iequirks .cke_rcombo .cke_text
{
filter: none;
@@ -117,12 +128,12 @@
.cke_skin_kama .cke_rcombo .cke_openbutton
{
- background-image: url(sprites.png);
- background-position: 0 -68px;
- background-repeat: no-repeat;
+ background-image: url(sprites.png);
+ background-position: 0 -68px;
+ background-repeat: no-repeat;
display: inline-block;
- width: 17px;
+ width: 17px;
height: 22px;
margin: 2px;
- background-repeat: no-repeat;
+ background-repeat: no-repeat;
}
@@ -130,5 +141,5 @@
{
height: 24px;
- width: 15px;
+ width: 15px;
}
Index: /CKEditor/branches/features/kama/_source/skins/kama/skin.js
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/skin.js (revision 3552)
+++ /CKEditor/branches/features/kama/_source/skins/kama/skin.js (revision 3553)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -23,4 +23,62 @@
init : function( editor )
{
+ var contextMenuHead;
+ function contextMenuSetUiColor( color )
+ {
+ if ( !contextMenuHead )
+ return;
+
+ var uiStyle = contextMenuHead.append('style');
+
+ var cssSrc = "/* UI Color Support */\
+.cke_skin_kama .cke_menuitem .cke_icon_wrapper\
+{\
+ background-color: ${color} !important;\
+ border-color: ${color} !important;\
+}\
+\
+.cke_skin_kama .cke_menuitem a:hover .cke_icon_wrapper,\
+.cke_skin_kama .cke_menuitem a:focus .cke_icon_wrapper,\
+.cke_skin_kama .cke_menuitem a:active .cke_icon_wrapper\
+{\
+ background-color: ${color} !important;\
+ border-color: ${color} !important;\
+}\
+\
+.cke_skin_kama .cke_menuitem a:hover .cke_label,\
+.cke_skin_kama .cke_menuitem a:focus .cke_label,\
+.cke_skin_kama .cke_menuitem a:active .cke_label\
+{\
+ background-color: ${color} !important;\
+}\
+\
+.cke_skin_kama .cke_menuitem a.cke_disabled:hover .cke_icon_wrapper,\
+.cke_skin_kama .cke_menuitem a.cke_disabled:focus .cke_icon_wrapper,\
+.cke_skin_kama .cke_menuitem a.cke_disabled:active .cke_icon_wrapper\
+{\
+ background-color: ${color} !important;\
+ border-color: ${color} !important;\
+}\
+\
+.cke_skin_kama .cke_menuitem a.cke_disabled .cke_icon_wrapper\
+{\
+ background-color: ${color} !important;\
+ border-color: ${color} !important;\
+}";
+
+ uiStyle.setAttribute("type", "text/css");
+
+ return ( contextMenuSetUiColor =
+ function( color )
+ {
+ var css = cssSrc.replace( '${color}', color, 'g' );
+
+ if ( CKEDITOR.env.ie )
+ uiStyle.$.styleSheet.cssText = css;
+ else
+ uiStyle.setHtml( css );
+ })( color );
+ }
+
CKEDITOR.tools.extend( editor,
{
@@ -60,11 +118,46 @@
else
uiStyle.setHtml( css );
+
+ contextMenuSetUiColor( color );
})( color );
}
});
+ // If the "contextmenu" plugin is loaded, register the listeners.
+ if ( editor.contextMenu )
+ {
+ var oldFunc = editor.contextMenu._.onMenu;
+
+ editor.contextMenu._.onMenu = function()
+ {
+ oldFunc.apply(this, arguments);
+
+ if ( !contextMenuHead )
+ {
+ // Memorize reference.
+ contextMenuHead = this.menu._.element.getDocument().getHead();
+ contextMenuSetUiColor( editor.getUiColor() );
+ }
+ }
+ }
+
// Apply UI color if specified in config.
if ( editor.config.uiColor )
editor.setUiColor( editor.config.uiColor );
+
+ // Fix editor width
+ editor.on( 'mode', function( event )
+ {
+ if ( !CKEDITOR.env.ie || CKEDITOR.env.version >= 8 || CKEDITOR.env.quirks )
+ return;
+ if ( editor.mode == 'wysiwyg' )
+ editor.container.getElementsByTag( 'iframe' ).getItem(0).setStyle( 'width', '99%' );
+ else if ( editor.mode == 'source' )
+ {
+ var textarea = editor.container.getElementsByTag( 'textarea' ).getItem(0),
+ width = parseInt( textarea.getStyle( 'width' ) );
+ textarea.setStyle( 'width' , (width - 10) + 'px' );
+ }
+ });
}
};
Index: /CKEditor/branches/features/kama/_source/skins/kama/toolbar.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/toolbar.css (revision 3552)
+++ /CKEditor/branches/features/kama/_source/skins/kama/toolbar.css (revision 3553)
@@ -240,6 +240,10 @@
}
-
/* IE Section */
+
+.cke_skin_kama .cke_browser_ie .cke_button .cke_buttonarrow
+{
+ margin-top: -1px;
+}
/* Repeat it here for all variations of ".cke_button a" because of IE6 */
@@ -324,2 +328,17 @@
float: right;
}
+
+.cke_skin_kama .cke_browser_ie8 .cke_button .cke_label
+{
+ float: right;
+}
+
+.cke_skin_kama .cke_browser_ie8 .cke_rtl .cke_button .cke_label
+{
+ float: left;
+}
+
+.cke_skin_kama .cke_browser_iequirks .cke_button .cke_label
+{
+ float: none;
+}
Index: /CKEditor/branches/features/kama/_source/skins/office2003/mainui.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/office2003/mainui.css (revision 3552)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/mainui.css (revision 3553)
@@ -10,4 +10,9 @@
*/
display: inline-table;
+}
+
+.cke_skin_office2003
+{
+ display: block;
}
Index: /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css (revision 3552)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css (revision 3553)
@@ -17,6 +17,6 @@
-webkit-border-top-left-radius: 0;
border-top-left-radius: 0;
- margin-left: 1px;
- _margin-left: 0;
+ /*margin-left: 1px;*/
+ /*_margin-left: 0;*/
}
@@ -58,5 +58,5 @@
.cke_skin_office2003 .cke_rcombo .cke_inline_label
{
- display: none;
+ color: #fff;
}
@@ -249,2 +249,20 @@
float: right;
}
+
+.cke_skin_office2003 .cke_browser_ie8 .cke_button .cke_label
+{
+ padding-top: 2px;
+ float: right;
+}
+
+.cke_skin_office2003 .cke_browser_ie8 .cke_rtl .cke_button .cke_label
+{
+ padding-top: 2px;
+ float: left;
+}
+
+.cke_skin_office2003 .cke_browser_iequirks .cke_button .cke_label
+{
+ padding-top: 0;
+ float: none;
+}
Index: /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css (revision 3552)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css (revision 3553)
@@ -282,4 +282,9 @@
/* IE Section */
+.cke_skin_office2003 .cke_browser_ie .cke_button .cke_buttonarrow
+{
+ margin-top: -1px;
+}
+
/* Repeat it here for all variations of ".cke_button a" because of IE6 */
.cke_skin_office2003 .cke_browser_ie .cke_button a,
Index: /CKEditor/branches/features/kama/_source/skins/v2/mainui.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/v2/mainui.css (revision 3552)
+++ /CKEditor/branches/features/kama/_source/skins/v2/mainui.css (revision 3553)
@@ -10,4 +10,9 @@
*/
display: inline-table;
+}
+
+.cke_skin_v2
+{
+ display: block;
}
Index: /CKEditor/branches/features/kama/_source/skins/v2/richcombo.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/v2/richcombo.css (revision 3552)
+++ /CKEditor/branches/features/kama/_source/skins/v2/richcombo.css (revision 3553)
@@ -15,6 +15,6 @@
-webkit-border-top-left-radius: 0;
border-top-left-radius: 0;
- margin-left: 1px;
- _margin-left: 0;
+ /*margin-left: 1px;*/
+ /*_margin-left: 0;*/
}
@@ -53,5 +53,5 @@
.cke_skin_v2 .cke_rcombo .cke_inline_label
{
- display: none;
+ color: #fff;
}
Index: /CKEditor/branches/features/kama/_source/skins/v2/toolbar.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/v2/toolbar.css (revision 3552)
+++ /CKEditor/branches/features/kama/_source/skins/v2/toolbar.css (revision 3553)
@@ -236,4 +236,9 @@
/* IE Section */
+
+.cke_skin_v2 .cke_browser_ie .cke_button .cke_buttonarrow
+{
+ margin-top: -1px;
+}
/* Repeat it here for all variations of ".cke_button a" because of IE6 */
@@ -334,2 +339,20 @@
padding-top: 3px;
}
+
+.cke_skin_v2 .cke_browser_ie8 .cke_button .cke_label
+{
+ padding-top: 2px;
+ float: right;
+}
+
+.cke_skin_v2 .cke_browser_ie8 .cke_rtl .cke_button .cke_label
+{
+ padding-top: 2px;
+ float: left;
+}
+
+.cke_skin_v2 .cke_browser_iequirks .cke_button .cke_label
+{
+ padding-top: 0;
+ float: none;
+}
Index: /CKEditor/branches/features/kama/_source/themes/default/theme.js
===================================================================
--- /CKEditor/branches/features/kama/_source/themes/default/theme.js (revision 3552)
+++ /CKEditor/branches/features/kama/_source/themes/default/theme.js (revision 3553)
@@ -1,3 +1,3 @@
-/*
+/*
Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -38,13 +38,4 @@
width += 'px';
- // Using a as the outer element container can make IE goes crazy.
- // The fact is that a