diff --git a/core/module/page/page.php b/core/module/page/page.php index 26cd4d63..43b818fd 100755 --- a/core/module/page/page.php +++ b/core/module/page/page.php @@ -42,11 +42,13 @@ class page extends common { ]; public static $pageBlocks = [ '12' => 'Pleine page', - '4-8' => 'Barre latérale 1/3 - Page 2/3', - '8-4' => 'Page 2/3 - Barre latérale 1/3', - '3-9' => 'Barre latérale 1/4 - Page 3/4', - '9-3' => 'Page 3/4 - Barre latérale 1/4', - '3-6-3' => 'Barre latérale 1/4 - Page 1/2 - Barre latérale 1/4', + '4-8' => 'Barre 1/3 - Page 2/3', + '8-4' => 'Page 2/3 - Barre 1/3', + '3-9' => 'Barre 1/4 - Page 3/4', + '9-3' => 'Page 3/4 - Barre 1/4', + '3-6-3' => 'Barre 1/4 - Page 1/2 - Barre latérale 1/4', + '2-7-3' => 'Barre 2/12 - Page 7/12 - Barre 3/12 ', + '3-7-2' => 'Barre 3/12 - Page 7/12 - Barre 2/12 ', 'bar' => 'Barre latérale' ]; public static $displayMenu = [ diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php index ee1f6326..b1fd6292 100755 --- a/core/module/page/view/edit/edit.js.php +++ b/core/module/page/view/edit/edit.js.php @@ -104,6 +104,8 @@ $( document ).ready(function() { $("#pageEditBarRightWrapper").slideDown(); break; case "3-6-3": + case "2-7-3": + case "3-7-2": $("#pageEditBarLeftWrapper").addClass("disabled"); $("#pageEditBarLeftWrapper").slideDown(); $("#pageEditBarRightWrapper").addClass("disabled"); @@ -112,7 +114,7 @@ $( document ).ready(function() { }; if ($("#pageEditBlock").val() === "bar") { $("#pageEditMenu").removeClass("disabled"); - $("#pageEditMenu").slideUp(); + $("#pageEditMenu").hide(); $("#pageEditHideTitleWrapper").removeClass("disabled"); $("#pageEditHideTitleWrapper").slideUp(); $("#pageEditbreadCrumbWrapper").removeClass("disabled"); @@ -125,8 +127,6 @@ $( document ).ready(function() { $("#pageEditDisplayMenuWrapper").slideDown(); $("#pageEditGroupWrapper").removeClass("disabled"); $("#pageEditGroupWrapper").slideUp(); - $("#pageEditMenuSpecial").removeClass("disabled"); - $("#pageEditMenuSpecial").slideUp(); } else { $("#pageEditDisplayMenuWrapper").removeClass("disabled"); $("#pageEditDisplayMenuWrapper").slideUp(); @@ -305,6 +305,8 @@ pageEditBlockDOM.on("change", function() { $("#pageEditBarRightWrapper").slideDown(); break; case "3-6-3": + case "2-7-3": + case "3-7-2": $("#pageEditBarLeftWrapper").addClass("disabled"); $("#pageEditBarLeftWrapper").slideDown(); $("#pageEditBarRightWrapper").addClass("disabled"); @@ -313,9 +315,7 @@ pageEditBlockDOM.on("change", function() { } if ($(this).val() === "bar") { $("#pageEditMenu").removeClass("disabled"); - $("#pageEditMenu").slideUp(); - $("#pageEditMenuSpecial").removeClass("disabled"); - $("#pageEditMenuSpecial").slideUp(); + $("#pageEditMenu").hide(); $("#pageEditHideTitleWrapper").removeClass("disabled"); $("#pageEditHideTitleWrapper").slideUp(); $("#pageEditbreadCrumbWrapper").removeClass("disabled"); @@ -330,9 +330,7 @@ pageEditBlockDOM.on("change", function() { $("#pageEditGroupWrapper").slideUp(); } else { $("#pageEditMenu").addClass("disabled"); - $("#pageEditMenu").slideDown(); - $("#pageEditMenuSpecial").addClass("disabled"); - $("#pageEditMenuSpecial").slideDown(); + $("#pageEditMenu").show(); $("#pageEditHideTitleWrapper").addClass("disabled"); $("#pageEditHideTitleWrapper").slideDown(); $("#pageEditModuleIdWrapper").addClass("disabled"); diff --git a/core/module/page/view/edit/edit.php b/core/module/page/view/edit/edit.php index 4b7e8c3b..017f2150 100755 --- a/core/module/page/view/edit/edit.php +++ b/core/module/page/view/edit/edit.php @@ -88,23 +88,85 @@ echo template::formOpen('pageEditForm'); ?> 'value' => $this->getData(['page', $this->getUrl(2), 'content']) ]); ?>