diff --git a/wbce/admin/interface/version.php b/wbce/admin/interface/version.php index cceb23043..0b9957cde 100644 --- a/wbce/admin/interface/version.php +++ b/wbce/admin/interface/version.php @@ -14,7 +14,7 @@ // set WBCE version and release tag ///////////////////////////////////////// -define('NEW_WBCE_VERSION', '1.6.0-beta.4'); // NEW_WBCE_VERSION +define('NEW_WBCE_VERSION', '1.6.0'); // NEW_WBCE_VERSION define('NEW_WBCE_TAG', '1.6.0'); // NEW_WBCE_TAG defined('WBCE_VERSION') or define('WBCE_VERSION', NEW_WBCE_VERSION); // WBCE_VERSION diff --git a/wbce/templates/argos_theme_reloaded/css/theme.css b/wbce/templates/argos_theme_reloaded/css/theme.css index 4cf384442..8b9e7d302 100644 --- a/wbce/templates/argos_theme_reloaded/css/theme.css +++ b/wbce/templates/argos_theme_reloaded/css/theme.css @@ -1041,6 +1041,13 @@ a.tooltip { border-radius: 50%; } +.pagetree-no-edit { + color:#666; + font-weight:400; + cursor:not-allowed; + text-decoration:none !important; +} + /*** some mobile adaption *********************************************/ /*** I don't like exessive media queries ;-) **************************/ @media screen and (max-width: 36.5em) { diff --git a/wbce/templates/argos_theme_reloaded/patch/page_tree.php b/wbce/templates/argos_theme_reloaded/patch/page_tree.php index 54b7d77a8..6923b1844 100644 --- a/wbce/templates/argos_theme_reloaded/patch/page_tree.php +++ b/wbce/templates/argos_theme_reloaded/patch/page_tree.php @@ -109,7 +109,7 @@ function draw_pagetree($pages_list) $canAddChild = ($admin->get_permission('pages_add')) == (true && $can_modify == true) && ($p['visibility'] != 'deleted') ? true : false; $canModifyPage = ($admin->get_permission('pages_modify') == true && $can_modify == true) ? true : false; $canModifySettings = ($admin->get_permission('pages_settings') == true && $can_modify == true) ? true : false; - $noPermStyle = ($canModifyPage === false) ? 'style="color:#666; font-weight:400; cursor:not-allowed"' : ''; + $noPermStyle = ($canModifyPage === false) ? 'pagetree-no-edit' : ''; $menu_link = false; // manage SECTIONS and DATES Icons --> @@ -176,20 +176,20 @@ function draw_pagetree($pages_list) - > + - href="{modifyPageURL}" title=""> + href="{modifyPageURL}" title=""> {MENU_TITLE} - > + {PAGE_TITLE} - > + {PAGE_ID} diff --git a/wbce/templates/wbce_flat_theme/css/theme.css b/wbce/templates/wbce_flat_theme/css/theme.css index 426b90980..4c28bc428 100644 --- a/wbce/templates/wbce_flat_theme/css/theme.css +++ b/wbce/templates/wbce_flat_theme/css/theme.css @@ -1396,4 +1396,12 @@ form.advanced-options { background-color: #f90; padding: .2em; border-radius: 50%; -} \ No newline at end of file +} + + +.pagetree-no-edit { + color:#666; + font-weight:400; + cursor:not-allowed; + text-decoration:none !important; +} \ No newline at end of file diff --git a/wbce/templates/wbce_flat_theme/patch/functions/renderPageTree.php b/wbce/templates/wbce_flat_theme/patch/functions/renderPageTree.php index 5061f40d4..7444377e5 100644 --- a/wbce/templates/wbce_flat_theme/patch/functions/renderPageTree.php +++ b/wbce/templates/wbce_flat_theme/patch/functions/renderPageTree.php @@ -48,7 +48,7 @@ function renderPageTree($pages, $level = 1, $levelLimit = 999) $canModifyPage = ($admin->get_permission('pages_modify') && $canModify); $canModifySettings = ($admin->get_permission('pages_settings') && $canModify); $canManageSections = (MANAGE_SECTIONS && $admin->get_permission('pages_modify') && $canModify); - $noPermStyle = ($canModifyPage === false) ? 'style="color:#666; font-weight:400; cursor:not-allowed"' : ''; + $noPermStyle = ($canModifyPage === false) ? 'pagetree-no-edit' : ''; if ($canManageSections) { $querySections = $database->query('SELECT `module` FROM `' . TABLE_PREFIX . 'sections` WHERE `page_id` = ' . $page['page_id'] . ' AND `module` = "menu_link"'); if ($querySections->numRows() > 0) { @@ -78,7 +78,7 @@ function renderPageTree($pages, $level = 1, $levelLimit = 999) - > + @@ -93,9 +93,9 @@ function renderPageTree($pages, $level = 1, $levelLimit = 999) - > + - title="" >{MENU_TITLE} + title="" class="">{MENU_TITLE}
{PAGE_TITLE}