Update version, change inline style to class

WBCE · Mar 10, 2023 · 5f7df16 · 5f7df16
1 parent fba5c2e
commit 5f7df16
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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)
                         <?php endif; ?>
                     </td>
 
-                    <td class="page-menu-title" <?=$noPermStyle?>>
+                    <td class="page-menu-title <?=$noPermStyle?>">
                         <i class="fa fa-lg {status_icon}" style="padding-left: 3px;"></i>
-                        <a <?=$noPermStyle?> <?php if ($canModifyPage) : ?> href="{modifyPageURL}" title="<?php echo $HEADING['MODIFY_PAGE']; ?>"<?php endif; ?>>
+                        <a class="<?=$noPermStyle?>" <?php if ($canModifyPage) : ?> href="{modifyPageURL}" title="<?php echo $HEADING['MODIFY_PAGE']; ?>"<?php endif; ?>>
                             {MENU_TITLE}
                         </a>
                     </td>
 
-                    <td class="page-page-title" <?=$noPermStyle?>>
+                    <td class="page-page-title <?=$noPermStyle?>">
                         <?php if (!$menu_link): ?>
                             {PAGE_TITLE}
                         <?php endif; ?>
                     </td>
 
-                    <td class="page-page-id" <?=$noPermStyle?>>
+                    <td class="page-page-id <?=$noPermStyle?>">
                         {PAGE_ID}
                     </td>
 

diff --git 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%;
-}
+}
+
+
+.pagetree-no-edit {
+	color:#666; 
+	font-weight:400; 
+	cursor:not-allowed;
+	text-decoration:none !important;
+} 
diff --git 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)
                             <a href="#" data-id="p{PAGE_ID}"><i class="fa fa-fw fa-folder-open"></i></a>
                         <?php } ?>
                     </td>
-                    <td class="visibility" <?=$noPermStyle?>>
+                    <td class="visibility <?=$noPermStyle?>">
                         <?php if ($page['visibility'] === 'public') { ?>
                             <i class="fa fa-eye"></i>
                         <?php } elseif ($page['visibility'] === 'private') { ?>
@@ -93,9 +93,9 @@ function renderPageTree($pages, $level = 1, $levelLimit = 999)
                             <i class="fa fa-ban"></i>
                         <?php } ?>
                     </td>
-                    <td class="title" <?=$noPermStyle?>>
+                    <td class="title <?=$noPermStyle?>">
                         <a <?= ($canModifyPage ? 'href="{modifyPageURL}"' : 'href="#"') ?>
-                                title="<?= $HEADING['MODIFY_PAGE'] ?>" <?=$noPermStyle?>>{MENU_TITLE}</a>
+                                title="<?= $HEADING['MODIFY_PAGE'] ?>" class="<?=$noPermStyle?>">{MENU_TITLE}</a>
                         <br/>
                         <small>{PAGE_TITLE}</small>
                     </td>