diff --git a/.gitignore b/.gitignore index d87af51a..0db760b2 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,4 @@ site/file/thumb/* # Trucs .gitignore -core/vendor/tinymce/link_list.json -core/vendor/tinymce/link_list.json - +core/vendor/tinymce/link_list.json \ No newline at end of file diff --git a/core/core.php b/core/core.php index e54fdb34..8b8e78d8 100644 --- a/core/core.php +++ b/core/core.php @@ -1838,7 +1838,6 @@ class layout extends common { /** * Affiche le contenu de la barre droite - * @param page chargée */ public function showBarContentRight() { // Détermine si le menu est présent diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php index 4c2194da..51450ae4 100755 --- a/core/module/page/view/edit/edit.js.php +++ b/core/module/page/view/edit/edit.js.php @@ -124,7 +124,9 @@ $( document ).ready(function() { $("#pageEditDisplayMenuWrapper").addClass("disabled"); $("#pageEditDisplayMenuWrapper").slideDown(); $("#pageEditGroupWrapper").removeClass("disabled"); - $("#pageEditGroupWrapper").slideUp(); + $("#pageEditGroupWrapper").slideUp(); + $("#PageEditMenuSpecial").removeClass("disabled"); + $("#PageEditMenuSpecial").slideUp(); } else { $("#pageEditDisplayMenuWrapper").removeClass("disabled"); $("#pageEditDisplayMenuWrapper").slideUp(); @@ -352,7 +354,7 @@ pageEditBlockDOM.on("change", function() { $("#pageEditDisplayMenuWrapper").addClass("disabled"); $("#pageEditDisplayMenuWrapper").slideDown(); $("#pageEditGroupWrapper").removeClass("disabled"); - $("#pageEditGroupWrapper").slideUp(); + $("#pageEditGroupWrapper").slideUp(); } else { $("#PageEditMenu").addClass("disabled"); $("#PageEditMenu").slideDown(); diff --git a/core/module/theme/view/index/index.php b/core/module/theme/view/index/index.php index e5180e1c..b92fc11d 100755 --- a/core/module/theme/view/index/index.php +++ b/core/module/theme/view/index/index.php @@ -15,8 +15,8 @@