diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 86c576dfb97..aa9642d3469 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -344,6 +344,7 @@ class Conf if (empty($this->global->MAIN_GRAPH_LIBRARY)) $this->global->MAIN_GRAPH_LIBRARY = 'artichow'; if (! isset($this->global->MAIN_MAIL_EMAIL_INLINE_IMAGES)) $this->global->MAIN_MAIL_EMAIL_INLINE_IMAGES=1; + if (! isset($this->global->FCKEDITOR_EDITORNAME)) $this->global->FCKEDITOR_EDITORNAME='fckeditor'; // ckeditor to switch // Format for date (used by default when not found or searched in lang) $this->format_date_short="%d/%m/%Y"; # Format of day with PHP/C tags (strftime functions) diff --git a/htdocs/includes/ckeditor/skins/kama/editor.css b/htdocs/includes/ckeditor/skins/kama/editor.css index e039268d346..d93440f36da 100644 --- a/htdocs/includes/ckeditor/skins/kama/editor.css +++ b/htdocs/includes/ckeditor/skins/kama/editor.css @@ -3,7 +3,7 @@ Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ -.cke_skin_kama *,.cke_skin_kama a:hover,.cke_skin_kama a:link,.cke_skin_kama a:visited,.cke_skin_kama a:active{margin:0;padding:0;border:0;background:transparent;text-decoration:none;font:normal normal normal 100% Sans-Serif;width:auto;height:auto;border-collapse:collapse;text-align:left;vertical-align:baseline;white-space:nowrap;cursor:auto;color:#000;font-size:12px;font-family:Arial,Helvetica,Tahoma,Verdana,Sans-Serif;}.cke_skin_kama .cke_rtl *,.cke_skin_kama .cke_rtl a:hover,.cke_skin_kama .cke_rtl a:link,.cke_skin_kama .cke_rtl a:visited,.cke_skin_kama .cke_rtl a:active,.cke_rtl .cke_skin_kama *,.cke_rtl .cke_skin_kama a:hover,.cke_rtl .cke_skin_kama a:link,.cke_rtl .cke_skin_kama a:visited,.cke_rtl .cke_skin_kama a:active{text-align:right;}.cke_skin_kama iframe{vertical-align:inherit;}.cke_skin_kama textarea{white-space:pre;}.cke_skin_kama .cke_browser_gecko textarea{cursor:text;}.cke_skin_kama .cke_browser_gecko textarea[disabled]{cursor:default;}.cke_skin_kama input[type="text"],.cke_skin_kama input[type="password"]{cursor:text;}.cke_skin_kama input[type="text"][disabled],.cke_skin_kama input[type="password"][disabled]{cursor:default;}.cke_skin_kama fieldset{padding:10px;border:2px groove #E0DFE3;}.cke_skin_kama{display:block;}span.cke_skin_kama{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;border:1px solid #D3D3D3;padding:5px;}.cke_skin_kama span.cke_browser_webkit,.cke_skin_kama span.cke_browser_gecko18{display:block;}.cke_skin_kama .cke_wrapper{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;background-color:#d3d3d3;background-image:url(images/sprites.png);background-repeat:repeat-x;background-position:0 -1950px;display:block;_display:inline-block;padding:5px;}.cke_shared .cke_skin_kama .cke_wrapper{padding-bottom:0;}.cke_skin_kama .cke_browser_ie6 .cke_wrapper,.cke_skin_kama .cke_browser_iequirks .cke_wrapper{background-image:none;}.cke_skin_kama .cke_editor{display:inline-table;width:100%;}.cke_skin_kama .ltr .cke_browser_ie iframe{margin-right:-10px;}.cke_skin_kama .rtl .cke_browser_ie iframe{margin-left:-10px;}.cke_skin_kama .cke_browser_opera .cke_editor.cke_skin_kama .cke_resizer{display:table;}.cke_skin_kama .cke_contents{margin:5px;}.cke_skin_kama .cke_hc .cke_contents{border:1px solid black;}.cke_skin_kama .cke_contents iframe{background-color:#fff;}.cke_skin_kama .cke_focus{outline:auto 5px -webkit-focus-ring-color;}.cke_skin_kama textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre;}.cke_skin_kama .cke_browser_iequirks textarea.cke_source{_white-space:normal;}.cke_skin_kama .cke_resizer{width:12px;height:12px;margin-top:9px;display:block;float:right;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -1428px;background-repeat:no-repeat;cursor:se-resize;}.cke_skin_kama .cke_browser_air .cke_resizer,.cke_skin_kama .cke_browser_air .cke_rtl .cke_resizer{cursor:move;}.cke_skin_kama .cke_rtl .cke_resizer{cursor:sw-resize;background-position:0 -1455px;float:left;}.cke_skin_kama .cke_resizer_horizontal,.cke_skin_kama .cke_rtl .cke_resizer_horizontal{cursor:e-resize;}.cke_skin_kama .cke_resizer_vertical,.cke_skin_kama .cke_rtl .cke_resizer_vertical{cursor:n-resize;}.cke_skin_kama .cke_maximized .cke_resizer{display:none;}.cke_skin_kama .cke_browser_ie6 .cke_contents textarea,.cke_skin_kama .cke_browser_ie7 .cke_contents textarea{position:absolute;}.cke_skin_kama .cke_browser_ie.cke_browser_quirks .cke_contents iframe{position:absolute;top:0;}.cke_skin_kama .cke_browser_ie6 .cke_editor,.cke_skin_kama .cke_browser_ie7 .cke_editor{display:inline-block;}.cke_skin_kama .cke_browser_ie6 .cke_editor,.cke_shared .cke_skin_kama .cke_browser_ie7 .cke_wrapper{padding-bottom:5px;}.cke_skin_kama .cke_voice_label{display:none;}.cke_skin_kama legend.cke_voice_label{display:none;}.cke_skin_kama .cke_browser_ie legend.cke_voice_label{position:absolute;display:block;width:0;height:0;overflow:hidden;}.cke_skin_kama .cke_panel{border:1px solid #8f8f73;background-color:#fff;width:120px;height:100px;overflow:hidden;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;} +.cke_skin_kama *,.cke_skin_kama a:hover,.cke_skin_kama a:link,.cke_skin_kama a:visited,.cke_skin_kama a:active{margin:0;padding:0;border:0;background:transparent;text-decoration:none;font:normal normal normal 100% Sans-Serif;width:auto;height:auto;border-collapse:collapse;text-align:left;vertical-align:baseline;white-space:nowrap;cursor:auto;color:#000;font-size:12px;font-family:Arial,Helvetica,Tahoma,Verdana,Sans-Serif;}.cke_skin_kama .cke_rtl *,.cke_skin_kama .cke_rtl a:hover,.cke_skin_kama .cke_rtl a:link,.cke_skin_kama .cke_rtl a:visited,.cke_skin_kama .cke_rtl a:active,.cke_rtl .cke_skin_kama *,.cke_rtl .cke_skin_kama a:hover,.cke_rtl .cke_skin_kama a:link,.cke_rtl .cke_skin_kama a:visited,.cke_rtl .cke_skin_kama a:active{text-align:right;}.cke_skin_kama iframe{vertical-align:inherit;}.cke_skin_kama textarea{white-space:pre;}.cke_skin_kama .cke_browser_gecko textarea{cursor:text;}.cke_skin_kama .cke_browser_gecko textarea[disabled]{cursor:default;}.cke_skin_kama input[type="text"],.cke_skin_kama input[type="password"]{cursor:text;}.cke_skin_kama input[type="text"][disabled],.cke_skin_kama input[type="password"][disabled]{cursor:default;}.cke_skin_kama fieldset{padding:10px;border:2px groove #E0DFE3;}.cke_skin_kama{display:block;}span.cke_skin_kama{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;border: 0;padding:0px;}.cke_skin_kama span.cke_browser_webkit,.cke_skin_kama span.cke_browser_gecko18{display:block;}.cke_skin_kama .cke_wrapper{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;background-color:#d3d3d3;background-image:url(images/sprites.png);background-repeat:repeat-x;background-position:0 -1950px;display:block;_display:inline-block;padding:5px;}.cke_shared .cke_skin_kama .cke_wrapper{padding-bottom:0;}.cke_skin_kama .cke_browser_ie6 .cke_wrapper,.cke_skin_kama .cke_browser_iequirks .cke_wrapper{background-image:none;}.cke_skin_kama .cke_editor{display:inline-table;width:100%;}.cke_skin_kama .ltr .cke_browser_ie iframe{margin-right:-10px;}.cke_skin_kama .rtl .cke_browser_ie iframe{margin-left:-10px;}.cke_skin_kama .cke_browser_opera .cke_editor.cke_skin_kama .cke_resizer{display:table;}.cke_skin_kama .cke_contents{margin:5px;}.cke_skin_kama .cke_hc .cke_contents{border:1px solid black;}.cke_skin_kama .cke_contents iframe{background-color:#fff;}.cke_skin_kama .cke_focus{outline:auto 5px -webkit-focus-ring-color;}.cke_skin_kama textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre;}.cke_skin_kama .cke_browser_iequirks textarea.cke_source{_white-space:normal;}.cke_skin_kama .cke_resizer{width:12px;height:12px;margin-top:9px;display:block;float:right;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:0 -1428px;background-repeat:no-repeat;cursor:se-resize;}.cke_skin_kama .cke_browser_air .cke_resizer,.cke_skin_kama .cke_browser_air .cke_rtl .cke_resizer{cursor:move;}.cke_skin_kama .cke_rtl .cke_resizer{cursor:sw-resize;background-position:0 -1455px;float:left;}.cke_skin_kama .cke_resizer_horizontal,.cke_skin_kama .cke_rtl .cke_resizer_horizontal{cursor:e-resize;}.cke_skin_kama .cke_resizer_vertical,.cke_skin_kama .cke_rtl .cke_resizer_vertical{cursor:n-resize;}.cke_skin_kama .cke_maximized .cke_resizer{display:none;}.cke_skin_kama .cke_browser_ie6 .cke_contents textarea,.cke_skin_kama .cke_browser_ie7 .cke_contents textarea{position:absolute;}.cke_skin_kama .cke_browser_ie.cke_browser_quirks .cke_contents iframe{position:absolute;top:0;}.cke_skin_kama .cke_browser_ie6 .cke_editor,.cke_skin_kama .cke_browser_ie7 .cke_editor{display:inline-block;}.cke_skin_kama .cke_browser_ie6 .cke_editor,.cke_shared .cke_skin_kama .cke_browser_ie7 .cke_wrapper{padding-bottom:5px;}.cke_skin_kama .cke_voice_label{display:none;}.cke_skin_kama legend.cke_voice_label{display:none;}.cke_skin_kama .cke_browser_ie legend.cke_voice_label{position:absolute;display:block;width:0;height:0;overflow:hidden;}.cke_skin_kama .cke_panel{border:1px solid #8f8f73;background-color:#fff;width:120px;height:100px;overflow:hidden;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;} .cke_skin_kama .cke_contextmenu{margin:0;}.cke_skin_kama .cke_panel iframe{width:100%;height:100%;}html.cke_skin_kama_container{overflow:auto;overflow-x:hidden;}body.cke_panel_frame{overflow:auto;}.cke_panel_frame .cke_label{display:none;}ul.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap;}li.cke_panel_listItem{margin:0;}.cke_panel_listItem a{padding:2px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;}* html .cke_panel_listItem a{width:100%;color:#000;}*:first-child+html .cke_panel_listItem a{color:#000;}.cke_panel_listItem.cke_selected a{border:1px solid #ccc;background-color:#e9f5ff;}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#316ac5;background-color:#dff1ff;}.cke_hc .cke_panel_listItem.cke_selected a,.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border-width:3px;padding:0;}.cke_panel_grouptitle{font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif;font-weight:bold;white-space:nowrap;background-color:#dcdcdc;color:#000;margin:0;padding:3px;}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:3px;margin-bottom:3px;}.cke_skin_kama .cke_button_textcolor_panel,.cke_skin_kama .cke_button_bgcolor_panel{width:150px;height:135px;}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif;}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000;}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left;}.cke_rtl span.cke_colorbox{float:right;}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;}.cke_rtl a.cke_colorbox{float:right;}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#316ac5 1px solid;background-color:#dff1ff;}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer;}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#316ac5 1px solid;background-color:#dff1ff;}@media print{.cke_skin_kama .cke_toolbox{display:none;}}.cke_skin_kama .cke_browser_webkit .cke_toolbox,.cke_skin_kama .cke_browser_webkit .cke_toolbox>span{white-space:normal;}.cke_skin_kama .cke_toolbox{clear:both;padding-bottom:1px;}.cke_skin_kama a.cke_toolbox_collapser,.cke_skin_kama a:hover.cke_toolbox_collapser{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:3px -1366px;background-repeat:no-repeat;width:11px;height:11px;float:right;border:1px outset #D3D3D3;margin:11px 0 2px;cursor:pointer;}.cke_skin_kama .cke_rtl a.cke_toolbox_collapser,.cke_skin_kama .cke_rtl a:hover.cke_toolbox_collapser{float:left;}.cke_skin_kama a.cke_toolbox_collapser span{display:none;}.cke_skin_kama .cke_hc a.cke_toolbox_collapser span{font-size:10px;font-weight:bold;font-family:Arial;display:inline;}.cke_skin_kama a.cke_toolbox_collapser_min,.cke_skin_kama a:hover.cke_toolbox_collapser_min{background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-position:4px -1387px;background-repeat:no-repeat;margin:2px 4px;}.cke_skin_kama .cke_rtl a.cke_toolbox_collapser_min,.cke_skin_kama .cke_rtl a:hover.cke_toolbox_collapser_min{background-position:4px -1408px;}.cke_skin_kama .cke_toolbar{display:inline;}.cke_skin_kama .cke_separator{display:none;}.cke_skin_kama .cke_break{font-size:0;clear:left;}.cke_skin_kama .cke_rtl .cke_break{clear:right;}.cke_skin_kama .cke_toolbar_start{display:none;}.cke_skin_kama .cke_toolgroup{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:repeat-x;background-position:0 -500px;float:left;margin-right:6px;margin-bottom:5px;padding:2px;display:inline;} .cke_skin_kama .cke_rtl .cke_toolgroup{float:right;margin-right:0;margin-left:6px;}.cke_skin_kama .cke_toolgroup{display:block;height:22px;}.cke_skin_kama .cke_button a,.cke_skin_kama .cke_button a:hover,.cke_skin_kama .cke_button a:focus,.cke_skin_kama .cke_button a:active,.cke_skin_kama .cke_button a.cke_off{border-radius:3px;outline:none;padding:2px 4px;height:18px;display:inline-block;cursor:default;}.cke_skin_kama .cke_button a,.cke_skin_kama .cke_button a.cke_off{filter:alpha(opacity=70);opacity:.70;-moz-border-radius:3px;-webkit-border-radius:3px;}.cke_skin_kama .cke_hc .cke_button a,.cke_skin_kama .cke_hc .cke_button a.cke_off{opacity:1.0;filter:alpha(opacity=100);border:1px solid white;}.cke_skin_kama .cke_button a.cke_on{background-color:#a3d7ff;filter:alpha(opacity=100);opacity:1;padding:2px 4px;}.cke_skin_kama .cke_hc .cke_button a.cke_on{padding:0 2px!important;border-width:3px;}.cke_skin_kama .cke_button a.cke_disabled *{filter:alpha(opacity=30);opacity:.3;}.cke_skin_kama .cke_browser_ie .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie a:hover.cke_button .cke_disabled *{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);}.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie .cke_rtl a:hover.cke_button .cke_disabled *{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);}.cke_skin_kama .cke_browser_ie6 .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie6 a:hover.cke_button .cke_disabled *{filter:alpha(opacity=30);}.cke_skin_kama .cke_hc .cke_button a.cke_disabled *,.cke_skin_kama .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled *{filter:alpha(opacity=60);opacity:.6;}.cke_skin_kama .cke_button a:hover.cke_on,.cke_skin_kama .cke_button a:focus.cke_on,.cke_skin_kama .cke_button a:active.cke_on,.cke_skin_kama .cke_button a:hover.cke_off,.cke_skin_kama .cke_button a:focus.cke_off,.cke_skin_kama .cke_button a:active.cke_off{filter:alpha(opacity=100);opacity:1;padding:2px 4px;}.cke_skin_kama .cke_button a:hover,.cke_skin_kama .cke_button a:focus,.cke_skin_kama .cke_button a:active{background-color:#dff1ff;}.cke_skin_kama .cke_button a:hover.cke_on,.cke_skin_kama .cke_button a:focus.cke_on,.cke_skin_kama .cke_button a:active.cke_on{background-color:#86caff;}.cke_skin_kama .cke_hc .cke_button a:hover,.cke_skin_kama .cke_hc .cke_button a:focus,.cke_skin_kama .cke_hc .cke_button a:active{padding:0 2px!important;border-width:3px;}.cke_skin_kama .cke_button .cke_icon{background-image:url(icons.png);background-position:100px;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;display:inline-block;float:left;cursor:default;}.cke_skin_kama .cke_rtl .cke_button .cke_icon{background-image:url(icons_rtl.png);}.cke_skin_kama .cke_browser_ie .cke_button .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_skin_kama .cke_browser_ie6 .cke_button .cke_icon,.cke_skin_kama .cke_browser_ie6 .cke_rtl .cke_button .cke_icon{filter:;}.cke_skin_kama .cke_rtl .cke_button .cke_icon{float:right;}.cke_skin_kama .cke_button .cke_label{cursor:default;display:none;padding-left:3px;line-height:18px;vertical-align:middle;float:left;}.cke_skin_kama .cke_rtl .cke_button .cke_label{padding-left:0;padding-right:3px;float:right;}.cke_skin_kama .cke_hc .cke_button .cke_label{padding:0;display:inline-block;}.cke_skin_kama .cke_hc .cke_button .cke_icon{display:none;}.cke_skin_kama .cke_accessibility{position:absolute;display:block;width:0;height:0;overflow:hidden;}.cke_skin_kama .cke_button .cke_buttonarrow{display:inline-block;height:17px;width:8px;background-position:2px -1469px;background-image:url(images/sprites.png);_background-image:url(images/sprites_ie6.png);background-repeat:no-repeat;float:left;cursor:default;}.cke_skin_kama .cke_browser_ie .cke_button .cke_buttonarrow{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');} .cke_skin_kama .cke_browser_ie6 .cke_button .cke_buttonarrow{filter:;}.cke_skin_kama .cke_rtl .cke_button .cke_buttonarrow{background-position:0 -1469px;float:right;}.cke_skin_kama .cke_browser_gecko .cke_toolbar,.cke_skin_kama .cke_browser_gecko .cke_button a,.cke_skin_kama .cke_browser_gecko .cke_button a.cke_off,.cke_skin_kama .cke_browser_gecko .cke_button .cke_icon,.cke_skin_kama .cke_browser_gecko .cke_button .cke_buttonarrow,.cke_skin_kama .cke_browser_gecko .cke_separator,.cke_skin_kama .cke_browser_gecko .cke_toolbar_start{display:block;float:left;}.cke_skin_kama .cke_browser_gecko.cke_hc .cke_button .cke_icon{display:none;}.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_toolbar,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button a,.cke_skin_kama .cke_browser_gecko .cke_rtl.cke_button a.cke_off,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button .cke_icon,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button .cke_buttonarrow,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_toolbar_start{float:right;}.cke_skin_kama .cke_browser_gecko .cke_button .cke_label,.cke_skin_kama .cke_browser_gecko .cke_break{float:left;}.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button .cke_label,.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_break{float:right;}.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button .cke_icon,.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button .cke_label,.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button .cke_buttonarrow{float:none;}.cke_skin_kama .cke_browser_webkit .cke_toolbar{float:left;}.cke_skin_kama .cke_browser_webkit .cke_rtl .cke_toolbar{float:right;}.cke_skin_kama .cke_browser_ie8 .cke_button .cke_label,.cke_skin_kama .cke_browser_opera .cke_button .cke_label,.cke_skin_kama .cke_browser_webkit .cke_button .cke_label{line-height:20px;}.cke_skin_kama .cke_browser_opera.cke_browser_quirks .cke_button .cke_label,.cke_skin_kama .cke_browser_iequirks .cke_button .cke_label{line-height:17px;}.cke_skin_kama .cke_browser_ie .cke_rcombo,.cke_skin_kama .cke_browser_ie .cke_rcombo *{cursor:default;}.cke_skin_kama .cke_browser_ie .cke_toolbox{padding-bottom:5px;_padding-bottom:6px;}.cke_shared .cke_skin_kama .cke_browser_ie .cke_toolbox{padding-bottom:0;}.cke_skin_kama .cke_contextmenu{padding:2px;}.cke_skin_kama .cke_menuitem a{display:block;}.cke_skin_kama .cke_menuitem span{cursor:default;}.cke_skin_kama .cke_menuitem a:hover,.cke_skin_kama .cke_menuitem a:focus,.cke_skin_kama .cke_menuitem a:active{background-color:#D3D3D3;display:block;}.cke_hc .cke_menuitem a:hover,.cke_hc .cke_menuitem a:focus,.cke_hc .cke_menuitem a:active{border:2px solid;}.cke_skin_kama .cke_menuitem .cke_icon{background-image:url(icons.png);background-position:100px;background-repeat:no-repeat;background-color:transparent;width:16px;height:16px;float:left;}.cke_rtl .cke_skin_kama .cke_menuitem .cke_icon{background-image:url(icons_rtl.png);}.cke_browser_ie .cke_skin_kama .cke_menuitem .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie.cke_rtl .cke_skin_kama .cke_menuitem .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie6 .cke_skin_kama .cke_menuitem .cke_icon{filter:;}.cke_skin_kama .cke_menuitem .cke_disabled .cke_icon{filter:alpha(opacity=70);opacity:.70;}.cke_browser_ie .cke_skin_kama .cke_menuitem .cke_disabled .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie.cke_rtl .cke_skin_kama .cke_menuitem .cke_disabled .cke_icon{filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');}.cke_browser_ie6 .cke_skin_kama .cke_menuitem .cke_disabled .cke_icon{filter:;}.cke_skin_kama .cke_menuitem .cke_icon_wrapper{background-color:#D3D3D3;border:solid 4px #D3D3D3;width:16px;height:16px;float:left;filter:alpha(opacity=70);opacity:.70;clear:both;}.cke_browser_ie9 .cke_skin_kama .cke_menuitem .cke_icon_wrapper{width:24px;height:24px;}.cke_rtl .cke_skin_kama .cke_menuitem .cke_icon_wrapper{float:right;}.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=70);opacity:.70;} diff --git a/htdocs/includes/ckeditor/skins/kama/icons.png b/htdocs/includes/ckeditor/skins/kama/icons.png index 7c3bf195dd3..1beb3d44f89 100644 Binary files a/htdocs/includes/ckeditor/skins/kama/icons.png and b/htdocs/includes/ckeditor/skins/kama/icons.png differ diff --git a/htdocs/includes/ckeditor/skins/kama/images/sprites.png b/htdocs/includes/ckeditor/skins/kama/images/sprites.png index 0cb4e1c6c37..e7589bd1da6 100644 Binary files a/htdocs/includes/ckeditor/skins/kama/images/sprites.png and b/htdocs/includes/ckeditor/skins/kama/images/sprites.png differ diff --git a/htdocs/includes/dolibarr_changes.txt b/htdocs/includes/dolibarr_changes.txt index 55e682df176..d056a683f92 100644 --- a/htdocs/includes/dolibarr_changes.txt +++ b/htdocs/includes/dolibarr_changes.txt @@ -7,6 +7,12 @@ ALL: Replace "& new" by "new" +CKEDITOR: +--------- +Remove border and padding into style .cke_skin_kama +into file includes/ckeditor/skins/kama/editor.css + + NUSOAP: ------- * In file nusoap.php, to avoid a warning, diff --git a/htdocs/lib/doleditor.class.php b/htdocs/lib/doleditor.class.php index 448ed29b78f..760b6f543c0 100644 --- a/htdocs/lib/doleditor.class.php +++ b/htdocs/lib/doleditor.class.php @@ -60,7 +60,7 @@ class DolEditor * 'In' chaque fenetre d'edition a la propre barre d'outils * 'Out:nom' partage de la barre d'outils ou 'nom' est le nom du DIV qui affiche la barre * @param toolbarstartexpanded visible ou non au demarrage - * @param uselocalbrowser Enabled to add links to local object with local browsers. If false, only external images can be added in content. + * @param uselocalbrowser Enabled to add links to local object with local browser. If false, only external images can be added in content. * @param okforextandededitor True=Allow usage of extended editor tool (like fckeditor) * @param rows Size of rows for textarea tool * @param cols Size of cols for textarea tool @@ -71,8 +71,10 @@ class DolEditor dol_syslog("DolEditor::DolEditor htmlname=".$htmlname." tool=".$tool); - // Name of extended editor to use - $this->tool=empty($conf->global->FCKEDITOR_EDITORNAME)?'fckeditor':$conf->global->FCKEDITOR_EDITORNAME; + // Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor') + $defaulteditor='ckeditor'; + $this->tool=empty($conf->global->FCKEDITOR_EDITORNAME)?$defaulteditor:$conf->global->FCKEDITOR_EDITORNAME; + $this->uselocalbrowser=$uselocalbrowser; // Check if extended editor is ok. If not we force textarea if (empty($conf->fckeditor->enabled) || ! $okforextendededitor) @@ -166,8 +168,9 @@ class DolEditor toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').', width: '.($this->width ? $this->width : '\'\'').', height: '.$this->height.', - skin: \''.$skin.'\', - on : { + skin: \''.$skin.'\', + on : + { instanceReady : function( ev ) { // Output paragraphs as

Text

. @@ -180,7 +183,15 @@ class DolEditor breakAfterClose : true }); } - } + }'; + if ($this->uselocalbrowser) + { + print ','."\n".' filebrowserBrowseUrl : \'/browser/browse.php\', + filebrowserUploadUrl : \'/uploader/upload.php\', + filebrowserImageWindowWidth : \'640\', + filebrowserImageWindowHeight : \'480\''; + } + print ' }); }); diff --git a/htdocs/theme/auguria/ckeditor/config.js b/htdocs/theme/auguria/ckeditor/config.js index 634ef24dddb..8889187d301 100644 --- a/htdocs/theme/auguria/ckeditor/config.js +++ b/htdocs/theme/auguria/ckeditor/config.js @@ -7,7 +7,24 @@ CKEDITOR.editorConfig = function( config ) { // Define changes to default configuration here. // http://docs.cksource.com/CKEditor_3.x/Developers_Guide - + // http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html + config.enterMode = CKEDITOR.ENTER_BR; + config.resize_enabled = false; + //config.resize_maxHeight = 3000; + //config.resize_maxWidth = 3000; + //config.height = '300px'; + //config.resize_dir = 'vertical'; // horizontal, vertical, both + config.removePlugins = 'elementspath,save,font'; + config.removeDialogTabs = 'flash:advanced'; // config.removeDialogTabs = 'flash:advanced;image:Link'; + config.protectedSource.push( /<\?[\s\S]*?\?>/g ); // Prevent PHP Code to be formatted + //config.menu_groups = 'clipboard,table,anchor,link,image'; // for context menu 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea' + //config.language = 'de'; + //config.defaultLanguage = 'en'; + //config.contentsLanguage = 'fr'; + config.fullPage = false; // Not a full html page string, just part of it + config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)'; + //config.contentsCss = '/css/mysitestyles.css'; + config.toolbar_Full = [ ['Source','-','Save','NewPage','Preview','-','Templates'], @@ -29,37 +46,36 @@ CKEDITOR.editorConfig = function( config ) config.toolbar_dolibarr_mailings = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','PasteText','PasteWord','-','SpellCheck','-','Preview','Print'], - ['Undo','Redo','-','Find','Replace','-','SelectAll'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['Link','Unlink','Anchor','Image','Table','Rule','SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['Undo','Redo','-','Find','Replace'], + ['Font','FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Link','Unlink','Anchor','Image','Table','SpecialChar'] ]; config.toolbar_dolibarr_notes = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','PasteText','PasteWord','-','SpellCheck','-','Preview','Print'], - ['Undo','Redo','-','Find','Replace','-','SelectAll'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['Link','Unlink','Anchor','Image','Table','Rule','SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['Undo','Redo','-','Find','Replace'], + ['Font','FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Link','Unlink','Image','Table','SpecialChar'] ]; config.toolbar_dolibarr_details = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','-','Preview'], - ['Undo','Redo'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['SpecialChar'] ]; }; diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index b8f4986e765..6d2c574d602 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -1747,6 +1747,8 @@ div.menuFleche } + + /* ============================================================================== */ /* CSS for color picker */ /* ============================================================================== */ @@ -1851,3 +1853,13 @@ A.none, A.none:active, A.none:visited, A.none:hover { line-height: 1em !important; } .ui-autocomplete-input { margin: 0; padding: 1px; } + + +/* ============================================================================== */ +/* CKEditor */ +/* ============================================================================== */ + +.cke_editor table, .cke_editor tr, .cke_editor td +{ + border: 0px solid #FF0000 !important; +} diff --git a/htdocs/theme/bureau2crea/ckeditor/config.js b/htdocs/theme/bureau2crea/ckeditor/config.js index 634ef24dddb..8889187d301 100644 --- a/htdocs/theme/bureau2crea/ckeditor/config.js +++ b/htdocs/theme/bureau2crea/ckeditor/config.js @@ -7,7 +7,24 @@ CKEDITOR.editorConfig = function( config ) { // Define changes to default configuration here. // http://docs.cksource.com/CKEditor_3.x/Developers_Guide - + // http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html + config.enterMode = CKEDITOR.ENTER_BR; + config.resize_enabled = false; + //config.resize_maxHeight = 3000; + //config.resize_maxWidth = 3000; + //config.height = '300px'; + //config.resize_dir = 'vertical'; // horizontal, vertical, both + config.removePlugins = 'elementspath,save,font'; + config.removeDialogTabs = 'flash:advanced'; // config.removeDialogTabs = 'flash:advanced;image:Link'; + config.protectedSource.push( /<\?[\s\S]*?\?>/g ); // Prevent PHP Code to be formatted + //config.menu_groups = 'clipboard,table,anchor,link,image'; // for context menu 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea' + //config.language = 'de'; + //config.defaultLanguage = 'en'; + //config.contentsLanguage = 'fr'; + config.fullPage = false; // Not a full html page string, just part of it + config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)'; + //config.contentsCss = '/css/mysitestyles.css'; + config.toolbar_Full = [ ['Source','-','Save','NewPage','Preview','-','Templates'], @@ -29,37 +46,36 @@ CKEDITOR.editorConfig = function( config ) config.toolbar_dolibarr_mailings = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','PasteText','PasteWord','-','SpellCheck','-','Preview','Print'], - ['Undo','Redo','-','Find','Replace','-','SelectAll'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['Link','Unlink','Anchor','Image','Table','Rule','SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['Undo','Redo','-','Find','Replace'], + ['Font','FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Link','Unlink','Anchor','Image','Table','SpecialChar'] ]; config.toolbar_dolibarr_notes = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','PasteText','PasteWord','-','SpellCheck','-','Preview','Print'], - ['Undo','Redo','-','Find','Replace','-','SelectAll'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['Link','Unlink','Anchor','Image','Table','Rule','SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['Undo','Redo','-','Find','Replace'], + ['Font','FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Link','Unlink','Image','Table','SpecialChar'] ]; config.toolbar_dolibarr_details = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','-','Preview'], - ['Undo','Redo'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['SpecialChar'] ]; }; diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 0105bef3732..c23ad49ea5f 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -83,7 +83,7 @@ body { width: 100%; margin: 0px; } - + #mainbody .connexion_box { position: absolute; top: 2px; @@ -91,7 +91,7 @@ body { height: 12px; text-align: left; } - + #mainbody .connexion_box .login, #mainbody .connexion_box .printer { margin-left: 10px; font-size: 10px; @@ -99,7 +99,7 @@ body { padding: 0px !important; padding-right: 10px !important; } - + #mainbody .connexion_box .login a { color: #333; text-decoration: none; @@ -427,12 +427,12 @@ li.tmenu, li.tmenusel { li.tmenu span, li.tmenusel span { margin: 0px 10px 0px 10px; } - + li.tmenu { background-image : url(); background-position: right; } - + li.tmenu a { position: relative; display: block; @@ -447,16 +447,16 @@ li.tmenu a { color: #FFF; font-weight: normal; } - + li.tmenu a:hover { color: #842F00; } - + li.tmenusel { background-image : url(); background-position: right; } - + li.tmenusel a.tmenusel { position: relative; display: block; @@ -471,11 +471,11 @@ li.tmenusel a.tmenusel { color: #303030; font-weight: normal; } - + li.tmenusel a:hover { color: #474747; } - + li.tmenu a.tmenudisabled { color: #CCC; } @@ -1256,13 +1256,13 @@ tr.liste_titre select.flat { float: left; width: 200px; position: relative; - margin: 30px 10px 10px 0px; + margin: 30px 10px 10px 0px; } tr.liste_titre input.button { float: left; position: relative; - margin: 30px 10px 10px 0px; + margin: 30px 10px 10px 0px; } td.liste_titre_sel { @@ -1979,3 +1979,13 @@ table.noborder { div.leftContent { background-color: #FFF; } + + +/* ============================================================================== */ +/* CKEditor */ +/* ============================================================================== */ + +.cke_editor table, .cke_editor tr, .cke_editor td +{ + border: 0px solid #FF0000 !important; +} diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js index 634ef24dddb..8889187d301 100644 --- a/htdocs/theme/eldy/ckeditor/config.js +++ b/htdocs/theme/eldy/ckeditor/config.js @@ -7,7 +7,24 @@ CKEDITOR.editorConfig = function( config ) { // Define changes to default configuration here. // http://docs.cksource.com/CKEditor_3.x/Developers_Guide - + // http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html + config.enterMode = CKEDITOR.ENTER_BR; + config.resize_enabled = false; + //config.resize_maxHeight = 3000; + //config.resize_maxWidth = 3000; + //config.height = '300px'; + //config.resize_dir = 'vertical'; // horizontal, vertical, both + config.removePlugins = 'elementspath,save,font'; + config.removeDialogTabs = 'flash:advanced'; // config.removeDialogTabs = 'flash:advanced;image:Link'; + config.protectedSource.push( /<\?[\s\S]*?\?>/g ); // Prevent PHP Code to be formatted + //config.menu_groups = 'clipboard,table,anchor,link,image'; // for context menu 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea' + //config.language = 'de'; + //config.defaultLanguage = 'en'; + //config.contentsLanguage = 'fr'; + config.fullPage = false; // Not a full html page string, just part of it + config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)'; + //config.contentsCss = '/css/mysitestyles.css'; + config.toolbar_Full = [ ['Source','-','Save','NewPage','Preview','-','Templates'], @@ -29,37 +46,36 @@ CKEDITOR.editorConfig = function( config ) config.toolbar_dolibarr_mailings = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','PasteText','PasteWord','-','SpellCheck','-','Preview','Print'], - ['Undo','Redo','-','Find','Replace','-','SelectAll'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['Link','Unlink','Anchor','Image','Table','Rule','SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['Undo','Redo','-','Find','Replace'], + ['Font','FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Link','Unlink','Anchor','Image','Table','SpecialChar'] ]; config.toolbar_dolibarr_notes = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','PasteText','PasteWord','-','SpellCheck','-','Preview','Print'], - ['Undo','Redo','-','Find','Replace','-','SelectAll'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['Link','Unlink','Anchor','Image','Table','Rule','SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['Undo','Redo','-','Find','Replace'], + ['Font','FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Link','Unlink','Image','Table','SpecialChar'] ]; config.toolbar_dolibarr_details = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','-','Preview'], - ['Undo','Redo'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['SpecialChar'] ]; }; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f0d7220a42b..b9426ea04cf 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1849,3 +1849,13 @@ A.none, A.none:active, A.none:visited, A.none:hover { line-height: 1em !important; } .ui-autocomplete-input { margin: 0; padding: 1px; } + + +/* ============================================================================== */ +/* CKEditor */ +/* ============================================================================== */ + +.cke_editor table, .cke_editor tr, .cke_editor td +{ + border: 0px solid #FF0000 !important; +} diff --git a/htdocs/theme/freelug/ckeditor/config.js b/htdocs/theme/freelug/ckeditor/config.js index 634ef24dddb..8889187d301 100644 --- a/htdocs/theme/freelug/ckeditor/config.js +++ b/htdocs/theme/freelug/ckeditor/config.js @@ -7,7 +7,24 @@ CKEDITOR.editorConfig = function( config ) { // Define changes to default configuration here. // http://docs.cksource.com/CKEditor_3.x/Developers_Guide - + // http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html + config.enterMode = CKEDITOR.ENTER_BR; + config.resize_enabled = false; + //config.resize_maxHeight = 3000; + //config.resize_maxWidth = 3000; + //config.height = '300px'; + //config.resize_dir = 'vertical'; // horizontal, vertical, both + config.removePlugins = 'elementspath,save,font'; + config.removeDialogTabs = 'flash:advanced'; // config.removeDialogTabs = 'flash:advanced;image:Link'; + config.protectedSource.push( /<\?[\s\S]*?\?>/g ); // Prevent PHP Code to be formatted + //config.menu_groups = 'clipboard,table,anchor,link,image'; // for context menu 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea' + //config.language = 'de'; + //config.defaultLanguage = 'en'; + //config.contentsLanguage = 'fr'; + config.fullPage = false; // Not a full html page string, just part of it + config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)'; + //config.contentsCss = '/css/mysitestyles.css'; + config.toolbar_Full = [ ['Source','-','Save','NewPage','Preview','-','Templates'], @@ -29,37 +46,36 @@ CKEDITOR.editorConfig = function( config ) config.toolbar_dolibarr_mailings = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','PasteText','PasteWord','-','SpellCheck','-','Preview','Print'], - ['Undo','Redo','-','Find','Replace','-','SelectAll'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['Link','Unlink','Anchor','Image','Table','Rule','SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['Undo','Redo','-','Find','Replace'], + ['Font','FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Link','Unlink','Anchor','Image','Table','SpecialChar'] ]; config.toolbar_dolibarr_notes = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','PasteText','PasteWord','-','SpellCheck','-','Preview','Print'], - ['Undo','Redo','-','Find','Replace','-','SelectAll'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['Link','Unlink','Anchor','Image','Table','Rule','SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['Undo','Redo','-','Find','Replace'], + ['Font','FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Link','Unlink','Image','Table','SpecialChar'] ]; config.toolbar_dolibarr_details = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','-','Preview'], - ['Undo','Redo'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['SpecialChar'] ]; }; diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php index 5d03c535e70..2e78af9fd5c 100644 --- a/htdocs/theme/freelug/style.css.php +++ b/htdocs/theme/freelug/style.css.php @@ -1448,3 +1448,12 @@ A.none, A.none:active, A.none:visited, A.none:hover { .ui-autocomplete-input { margin: 0; padding: 1px; } +/* ============================================================================== */ +/* CKEditor */ +/* ============================================================================== */ + +.cke_editor table, .cke_editor tr, .cke_editor td +{ + border: 0px solid #FF0000 !important; +} + diff --git a/htdocs/theme/yellow/ckeditor/config.js b/htdocs/theme/yellow/ckeditor/config.js index 634ef24dddb..8889187d301 100644 --- a/htdocs/theme/yellow/ckeditor/config.js +++ b/htdocs/theme/yellow/ckeditor/config.js @@ -7,7 +7,24 @@ CKEDITOR.editorConfig = function( config ) { // Define changes to default configuration here. // http://docs.cksource.com/CKEditor_3.x/Developers_Guide - + // http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html + config.enterMode = CKEDITOR.ENTER_BR; + config.resize_enabled = false; + //config.resize_maxHeight = 3000; + //config.resize_maxWidth = 3000; + //config.height = '300px'; + //config.resize_dir = 'vertical'; // horizontal, vertical, both + config.removePlugins = 'elementspath,save,font'; + config.removeDialogTabs = 'flash:advanced'; // config.removeDialogTabs = 'flash:advanced;image:Link'; + config.protectedSource.push( /<\?[\s\S]*?\?>/g ); // Prevent PHP Code to be formatted + //config.menu_groups = 'clipboard,table,anchor,link,image'; // for context menu 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea' + //config.language = 'de'; + //config.defaultLanguage = 'en'; + //config.contentsLanguage = 'fr'; + config.fullPage = false; // Not a full html page string, just part of it + config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)'; + //config.contentsCss = '/css/mysitestyles.css'; + config.toolbar_Full = [ ['Source','-','Save','NewPage','Preview','-','Templates'], @@ -29,37 +46,36 @@ CKEDITOR.editorConfig = function( config ) config.toolbar_dolibarr_mailings = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','PasteText','PasteWord','-','SpellCheck','-','Preview','Print'], - ['Undo','Redo','-','Find','Replace','-','SelectAll'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['Link','Unlink','Anchor','Image','Table','Rule','SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['Undo','Redo','-','Find','Replace'], + ['Font','FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Link','Unlink','Anchor','Image','Table','SpecialChar'] ]; config.toolbar_dolibarr_notes = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','PasteText','PasteWord','-','SpellCheck','-','Preview','Print'], - ['Undo','Redo','-','Find','Replace','-','SelectAll'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['Link','Unlink','Anchor','Image','Table','Rule','SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['Undo','Redo','-','Find','Replace'], + ['Font','FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Link','Unlink','Image','Table','SpecialChar'] ]; config.toolbar_dolibarr_details = [ - ['FitWindow','Source'], - ['Cut','Copy','Paste','-','Preview'], - ['Undo','Redo'], - ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor','-','RemoveFormat'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], - ['SpecialChar'], - ['FontName','FontSize'] + ['Source'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['SpecialChar'] ]; }; diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php index a0b3d720955..fe1fe6ab01a 100644 --- a/htdocs/theme/yellow/style.css.php +++ b/htdocs/theme/yellow/style.css.php @@ -1497,3 +1497,13 @@ A.none, A.none:active, A.none:visited, A.none:hover { } .ui-autocomplete-input { margin: 0; padding: 1px; } + +/* ============================================================================== */ +/* CKEditor */ +/* ============================================================================== */ + +.cke_editor table, .cke_editor tr, .cke_editor td +{ + border: 0px solid #FF0000 !important; +} +