Merge branch 'dev10' of https://github.com/fredtempez/ZwiiCMS into dev10

core/core.php

@@ -33,7 +33,7 @@ class common {
 	const TEMP_DIR = 'site/tmp/';
 
 	// Numéro de version 
-	const ZWII_VERSION = '10.0.042';
+	const ZWII_VERSION = '10.0.041';
 	const ZWII_UPDATE_CHANNEL = "v10";
 
 	public static $actions = [];

core/vendor/simplelightbox/inc.json

@@ -1,6 +1,6 @@
 [
 	"simple-lightbox.jquery.min.js",
-	"simple-lightbox.min.css",
 	"init.js",
+	"simple-lightbox.min.css",	
 	"init.css"
 ]

core/vendor/tinymce/inc.json

@@ -2,5 +2,7 @@
 	"tinymce.min.js",
 	"jquery.tinymce.min.js",
 	"init.js",
-	"init.css"
+	"init.css",
+	"plugins/codesample/js/prism.fr",
+	"plugins/codesample/css/prism.css"
 ]

core/vendor/tinymce/init.js

@@ -18,9 +18,9 @@ tinymce.init({
 	// Langue
 	language: "fr_FR",
 	// Plugins
-	plugins: "advlist anchor autolink autoresize autosave codemirror colorpicker contextmenu fullscreen hr image imagetools link lists media paste searchreplace stickytoolbar tabfocus table template textcolor visualblocks",
+	plugins: "advlist anchor autolink autoresize autosave codemirror colorpicker contextmenu fullscreen hr image imagetools link lists media paste searchreplace stickytoolbar tabfocus table template textcolor  codesample",
 	// Contenu de la barre d'outils
-	toolbar: "restoredraft | undo redo | styleselect | bold italic underline strikethrough forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | image media link anchor  inserttable  hr template  code visualblocks fullscreen",
+	toolbar: "restoredraft | undo redo | styleselect | bold italic underline strikethrough forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | image media link anchor  inserttable  hr template  code codesample  fullscreen",
 	// CodeMirror
 	codemirror: {
 		indentOnInit: true, // Whether or not to indent code on init.

core/vendor/tinymce/plugins/codesample/css/prism.css

@@ -1,4 +1,5 @@
-/* http://prismjs.com/download.html?themes=prism&languages=markup+css+clike+javascript */
+/* PrismJS 1.19.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
 /**
  * prism.js default theme for JavaScript, CSS and HTML
  * Based on dabblet (http://dabblet.com)
@@ -7,77 +8,79 @@
 
 code[class*="language-"],
 pre[class*="language-"] {
-  color: black;
+	color: black;
-  text-shadow: 0 1px white;
+	background: none;
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+	text-shadow: 0 1px white;
-  direction: ltr;
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  text-align: left;
+	font-size: 1em;
-  white-space: pre;
+	text-align: left;
-  word-spacing: normal;
+	white-space: pre;
-  word-break: normal;
+	word-spacing: normal;
-  word-wrap: normal;
+	word-break: normal;
-  line-height: 1.5;
+	word-wrap: normal;
+	line-height: 1.5;
 
-  -moz-tab-size: 4;
+	-moz-tab-size: 4;
-  -o-tab-size: 4;
+	-o-tab-size: 4;
-  tab-size: 4;
+	tab-size: 4;
 
-  -webkit-hyphens: none;
+	-webkit-hyphens: none;
-  -moz-hyphens: none;
+	-moz-hyphens: none;
-  -ms-hyphens: none;
+	-ms-hyphens: none;
-  hyphens: none;
+	hyphens: none;
 }
 
 pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection,
 code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection {
-  text-shadow: none;
+	text-shadow: none;
-  background: #b3d4fc;
+	background: #b3d4fc;
 }
 
 pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
 code[class*="language-"]::selection, code[class*="language-"] ::selection {
-  text-shadow: none;
+	text-shadow: none;
-  background: #b3d4fc;
+	background: #b3d4fc;
 }
 
 @media print {
-  code[class*="language-"],
+	code[class*="language-"],
-  pre[class*="language-"] {
+	pre[class*="language-"] {
-    text-shadow: none;
+		text-shadow: none;
-  }
+	}
 }
 
 /* Code blocks */
 pre[class*="language-"] {
-  padding: 1em;
+	padding: 1em;
-  margin: .5em 0;
+	margin: .5em 0;
-  overflow: auto;
+	overflow: auto;
 }
 
 :not(pre) > code[class*="language-"],
 pre[class*="language-"] {
-  background: #f5f2f0;
+	background: #f5f2f0;
 }
 
 /* Inline code */
 :not(pre) > code[class*="language-"] {
-  padding: .1em;
+	padding: .1em;
-  border-radius: .3em;
+	border-radius: .3em;
+	white-space: normal;
 }
 
 .token.comment,
 .token.prolog,
 .token.doctype,
 .token.cdata {
-  color: slategray;
+	color: slategray;
 }
 
 .token.punctuation {
-  color: #999;
+	color: #999;
 }
 
-.namespace {
+.token.namespace {
-  opacity: .7;
+	opacity: .7;
 }
 
 .token.property,
@@ -87,7 +90,7 @@ pre[class*="language-"] {
 .token.constant,
 .token.symbol,
 .token.deleted {
-  color: #905;
+	color: #905;
 }
 
 .token.selector,
@@ -96,7 +99,7 @@ pre[class*="language-"] {
 .token.char,
 .token.builtin,
 .token.inserted {
-  color: #690;
+	color: #690;
 }
 
 .token.operator,
@@ -104,35 +107,36 @@ pre[class*="language-"] {
 .token.url,
 .language-css .token.string,
 .style .token.string {
-  color: #a67f59;
+	color: #9a6e3a;
-  background: hsla(0, 0%, 100%, .5);
+	background: hsla(0, 0%, 100%, .5);
 }
 
 .token.atrule,
 .token.attr-value,
 .token.keyword {
-  color: #07a;
+	color: #07a;
 }
 
-.token.function {
+.token.function,
-  color: #DD4A68;
+.token.class-name {
+	color: #DD4A68;
 }
 
 .token.regex,
 .token.important,
 .token.variable {
-  color: #e90;
+	color: #e90;
 }
 
 .token.important,
 .token.bold {
-  font-weight: bold;
+	font-weight: bold;
 }
 .token.italic {
-  font-style: italic;
+	font-style: italic;
 }
 
 .token.entity {
-  cursor: help;
+	cursor: help;
 }