Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

Moved admin bar stylesheet from head inside admin bar element to avoid missing stylesheet when loading pages with ajax after logging into admin dashboard https://github.com/givanz/Vvveb/issues/316

givanzab9ee30d5ae6
diff --git a/admin/admin-bar.php b/admin/admin-bar.php
index ec93f83..65493ea 100755
--- a/admin/admin-bar.php
+++ b/admin/admin-bar.php
@@ -216,4 +216,6 @@ if (! function_exists('printAdminBarMenu')) {
</ul>
</li>
</ul>
+
+ <link href="<?php echo Vvveb\publicUrlPath();?>admin/default/css/admin-bar.css" rel="stylesheet">
</div>
diff --git a/app/template/editor.tpl b/app/template/editor.tpl
index 2235c12..ba69909 100755
--- a/app/template/editor.tpl
+++ b/app/template/editor.tpl
@@ -2,9 +2,6 @@
head|append = <?php
$vvveb_is_page_edit = Vvveb\isEditor();
$is_admin = \Vvveb\isAdmin();
-if ($is_admin && !$vvveb_is_page_edit) {
- echo '<link href="' . Vvveb\publicUrlPath() . 'admin/default/css/admin-bar.css" rel="stylesheet">';
-}
if ($is_admin && $vvveb_is_page_edit) {
$customCssFile = DIR_THEMES . Vvveb\System\Sites::getTheme() . DS . 'css'. DS . 'custom.css';
if (file_exists($customCssFile)) {
@@ -16,7 +13,6 @@ if ($is_admin && $vvveb_is_page_edit) {
#vvvebjs-styles|hide = $vvveb_is_page_edit
-
body|prepend = <?php
if (isset($is_admin) && $is_admin && !$vvveb_is_page_edit && APP == 'app') {
include_once(DIR_ROOT . '/admin/admin-bar.php');