From a0e45518c5e85c555bb6f06358d2dec4e293bbd4 Mon Sep 17 00:00:00 2001 From: Deltacms Date: Sun, 23 Apr 2023 09:02:14 +0200 Subject: [PATCH] =?UTF-8?q?correction=20variable=20non=20initilis=C3=A9e?= =?UTF-8?q?=20$menuClass?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 4 +- core/include/update.inc.php | 4 + .../database_en/base/content/home.html | 2 +- .../database_fr/base/content/accueil.html | 2 +- core/module/theme/view/header/header.js.php | 3 +- core/module/user/lang/en/lex_user.php | 4 +- .../plugins/codemirror/codemirror/es.js | 261 ++++++++++++++++++ 7 files changed, 272 insertions(+), 8 deletions(-) create mode 100644 core/vendor/tinymce/plugins/codemirror/codemirror/es.js diff --git a/core/core.php b/core/core.php index afe92f9..fd4642d 100644 --- a/core/core.php +++ b/core/core.php @@ -49,7 +49,7 @@ class common { // Numéro de version const DELTA_UPDATE_URL = 'https://update.deltacms.fr/master/'; - const DELTA_VERSION = '4.4.06'; + const DELTA_VERSION = '4.4.07'; const DELTA_UPDATE_CHANNEL = "v4"; public static $actions = []; @@ -1657,7 +1657,7 @@ class common { public function showMenu( $position ='') { // Lexique include('./core/lang/'. $this->getData(['config', 'i18n', 'langAdmin']) . '/lex_core.php'); - + $menuClass = ''; switch ($position) { case 'top': // Détermine si le menu est fixe en haut de page lorsque l'utilisateur n'est pas connecté diff --git a/core/include/update.inc.php b/core/include/update.inc.php index e3c2ecc..87d4501 100644 --- a/core/include/update.inc.php +++ b/core/include/update.inc.php @@ -120,4 +120,8 @@ if ($this->getData(['core', 'dataVersion']) < 4406) { // Mise à jour $this->setData(['core', 'dataVersion', 4406]); } +if ($this->getData(['core', 'dataVersion']) < 4407) { + // Mise à jour + $this->setData(['core', 'dataVersion', 4407]); +} ?> diff --git a/core/module/install/ressource/database_en/base/content/home.html b/core/module/install/ressource/database_en/base/content/home.html index c855420..17c2fca 100644 --- a/core/module/install/ressource/database_en/base/content/home.html +++ b/core/module/install/ressource/database_en/base/content/home.html @@ -8,7 +8,7 @@
-
+
diff --git a/core/module/install/ressource/database_fr/base/content/accueil.html b/core/module/install/ressource/database_fr/base/content/accueil.html index 74ccc94..9764180 100644 --- a/core/module/install/ressource/database_fr/base/content/accueil.html +++ b/core/module/install/ressource/database_fr/base/content/accueil.html @@ -9,7 +9,7 @@
-
+
diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php index d432b88..70d5ad9 100644 --- a/core/module/theme/view/header/header.js.php +++ b/core/module/theme/view/header/header.js.php @@ -31,7 +31,7 @@ $("input, select").on("change", function() { // Contenu perso if ($("#themeHeaderFeature").val() == "feature") { css = "header{min-height: 20px; height:" + $("#themeHeaderHeight").val() + "; overflow:hidden; background-position:top; background-repeat: no-repeat; line-height:1.15; background-color:unset; background-image:unset; text-align:unset;}"; - + $("#featureContent").appendTo("header").show(); $("#themeHeaderTitle").hide(); $("#headerSwiper").hide(); @@ -88,7 +88,6 @@ $("input, select").on("change", function() { // Couleur du fond css += "header{background-color:" + $("#themeHeaderBackgroundColor").val() + ";}"; - // Position de la bannière var positionNav = getData(['theme', 'menu', 'position'])); ?>; var positionHeader = $("#themeHeaderPosition").val(); diff --git a/core/module/user/lang/en/lex_user.php b/core/module/user/lang/en/lex_user.php index f55ca05..63284cf 100644 --- a/core/module/user/lang/en/lex_user.php +++ b/core/module/user/lang/en/lex_user.php @@ -28,7 +28,7 @@ $text['core_user_view']['add'][24] = 'Confirmation'; $text['core_user_view']['add'][25] = 'Notify the user by email'; $text['core_user_view']['add'][26] = 'Redirection'; $text['core_user_view']['add'][27] = 'Redirection after login'; -$text['core_user_view']['add'][28] = 'Select \'Aucune\' if you do not want a redirection.'; +$text['core_user_view']['add'][28] = 'Select \'None\' if you do not want a redirection.'; $text['core_user_view']['add'][29] = 'Register'; $text['core_user_view']['add'][30] = 'Edit pages'; $text['core_user_view']['add'][31] = 'Add files'; @@ -61,7 +61,7 @@ $text['core_user_view']['edit'][24] = 'Confirmation'; $text['core_user_view']['edit'][25] = 'Notify the user by email'; $text['core_user_view']['edit'][26] = 'Redirection'; $text['core_user_view']['edit'][27] = 'Redirection after login'; -$text['core_user_view']['edit'][28] = 'Select \'Aucune\' if you do not want a redirection.'; +$text['core_user_view']['edit'][28] = 'Select \'None\' if you do not want a redirection.'; $text['core_user_view']['edit'][29] = 'Register'; $text['core_user_view']['edit'][30] = 'You cannot change your own group.'; $text['core_user_view']['edit'][31] = 'The username is defined when the account is created and cannot be changed.'; diff --git a/core/vendor/tinymce/plugins/codemirror/codemirror/es.js b/core/vendor/tinymce/plugins/codemirror/codemirror/es.js new file mode 100644 index 0000000..312698a --- /dev/null +++ b/core/vendor/tinymce/plugins/codemirror/codemirror/es.js @@ -0,0 +1,261 @@ +tinymce.addI18n('en_GB',{ +"Redo": "Redo", +"Undo": "Undo", +"Cut": "Cut", +"Copy": "Copy", +"Paste": "Paste", +"Select all": "Select all", +"New document": "New document", +"Ok": "Ok", +"Cancel": "Cancel", +"Visual aids": "Visual aids", +"Bold": "Bold", +"Italic": "Italic", +"Underline": "Underline", +"Strikethrough": "Strike-through", +"Superscript": "Superscript", +"Subscript": "Subscript", +"Clear formatting": "Clear formatting", +"Align left": "Align left", +"Align center": "Align centre", +"Align right": "Align right", +"Justify": "Justify", +"Bullet list": "Bullet list", +"Numbered list": "Numbered list", +"Decrease indent": "Decrease indent", +"Increase indent": "Increase indent", +"Close": "Close", +"Formats": "Formats", +"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.", +"Headers": "Headers", +"Header 1": "Header 1", +"Header 2": "Header 2", +"Header 3": "Header 3", +"Header 4": "Header 4", +"Header 5": "Header 5", +"Header 6": "Header 6", +"Headings": "Headings", +"Heading 1": "Heading 1", +"Heading 2": "Heading 2", +"Heading 3": "Heading 3", +"Heading 4": "Heading 4", +"Heading 5": "Heading 5", +"Heading 6": "Heading 6", +"Preformatted": "Preformatted", +"Div": "Div", +"Pre": "Pre", +"Code": "Code", +"Paragraph": "Paragraph", +"Blockquote": "Blockquote", +"Inline": "Inline", +"Blocks": "Blocks", +"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.", +"Font Family": "Font Family", +"Font Sizes": "Font Sizes", +"Class": "Class", +"Browse for an image": "Browse for an image", +"OR": "OR", +"Drop an image here": "Drop an image here", +"Upload": "Upload", +"Block": "Block", +"Align": "Align", +"Default": "Default", +"Circle": "Circle", +"Disc": "Disc", +"Square": "Square", +"Lower Alpha": "Lower Alpha", +"Lower Greek": "Lower Greek", +"Lower Roman": "Lower Roman", +"Upper Alpha": "Upper Alpha", +"Upper Roman": "Upper Roman", +"Anchor": "Anchor", +"Name": "Name", +"Id": "ID", +"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.", +"You have unsaved changes are you sure you want to navigate away?": "You have unsaved changes are you sure you want to navigate away?", +"Restore last draft": "Restore last draft", +"Special character": "Special character", +"Source code": "Source code", +"Insert\/Edit code sample": "Insert\/Edit code sample", +"Language": "Language", +"Code sample": "Code sample", +"Color": "Colour", +"R": "R", +"G": "G", +"B": "B", +"Left to right": "Left to right", +"Right to left": "Right to left", +"Emoticons": "Emoticons", +"Document properties": "Document properties", +"Title": "Title", +"Keywords": "Keywords", +"Description": "Description", +"Robots": "Robots", +"Author": "Author", +"Encoding": "Encoding", +"Fullscreen": "Full-screen", +"Action": "Action", +"Shortcut": "Shortcut", +"Help": "Help", +"Address": "Address", +"Focus to menubar": "Focus to menubar", +"Focus to toolbar": "Focus to toolbar", +"Focus to element path": "Focus to element path", +"Focus to contextual toolbar": "Focus to contextual toolbar", +"Insert link (if link plugin activated)": "Insert link (if link plugin activated)", +"Save (if save plugin activated)": "Save (if save plugin activated)", +"Find (if searchreplace plugin activated)": "Find (if searchreplace plugin activated)", +"Plugins installed ({0}):": "Plugins installed ({0}):", +"Premium plugins:": "Premium plugins:", +"Learn more...": "Learn more...", +"You are using {0}": "You are using {0}", +"Plugins": "Plugins", +"Handy Shortcuts": "Handy Shortcuts", +"Horizontal line": "Horizontal line", +"Insert\/edit image": "Insert\/edit image", +"Image description": "Image description", +"Source": "Source", +"Dimensions": "Dimensions", +"Constrain proportions": "Constrain proportions", +"General": "General", +"Advanced": "Advanced", +"Style": "Style", +"Vertical space": "Vertical space", +"Horizontal space": "Horizontal space", +"Border": "Border", +"Insert image": "Insert image", +"Image": "Image", +"Image list": "Image list", +"Rotate counterclockwise": "Rotate counterclockwise", +"Rotate clockwise": "Rotate clockwise", +"Flip vertically": "Flip vertically", +"Flip horizontally": "Flip horizontally", +"Edit image": "Edit image", +"Image options": "Image options", +"Zoom in": "Zoom in", +"Zoom out": "Zoom out", +"Crop": "Crop", +"Resize": "Resize", +"Orientation": "Orientation", +"Brightness": "Brightness", +"Sharpen": "Sharpen", +"Contrast": "Contrast", +"Color levels": "Colour levels", +"Gamma": "Gamma", +"Invert": "Invert", +"Apply": "Apply", +"Back": "Back", +"Insert date\/time": "Insert date\/time", +"Date\/time": "Date\/time", +"Insert link": "Insert link", +"Insert\/edit link": "Insert\/edit link", +"Text to display": "Text to display", +"Url": "URL", +"Target": "Target", +"None": "None", +"New window": "New window", +"Remove link": "Remove link", +"Anchors": "Anchors", +"Link": "Link", +"Paste or type a link": "Paste or type a link", +"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?", +"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?", +"Link list": "Link list", +"Insert video": "Insert video", +"Insert\/edit video": "Insert\/edit video", +"Insert\/edit media": "Insert\/edit media", +"Alternative source": "Alternative source", +"Poster": "Poster", +"Paste your embed code below:": "Paste your embed code below:", +"Embed": "Embed", +"Media": "Media", +"Nonbreaking space": "Non-breaking space", +"Page break": "Page break", +"Paste as text": "Paste as text", +"Preview": "Preview", +"Print": "Print", +"Save": "Save", +"Find": "Find", +"Replace with": "Replace with", +"Replace": "Replace", +"Replace all": "Replace all", +"Prev": "Prev", +"Next": "Next", +"Find and replace": "Find and replace", +"Could not find the specified string.": "Could not find the specified string.", +"Match case": "Match case", +"Whole words": "Whole words", +"Spellcheck": "Spell-check", +"Ignore": "Ignore", +"Ignore all": "Ignore all", +"Finish": "Finish", +"Add to Dictionary": "Add to Dictionary", +"Insert table": "Insert table", +"Table properties": "Table properties", +"Delete table": "Delete table", +"Cell": "Cell", +"Row": "Row", +"Column": "Column", +"Cell properties": "Cell properties", +"Merge cells": "Merge cells", +"Split cell": "Split cell", +"Insert row before": "Insert row before", +"Insert row after": "Insert row after", +"Delete row": "Delete row", +"Row properties": "Row properties", +"Cut row": "Cut row", +"Copy row": "Copy row", +"Paste row before": "Paste row before", +"Paste row after": "Paste row after", +"Insert column before": "Insert column before", +"Insert column after": "Insert column after", +"Delete column": "Delete column", +"Cols": "Cols", +"Rows": "Rows", +"Width": "Width", +"Height": "Height", +"Cell spacing": "Cell spacing", +"Cell padding": "Cell padding", +"Caption": "Caption", +"Left": "Left", +"Center": "Centre", +"Right": "Right", +"Cell type": "Cell type", +"Scope": "Scope", +"Alignment": "Alignment", +"H Align": "H Align", +"V Align": "V Align", +"Top": "Top", +"Middle": "Middle", +"Bottom": "Bottom", +"Header cell": "Header cell", +"Row group": "Row group", +"Column group": "Column group", +"Row type": "Row type", +"Header": "Header", +"Body": "Body", +"Footer": "Footer", +"Border color": "Border colour", +"Insert template": "Insert template", +"Templates": "Templates", +"Template": "Template", +"Text color": "Text colour", +"Background color": "Background colour", +"Custom...": "Custom...", +"Custom color": "Custom colour", +"No color": "No colour", +"Table of Contents": "Table of Contents", +"Show blocks": "Show blocks", +"Show invisible characters": "Show invisible characters", +"Words: {0}": "Words: {0}", +"{0} words": "{0} words", +"File": "File", +"Edit": "Edit", +"Insert": "Insert", +"View": "View", +"Format": "Format", +"Table": "Table", +"Tools": "Tools", +"Powered by {0}": "Powered by {0}", +"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help" +}); \ No newline at end of file