diff --git a/.gitignore b/.gitignore index f88a10e6..7612a229 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,15 @@ .DS_Store dbgenerator.php bl-content/* +bl-content-migrator bl-plugins/timemachine bl-plugins/timemachine-x bl-plugins/discovery bl-plugins/updater bl-plugins/medium-editor bl-plugins/quill +bl-plugins/yandex-metrica/ +bl-plugins/domain-migrator/ bl-kernel/bludit.pro.php bl-themes/docs bl-themes/docsx diff --git a/bl-kernel/admin/controllers/edit-content.php b/bl-kernel/admin/controllers/edit-content.php index 0566ea95..4a653c0d 100644 --- a/bl-kernel/admin/controllers/edit-content.php +++ b/bl-kernel/admin/controllers/edit-content.php @@ -55,7 +55,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') { } } - Redirect::page('content'); + Redirect::page('content'.(isset($_POST['hash'])?$_POST['hash']:'')); } // ============================================================================ diff --git a/bl-kernel/admin/controllers/settings.php b/bl-kernel/admin/controllers/settings.php index 60c99564..b2d5a2de 100644 --- a/bl-kernel/admin/controllers/settings.php +++ b/bl-kernel/admin/controllers/settings.php @@ -20,7 +20,7 @@ checkRole(array('admin')); if ($_SERVER['REQUEST_METHOD'] == 'POST') { editSettings($_POST); - Redirect::page('settings'); + Redirect::page('settings'.$_POST['hash']); } // ============================================================================ diff --git a/bl-kernel/admin/themes/booty/css/bludit.css b/bl-kernel/admin/themes/booty/css/bludit.css index 0728031b..d3ddbda7 100644 --- a/bl-kernel/admin/themes/booty/css/bludit.css +++ b/bl-kernel/admin/themes/booty/css/bludit.css @@ -303,6 +303,13 @@ td.child { #jseditorToolbarRight button span { font-size: 16px !important; } + #jscontentTools .btn { + font-size: 0px !important; + margin-right: 5px; + } + #jscontentTools .btn span { + font-size: 16px !important; + } } #jseditorSidebar nav { diff --git a/bl-kernel/admin/views/content.php b/bl-kernel/admin/views/content.php index 1587d933..9bf5cfb1 100644 --- a/bl-kernel/admin/views/content.php +++ b/bl-kernel/admin/views/content.php @@ -166,7 +166,7 @@ function table($type) { ?> -