Accept h tags

2015-02-20 15:53:19 +01:00 · 2015-02-20 15:53:19 +01:00 · dec277f30f
commit dec277f30f
parent e3713c8b6d
5 changed files with 38 additions and 29 deletions
--- a/htdocs/theme/amarok/ckeditor/config.js
+++ b/htdocs/theme/amarok/ckeditor/config.js
@ -24,8 +24,8 @@ CKEDITOR.editorConfig = function( config )
 	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.image_previewText=' ';
-
+	config.image_previewText=' ';	// Must no be empty
+		
 	config.toolbar_Full =
 	[
 	    ['Source','-','Save','NewPage','Preview','-','Templates'],
@ -45,30 +45,33 @@ CKEDITOR.editorConfig = function( config )
 	    ['Maximize', 'ShowBlocks','-','About']
 	];

+	// Used for mailing fields
 	config.toolbar_dolibarr_mailings = 
 	[
 	 	['Source','Maximize'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
 	 	['Undo','Redo','-','Find','Replace'],
-	    ['Font','FontSize'],
+	    ['Format','Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
-	 	['NumberedList','BulletedList','Outdent','Indent'],
+	 	['NumberedList','BulletedList','Outdent','Indent','CreateDiv'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	 	['Link','Unlink','Anchor','Image','Table','HorizontalRule','SpecialChar']
 	 ];
 	
+	// Used for notes fields
 	config.toolbar_dolibarr_notes =
 	[
-	 	['Source'],
+	 	['Source','Maximize'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
 	 	['Undo','Redo','-','Find','Replace'],
-	    ['Font','FontSize'],
+	    ['Format','Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['Link','Unlink','Image','Table','HorizontalRule','SpecialChar']
 	];
 	
+	// Used for details lines
 	config.toolbar_dolibarr_details =
 	[
 	 	['Source','Maximize'],
@ -77,7 +80,7 @@ CKEDITOR.editorConfig = function( config )
 	    ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-	    ['SpecialChar']
+	    ['Link','Unlink','SpecialChar']
 	];
 	
 	// Used for mailing fields
@ -86,5 +89,4 @@ CKEDITOR.editorConfig = function( config )
 	 	['Source','Maximize'],
 	 	['Find']
 	];	
-	
 };
--- a/htdocs/theme/auguria/ckeditor/config.js
+++ b/htdocs/theme/auguria/ckeditor/config.js
@ -24,8 +24,8 @@ CKEDITOR.editorConfig = function( config )
 	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.image_previewText=' ';
-
+	config.image_previewText=' ';	// Must no be empty
+		
 	config.toolbar_Full =
 	[
 	    ['Source','-','Save','NewPage','Preview','-','Templates'],
@ -45,30 +45,33 @@ CKEDITOR.editorConfig = function( config )
 	    ['Maximize', 'ShowBlocks','-','About']
 	];

+	// Used for mailing fields
 	config.toolbar_dolibarr_mailings = 
 	[
 	 	['Source','Maximize'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
 	 	['Undo','Redo','-','Find','Replace'],
-	    ['Font','FontSize'],
+	    ['Format','Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent','CreateDiv'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	 	['Link','Unlink','Anchor','Image','Table','HorizontalRule','SpecialChar']
 	 ];
 	
+	// Used for notes fields
 	config.toolbar_dolibarr_notes =
 	[
-	 	['Source'],
+	 	['Source','Maximize'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
 	 	['Undo','Redo','-','Find','Replace'],
-	    ['Font','FontSize'],
+	    ['Format','Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['Link','Unlink','Image','Table','HorizontalRule','SpecialChar']
 	];
 	
+	// Used for details lines
 	config.toolbar_dolibarr_details =
 	[
 	 	['Source','Maximize'],
@ -86,5 +89,4 @@ CKEDITOR.editorConfig = function( config )
 	 	['Source','Maximize'],
 	 	['Find']
 	];	
-	
 };
--- a/htdocs/theme/bureau2crea/ckeditor/config.js
+++ b/htdocs/theme/bureau2crea/ckeditor/config.js
@ -24,8 +24,8 @@ CKEDITOR.editorConfig = function( config )
 	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.image_previewText=' ';
-
+	config.image_previewText=' ';	// Must no be empty
+		
 	config.toolbar_Full =
 	[
 	    ['Source','-','Save','NewPage','Preview','-','Templates'],
@ -45,30 +45,33 @@ CKEDITOR.editorConfig = function( config )
 	    ['Maximize', 'ShowBlocks','-','About']
 	];

+	// Used for mailing fields
 	config.toolbar_dolibarr_mailings = 
 	[
 	 	['Source','Maximize'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
 	 	['Undo','Redo','-','Find','Replace'],
-	    ['Font','FontSize'],
+	    ['Format','Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent','CreateDiv'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	 	['Link','Unlink','Anchor','Image','Table','HorizontalRule','SpecialChar']
 	 ];
 	
+	// Used for notes fields
 	config.toolbar_dolibarr_notes =
 	[
-	 	['Source'],
+	 	['Source','Maximize'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
 	 	['Undo','Redo','-','Find','Replace'],
-	    ['Font','FontSize'],
+	    ['Format','Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['Link','Unlink','Image','Table','HorizontalRule','SpecialChar']
 	];
 	
+	// Used for details lines
 	config.toolbar_dolibarr_details =
 	[
 	 	['Source','Maximize'],
@ -86,5 +89,4 @@ CKEDITOR.editorConfig = function( config )
 	 	['Source','Maximize'],
 	 	['Find']
 	];	
-	
 };
--- a/htdocs/theme/cameleo/ckeditor/config.js
+++ b/htdocs/theme/cameleo/ckeditor/config.js
@ -25,7 +25,7 @@ CKEDITOR.editorConfig = function( config )
 	config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)';
 	//config.contentsCss = '/css/mysitestyles.css';
 	config.image_previewText=' ';	// Must no be empty
-
+		
 	config.toolbar_Full =
 	[
 	    ['Source','-','Save','NewPage','Preview','-','Templates'],
@ -45,30 +45,33 @@ CKEDITOR.editorConfig = function( config )
 	    ['Maximize', 'ShowBlocks','-','About']
 	];

+	// Used for mailing fields
 	config.toolbar_dolibarr_mailings = 
 	[
 	 	['Source','Maximize'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
 	 	['Undo','Redo','-','Find','Replace'],
-	    ['Font','FontSize'],
+	    ['Format','Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent','CreateDiv'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-	 	['Link','Unlink','Anchor','Image','Table','SpecialChar']
+	 	['Link','Unlink','Anchor','Image','Table','HorizontalRule','SpecialChar']
 	 ];
 	
+	// Used for notes fields
 	config.toolbar_dolibarr_notes =
 	[
-	 	['Source'],
+	 	['Source','Maximize'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
 	 	['Undo','Redo','-','Find','Replace'],
-	    ['Font','FontSize'],
+	    ['Format','Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-	    ['Link','Unlink','Image','Table','SpecialChar']
+	    ['Link','Unlink','Image','Table','HorizontalRule','SpecialChar']
 	];
 	
+	// Used for details lines
 	config.toolbar_dolibarr_details =
 	[
 	 	['Source','Maximize'],
--- a/htdocs/theme/eldy/ckeditor/config.js
+++ b/htdocs/theme/eldy/ckeditor/config.js
@ -25,7 +25,7 @@ CKEDITOR.editorConfig = function( config )
 	config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)';
 	//config.contentsCss = '/css/mysitestyles.css';
 	config.image_previewText=' ';	// Must no be empty
-
+		
 	config.toolbar_Full =
 	[
 	    ['Source','-','Save','NewPage','Preview','-','Templates'],
@ -51,7 +51,7 @@ CKEDITOR.editorConfig = function( config )
 	 	['Source','Maximize'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
 	 	['Undo','Redo','-','Find','Replace'],
-	    ['Font','FontSize'],
+	    ['Format','Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent','CreateDiv'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
@ -64,7 +64,7 @@ CKEDITOR.editorConfig = function( config )
 	 	['Source','Maximize'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
 	 	['Undo','Redo','-','Find','Replace'],
-	    ['Font','FontSize'],
+	    ['Format','Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],