Updated screenshots

Dolibarr · Jul 31, 2016 · 20a2282 · 20a2282
1 parent ce3b01c
commit 20a2282
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 3 deletions.
diff --git a/...itdemo/documents_demo/medias/image/myimagesforemailing/dolicloud_logo_white.png b/...itdemo/documents_demo/medias/image/myimagesforemailing/dolicloud_logo_white.png
diff --git a/doc/images/dolibarr_screenshot10_1280x800.png b/doc/images/dolibarr_screenshot10_1280x800.png
diff --git a/doc/images/dolibarr_screenshot2_1280x800.png b/doc/images/dolibarr_screenshot2_1280x800.png
diff --git a/doc/images/dolibarr_screenshot4_1280x800.png b/doc/images/dolibarr_screenshot4_1280x800.png
diff --git a/doc/images/dolibarr_screenshot5_1280x800.png b/doc/images/dolibarr_screenshot5_1280x800.png
diff --git a/doc/images/dolibarr_screenshot7_1280x800.png b/doc/images/dolibarr_screenshot7_1280x800.png
diff --git a/doc/images/dolibarr_screenshot8_1280x800.png b/doc/images/dolibarr_screenshot8_1280x800.png
diff --git a/doc/images/dolibarr_screenshot9_1280x800.png b/doc/images/dolibarr_screenshot9_1280x800.png
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
@@ -876,7 +876,7 @@
 			{
 				print "\n\n<div class=\"tabsAction\">\n";
 
-				if (($object->statut == 0) && $user->rights->mailing->creer)
+				if (($object->statut == 0 || $object->statut == 1) && $user->rights->mailing->creer)
 				{
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditMailing").'</a>';
 				}

diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js
@@ -46,7 +46,7 @@ CKEDITOR.editorConfig = function( config )
 	// Used for mailing fields
 	config.toolbar_dolibarr_mailings = 
 	[
-	 	['Source','Maximize'],
+	 	['Source','Maximize','Preview'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
 	 	['Undo','Redo','-','Find','Replace'],
 	    ['Format','Font','FontSize'],

diff --git a/htdocs/theme/md/ckeditor/config.js b/htdocs/theme/md/ckeditor/config.js
@@ -46,7 +46,7 @@ CKEDITOR.editorConfig = function( config )
 	// Used for mailing fields
 	config.toolbar_dolibarr_mailings = 
 	[
-	 	['Source','Maximize'],
+	 	['Source','Maximize','Preview'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
 	 	['Undo','Redo','-','Find','Replace'],
 	    ['Format','Font','FontSize'],