From c4720bc32c91812dd02ecc0697c63c20698da676 Mon Sep 17 00:00:00 2001 From: camer0n Date: Thu, 6 Feb 2025 13:05:38 -0800 Subject: [PATCH 1/5] #5382 Add the icons. --- e107_admin/history.php | 2 ++ e107_images/admin_images/undo_16.png | Bin 0 -> 1331 bytes e107_images/admin_images/undo_32.png | Bin 0 -> 1331 bytes 3 files changed, 2 insertions(+) create mode 100644 e107_images/admin_images/undo_16.png create mode 100644 e107_images/admin_images/undo_32.png diff --git a/e107_admin/history.php b/e107_admin/history.php index 78d93ad989..db3ee17db7 100644 --- a/e107_admin/history.php +++ b/e107_admin/history.php @@ -43,6 +43,8 @@ class history_adminArea extends e_admin_dispatcher ); protected $menuTitle = 'History'; + + protected $adminMenuIcon = '{e_IMAGE}admin_images/undo_32.png'; } diff --git a/e107_images/admin_images/undo_16.png b/e107_images/admin_images/undo_16.png new file mode 100644 index 0000000000000000000000000000000000000000..90377a0dd13fbc0916e7c34aaa23c1d4f9c323f4 GIT binary patch literal 1331 zcmV-31o}4|Aq8WeP2~m03CathLwv|NXB$ zJI8SrwrEGoH5J2>tBzaAqbqJJZ#kPa^5%wGP`~TYy2#7?{jEo7c;vbv*Y~$@uoIta zY@0nS6>k3JkE5xsOqMWkE6){tPy`k?9;zr$x`w02(|7J}X(thYQ*gz}S1&k$7aH3Z z7Z>T9KOAgFOmWUI1yNbEb?%Ls3r1k!7cJLbT9*8z^`B!C4*lCj7$i^?03;HUMQ-i+ z0EYsH@TI1tQS;70YOYbz-xqwB4&sRC1F6-sB*%D`*Gy(vW@?B z`!yTpT;Dw;0?+PjJ-+w1zsdraz&Sk$o@+XSkozf^U_x&!GC?IGQo~faa_nUcPnB%# z_WI2G58w9dpa|4__*15%t2^nO#h{V{6EFlZ3KGc?l|F<8@k%!Gj2l(KJ>!^18DvG z2)p(is3FRB&Ro6y`qL@^Fnw*)?U7`gay#v_V*`=+U(kCV`YV!~XMJNPm>E72Mpu?o zQd~TB$CI;~1|$G5?cK)eD4X32nm7p>KjYR|K4y8Ma*}WiYGyeAmxG8zs4O2&qNsRG z)1ujjPH92jc07JpvnAXF@&1Hpt_8jBJtF$Fn2t}Bl-+2_)C^063&h+O5#Q;>qpFx0 z&beN2fG`L+($R%vv)fLqK;G_n`?K<>Cw)LfD|5Tg$*So3A6|ZFexaHv^_y=tpIr*f zD3mud91d5Uyl#K}!+Q!Ukhi9%rgvDF9IK)SbB8O!YlMiuf1sNE_49T&FRz=4OH2i# z{(0vdhGCJf&Bq2L0PxMCnc3Yh&7Gv8-+NI+Jdu~GDN8>Xak{$ZWsf$wAe>w%=bQu6 zy9Y%eZ$H(~yGbOwQ$;anAknll)$CvT$Zt5eaDenxLm~k1^Xv2PbgQ;m= zR{PcfsbNDV0MNX=ZZ6Kf?Oaeg_$s%rK=4?8Fz7F$UJ}b{7YwPuk-<)h?#T~^q`+C3 z*$t<}62Yezg+TR-8)pH*DfnU0s*6GZ({%-+ukCx~p%eL+bN;Lz$f}oY_#C*eUwC)( z^15641}=yK)k`*PF97~+e{eX@3RJ)R-sOli0h0jCz;e%(2UgTQU#RB1DNwy+!$L&< z7G+XajkFkIw#{MV1_FmcD$vl-;OKW}s44Afll8xxnA6^)?*OB{LRHGXpFAx5xT?ff zzwtzE$C=i4TefT|5s|BbDxfm<65tYYSEd0eprUVK=+MT0qA6`@n=n4*I;u(&hp#Ae z2a|!zL`JAaml+uaXK)<&56A%RvHuwa!M;#LMgk82*8*dJ5x~fJ$I009N?A-U5gG2T zQK1Ho9yLl8CWhdo)YQ}n!2b=}$j?N>o3a1^002ovPDHLkV1mu`bxi;O literal 0 HcmV?d00001 diff --git a/e107_images/admin_images/undo_32.png b/e107_images/admin_images/undo_32.png new file mode 100644 index 0000000000000000000000000000000000000000..90377a0dd13fbc0916e7c34aaa23c1d4f9c323f4 GIT binary patch literal 1331 zcmV-31o}4|Aq8WeP2~m03CathLwv|NXB$ zJI8SrwrEGoH5J2>tBzaAqbqJJZ#kPa^5%wGP`~TYy2#7?{jEo7c;vbv*Y~$@uoIta zY@0nS6>k3JkE5xsOqMWkE6){tPy`k?9;zr$x`w02(|7J}X(thYQ*gz}S1&k$7aH3Z z7Z>T9KOAgFOmWUI1yNbEb?%Ls3r1k!7cJLbT9*8z^`B!C4*lCj7$i^?03;HUMQ-i+ z0EYsH@TI1tQS;70YOYbz-xqwB4&sRC1F6-sB*%D`*Gy(vW@?B z`!yTpT;Dw;0?+PjJ-+w1zsdraz&Sk$o@+XSkozf^U_x&!GC?IGQo~faa_nUcPnB%# z_WI2G58w9dpa|4__*15%t2^nO#h{V{6EFlZ3KGc?l|F<8@k%!Gj2l(KJ>!^18DvG z2)p(is3FRB&Ro6y`qL@^Fnw*)?U7`gay#v_V*`=+U(kCV`YV!~XMJNPm>E72Mpu?o zQd~TB$CI;~1|$G5?cK)eD4X32nm7p>KjYR|K4y8Ma*}WiYGyeAmxG8zs4O2&qNsRG z)1ujjPH92jc07JpvnAXF@&1Hpt_8jBJtF$Fn2t}Bl-+2_)C^063&h+O5#Q;>qpFx0 z&beN2fG`L+($R%vv)fLqK;G_n`?K<>Cw)LfD|5Tg$*So3A6|ZFexaHv^_y=tpIr*f zD3mud91d5Uyl#K}!+Q!Ukhi9%rgvDF9IK)SbB8O!YlMiuf1sNE_49T&FRz=4OH2i# z{(0vdhGCJf&Bq2L0PxMCnc3Yh&7Gv8-+NI+Jdu~GDN8>Xak{$ZWsf$wAe>w%=bQu6 zy9Y%eZ$H(~yGbOwQ$;anAknll)$CvT$Zt5eaDenxLm~k1^Xv2PbgQ;m= zR{PcfsbNDV0MNX=ZZ6Kf?Oaeg_$s%rK=4?8Fz7F$UJ}b{7YwPuk-<)h?#T~^q`+C3 z*$t<}62Yezg+TR-8)pH*DfnU0s*6GZ({%-+ukCx~p%eL+bN;Lz$f}oY_#C*eUwC)( z^15641}=yK)k`*PF97~+e{eX@3RJ)R-sOli0h0jCz;e%(2UgTQU#RB1DNwy+!$L&< z7G+XajkFkIw#{MV1_FmcD$vl-;OKW}s44Afll8xxnA6^)?*OB{LRHGXpFAx5xT?ff zzwtzE$C=i4TefT|5s|BbDxfm<65tYYSEd0eprUVK=+MT0qA6`@n=n4*I;u(&hp#Ae z2a|!zL`JAaml+uaXK)<&56A%RvHuwa!M;#LMgk82*8*dJ5x~fJ$I009N?A-U5gG2T zQK1Ho9yLl8CWhdo)YQ}n!2b=}$j?N>o3a1^002ovPDHLkV1mu`bxi;O literal 0 HcmV?d00001 From ab58afd6295a383ce70237fa3b9fbbe98b8b0b30 Mon Sep 17 00:00:00 2001 From: camer0n Date: Thu, 6 Feb 2025 13:36:02 -0800 Subject: [PATCH 2/5] Issue #5382 #5432 Updated tests. --- e107_admin/history.php | 7 ++--- e107_core/templates/admin_icons_template.php | 10 ++++---- e107_tests/tests/unit/e107Test.php | 27 ++++++++++---------- e107_tests/tests/unit/e_navigationTest.php | 9 +++++++ 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/e107_admin/history.php b/e107_admin/history.php index db3ee17db7..7329198818 100644 --- a/e107_admin/history.php +++ b/e107_admin/history.php @@ -2,8 +2,9 @@ // Generated e107 Plugin Admin Area -require_once('../class2.php'); -if (!getperms('0')) +require_once(__DIR__.'/../class2.php'); + +if (!getperms('7')) { e107::redirect('admin'); exit; @@ -387,5 +388,5 @@ function history_data($curVal,$mode) e107::getAdminUI()->runPage(); require_once(e_ADMIN."footer.php"); -exit; + diff --git a/e107_core/templates/admin_icons_template.php b/e107_core/templates/admin_icons_template.php index 14d228f9e0..991b9b591f 100644 --- a/e107_core/templates/admin_icons_template.php +++ b/e107_core/templates/admin_icons_template.php @@ -148,11 +148,11 @@ $ADMIN_ICONS_TEMPLATE['ADMIN_WARNING_ICON_PATH'] = e_IMAGE_ABS . "admin_images/warning_32.png"; -$ADMIN_ICONS_TEMPLATE['ADMIN_EDIT_ICON'] = ""; // ""; -$ADMIN_ICONS_TEMPLATE['ADMIN_DELETE_ICON'] = ""; // ""; -$ADMIN_ICONS_TEMPLATE['ADMIN_SORT_ICON'] = ""; // -$ADMIN_ICONS_TEMPLATE['ADMIN_EXECUTE_ICON'] = ""; // ""; -$ADMIN_ICONS_TEMPLATE['ADMIN_PAGES_ICON'] = ""; //""; +$ADMIN_ICONS_TEMPLATE['ADMIN_EDIT_ICON'] = ""; // ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_DELETE_ICON'] = ""; // ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_SORT_ICON'] = ""; // +$ADMIN_ICONS_TEMPLATE['ADMIN_EXECUTE_ICON'] = ""; // ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_PAGES_ICON'] = ""; //""; $ADMIN_ICONS_TEMPLATE['E_32_TRUE'] = ""; diff --git a/e107_tests/tests/unit/e107Test.php b/e107_tests/tests/unit/e107Test.php index eb2069bd71..b807921edb 100644 --- a/e107_tests/tests/unit/e107Test.php +++ b/e107_tests/tests/unit/e107Test.php @@ -1048,27 +1048,28 @@ public function testLoadAdminIcons() 'ADMIN_WARNING_ICON' => '', 'ADMIN_GRID_ICON' => '', 'ADMIN_LIST_ICON' => '', - 'ADMIN_EDIT_ICON' => '', - 'ADMIN_DELETE_ICON' => '', - 'ADMIN_SORT_ICON' => '', - 'ADMIN_EXECUTE_ICON' => '', - 'ADMIN_PAGES_ICON' => '', + 'ADMIN_EDIT_ICON' => "", + 'ADMIN_DELETE_ICON' => "", + 'ADMIN_SORT_ICON' => "", + 'ADMIN_EXECUTE_ICON' => "", + 'ADMIN_PAGES_ICON' => "", 'ADMIN_ADD_ICON' => '', 'ADMIN_INFO_ICON' => '', - 'ADMIN_CONFIGURE_ICON' => '', - 'ADMIN_VIEW_ICON' => '', + 'ADMIN_CONFIGURE_ICON' => "", + 'ADMIN_VIEW_ICON' => "", 'ADMIN_URL_ICON' => '', 'ADMIN_INSTALLPLUGIN_ICON' => '', - 'ADMIN_UNINSTALLPLUGIN_ICON' => '', - 'ADMIN_UPGRADEPLUGIN_ICON' => '', - 'ADMIN_REPAIRPLUGIN_ICON' => '', - 'ADMIN_UP_ICON' => '', - 'ADMIN_DOWN_ICON' => '', + 'ADMIN_UNINSTALLPLUGIN_ICON' => "", + 'ADMIN_UPGRADEPLUGIN_ICON' => "", + 'ADMIN_REPAIRPLUGIN_ICON' => "", + 'ADMIN_UP_ICON' => "", + 'ADMIN_DOWN_ICON' => "", 'ADMIN_EDIT_ICON_PATH' => '/e107_images/admin_images/edit_32.png', 'ADMIN_DELETE_ICON_PATH' => '/e107_images/admin_images/delete_32.png', 'ADMIN_WARNING_ICON_PATH' => '/e107_images/admin_images/warning_32.png', 'E_24_PLUGIN' => " ", - + 'E_16_UNDO' => "", + 'E_32_UNDO' => "" ); diff --git a/e107_tests/tests/unit/e_navigationTest.php b/e107_tests/tests/unit/e_navigationTest.php index 43a736a59e..1d9ef76b07 100644 --- a/e107_tests/tests/unit/e_navigationTest.php +++ b/e107_tests/tests/unit/e_navigationTest.php @@ -98,6 +98,15 @@ public function testAdminLinksLegacy() 5 => '', 6 => ' ', ), + 9 => array ( + 0 => './e107_admin/history.php', + 1 => 'History', + 2 => 'History', + 3 => '7', + 4 => 4, + 5 => '\'\'', + 6 => '\'\'' + ), 10 => array ( 0 => '/e107_admin/frontpage.php', From f772ab0b98f1667b2d3ebaa6dde7cc39494c12cf Mon Sep 17 00:00:00 2001 From: camer0n Date: Fri, 7 Feb 2025 14:01:34 -0800 Subject: [PATCH 3/5] Issue #5432 Styling --- e107_handlers/form_handler.php | 6 +++--- e107_themes/bootstrap3/admin_style.css | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index ae2c6ddf28..f7a178d818 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -5301,7 +5301,7 @@ private function renderOptions($parms, $id, $attributes) $att = [ 'href' => e_SELF . "?$query", - 'class' => "btn btn-default btn-secondary$eModal", + 'class' => "btn btn-default btn-primary$eModal", 'data-modal-caption' => $eModalCap, 'title' => LAN_EDIT, // 'data-toggle' => 'tooltip', @@ -5324,7 +5324,7 @@ private function renderOptions($parms, $id, $attributes) if(check_class($cls)) { - $parms['class'] = 'action delete btn btn-default'.$delcls; + $parms['class'] = 'action delete btn btn-danger'.$delcls; unset($parms['deleteClass']); $parms['icon'] = $deleteIconDefault; $text .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', $parms); @@ -5332,7 +5332,7 @@ private function renderOptions($parms, $id, $attributes) } else { - $parms['class'] = 'action delete btn btn-default'.$delcls; + $parms['class'] = 'action delete btn btn-danger'.$delcls; $parms['icon'] = $deleteIconDefault; $text .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', $parms); } diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css index 1c67fd6e42..8b58d4f512 100644 --- a/e107_themes/bootstrap3/admin_style.css +++ b/e107_themes/bootstrap3/admin_style.css @@ -254,7 +254,7 @@ td .file.well { margin-bottom:0 } -td.options .btn-group { display: flex; } +td.options .btn-group { display: flex; justify-content: center; } .table .nav-tabs a, From 2b9997fe9b056d53992fff9691e96433f0b591c1 Mon Sep 17 00:00:00 2001 From: camer0n Date: Fri, 7 Feb 2025 14:19:24 -0800 Subject: [PATCH 4/5] Closes #5382 --- e107_admin/history.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_admin/history.php b/e107_admin/history.php index 7329198818..1667e0af18 100644 --- a/e107_admin/history.php +++ b/e107_admin/history.php @@ -328,7 +328,7 @@ public function options($parms, $value, $id, $att = []) $row = $controller->getListModel()->getData(); // Begin options group - $text = "
"; + $text = "
"; // Check if the record can be restored if (!empty($id)) @@ -338,7 +338,7 @@ public function options($parms, $value, $id, $att = []) $type = $row['history_action']; $name = ($type === 'delete') ? "restore_deleted[$id]" : "restore_updated[$id]"; - $text .= ""; + $text .= ""; } $att['readParms']['editClass'] = 999; // disable it. From 5b46d602688bdf034b65bcc520a4f22593591a54 Mon Sep 17 00:00:00 2001 From: camer0n Date: Fri, 7 Feb 2025 14:36:42 -0800 Subject: [PATCH 5/5] Issue #5432 --- e107_admin/cpage.php | 6 +++--- e107_themes/bootstrap3/admin_style.css | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index 9375cfccf9..eaa5a26353 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -143,12 +143,12 @@ function options($parms, $value, $id, $attributes) $query['id'] = $id; $query = http_build_query($query, '', '&'); - $text = " + $text = " ".defset('ADMIN_EDIT_ICON').""; if($this->getController()->getMode() === 'overview' && getperms('J1')) // Page/Menu Delete Perms. { - $text .= $this->submit_image('menu_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn btn-default')); + $text .= $this->submit_image('menu_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn btn-danger')); } return $text; } @@ -405,7 +405,7 @@ function options($parms, $value, $id, $attributes) $att['readParms']['deleteClass'] = e_UC_NOBODY; } - $text = "
"; + $text = "
"; $text .= $this->renderValue('options',$value,$att,$id); diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css index 8b58d4f512..f8389a6d6b 100644 --- a/e107_themes/bootstrap3/admin_style.css +++ b/e107_themes/bootstrap3/admin_style.css @@ -632,6 +632,7 @@ i.s-message-icon { width:32px; height:32px; float:left; + line-height: 28px; } i.s-message-success { background-position: -592px -37px; width: 32px; height: 32px; }