From 6ebcf12daef76d14b582731b1440a68eb4a96cb9 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Fri, 4 Aug 2023 02:52:06 +0000
Subject: [PATCH]  * Use setClass instead of set::class.  * Add data-dismiss
 attribute.

---
 module/extension/ui/activate.html.php   | 15 +++++------
 module/extension/ui/browse.html.php     | 10 ++++----
 module/extension/ui/deactivate.html.php | 17 +++++++------
 module/extension/ui/erase.html.php      | 17 +++++++------
 module/extension/ui/install.html.php    |  1 +
 module/extension/ui/obtain.html.php     | 30 +++++++++++-----------
 module/extension/ui/safe.html.php       |  2 +-
 module/extension/ui/structure.html.php  |  2 +-
 module/extension/ui/uninstall.html.php  | 33 +++++++++++++------------
 9 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/module/extension/ui/activate.html.php b/module/extension/ui/activate.html.php
index a74cae0a46..6038d1f544 100644
--- a/module/extension/ui/activate.html.php
+++ b/module/extension/ui/activate.html.php
@@ -14,7 +14,7 @@ if(!empty($error))
 {
     div
     (
-        set::class('text-danger'),
+        setClass('text-danger'),
         html($error)
     );
 }
@@ -24,30 +24,31 @@ else
 
     div
     (
-        set::class('p-2'),
+        setClass('p-2'),
         div
         (
-            set::class('flex mb-3'),
+            setClass('flex mb-3'),
             icon
             (
                 'exclamation-sign',
                 set::size('2x'),
-                set::class('text-warning mr-4'),
+                setClass('text-warning mr-4'),
             ),
             div
             (
-                set::class('article-h2 leading-8 mb-2'),
+                setClass('article-h2 leading-8 mb-2'),
                 $title,
             )
         ),
         div
         (
-            set::class('text-center'),
+            setClass('text-center'),
             btn
             (
-                set::class('mr-4'),
+                setClass('mr-4'),
                 set::type('primary'),
                 set::url(createLink('extension', 'browse', "status=installed")),
+                set('data-dismiss', 'modal'),
                 $lang->extension->viewInstalled
             ),
             btn
diff --git a/module/extension/ui/browse.html.php b/module/extension/ui/browse.html.php
index 5af2c1c0f7..af8aba213f 100755
--- a/module/extension/ui/browse.html.php
+++ b/module/extension/ui/browse.html.php
@@ -43,15 +43,15 @@ foreach($extensions as $extension)
 
     $extensionItems[] = div
     (
-        set::class('mb-2'),
+        setClass('mb-2'),
         div
         (
-            set::class('font-bold mb-2'),
+            setClass('font-bold mb-2'),
             $extension->name
         ),
         div
         (
-            set::class('mb-2'),
+            setClass('mb-2'),
             $extension->desc
         ),
         div
@@ -59,7 +59,7 @@ foreach($extensions as $extension)
             $extensionInfo,
             div
             (
-                set::class('pull-right'),
+                setClass('pull-right'),
                 btnGroup
                 (
                     set::items($btnItems),
@@ -99,7 +99,7 @@ toolbar
 
 div
 (
-    set::class('flex col gap-y-1 p-5 bg-white'),
+    setClass('flex col gap-y-1 p-5 bg-white'),
     $extensionItems
 );
 
diff --git a/module/extension/ui/deactivate.html.php b/module/extension/ui/deactivate.html.php
index 0744fe62b9..21b8630e94 100644
--- a/module/extension/ui/deactivate.html.php
+++ b/module/extension/ui/deactivate.html.php
@@ -16,40 +16,41 @@ set::closeBtn(false);
 
 div
 (
-    set::class('p-2'),
+    setClass('p-2'),
     div
     (
-        set::class('flex mb-3'),
+        setClass('flex mb-3'),
         icon
         (
             'exclamation-sign',
             set::size('2x'),
-            set::class('text-warning mr-4'),
+            setClass('text-warning mr-4'),
         ),
         div
         (
-            set::class('article-h2 leading-8 mb-2'),
+            setClass('article-h2 leading-8 mb-2'),
             $title,
         )
     ),
     $removeCommands ?  div
     (
-        set::class('font-bold mb-2'),
+        setClass('font-bold mb-2'),
         $lang->extension->unremovedFiles,
     ) : null,
     $removeCommands ?  div
     (
-        set::class('border bg-surface p-2'),
+        setClass('border bg-surface p-2'),
         html($removeCommands)
     ) : null,
     div
     (
-        set::class('text-center'),
+        setClass('text-center'),
         btn
         (
             $lang->extension->viewDeactivated,
-            set::class('mr-4'),
+            setClass('mr-4'),
             set::type('primary'),
+            set('data-dismiss', 'modal'),
             set::url(createLink('extension', 'browse', 'status=deactivated'))
         ),
         btn
diff --git a/module/extension/ui/erase.html.php b/module/extension/ui/erase.html.php
index 7f4d5a63dd..f6f419ad0d 100644
--- a/module/extension/ui/erase.html.php
+++ b/module/extension/ui/erase.html.php
@@ -14,40 +14,41 @@ set::closeBtn(false);
 
 div
 (
-    set::class('p-2'),
+    setClass('p-2'),
     div
     (
-        set::class('flex mb-3'),
+        setClass('flex mb-3'),
         icon
         (
             'check-circle',
             set::size('2x'),
-            set::class('text-success mr-4'),
+            setClass('text-success mr-4'),
         ),
         div
         (
-            set::class('article-h2 leading-8 mb-2 text-success'),
+            setClass('article-h2 leading-8 mb-2 text-success'),
             $title,
         )
     ),
     $removeCommands ? div
     (
-        set::class('mb-3'),
+        setClass('mb-3'),
         div
         (
-            set::class('font-bold'),
+            setClass('font-bold'),
             $lang->extension->unremovedFiles
         ),
         html(\implode('<br />', $removeCommands)),
     ) : null,
     div
     (
-        set::class('text-center'),
+        setClass('text-center'),
         btn
         (
-            set::class('mr-4'),
+            setClass('mr-4'),
             set::type('primary'),
             set::url(createLink('extension', 'browse', "status=available")),
+            set('data-dismiss', 'modal'),
             $lang->extension->viewAvailable
         ),
         btn
diff --git a/module/extension/ui/install.html.php b/module/extension/ui/install.html.php
index a6f8558ad3..3c59dc27bd 100644
--- a/module/extension/ui/install.html.php
+++ b/module/extension/ui/install.html.php
@@ -83,6 +83,7 @@ empty($error) && !isset($license) ? div
     (
         set::type('success'),
         set::url(createLink('extension', 'browse')),
+        set('data-dismiss', 'modal'),
         $lang->extension->viewInstalled,
     ),
     div
diff --git a/module/extension/ui/obtain.html.php b/module/extension/ui/obtain.html.php
index e8aeaad5cf..48ffd5b80e 100644
--- a/module/extension/ui/obtain.html.php
+++ b/module/extension/ui/obtain.html.php
@@ -12,7 +12,7 @@ namespace zin;
 
 $searchForm = div
 (
-    set::class('mb-5'),
+    setClass('mb-5'),
     inputGroup
     (
         input
@@ -23,7 +23,7 @@ $searchForm = div
         ),
         span
         (
-            set::class('input-group-btn'),
+            setClass('input-group-btn'),
             btn
             (
                 icon('search'),
@@ -54,7 +54,7 @@ foreach($lang->extension->featureBar['browse'] as $browseType => $browseLabel)
 {
     $featureItems[] = li
     (
-        set::class('nav-item'),
+        setClass('nav-item'),
         a
         (
             set('href', createLink('extension', 'browse', "type=$browseType")),
@@ -92,17 +92,17 @@ sidebar
     setClass('pb-5'),
     div
     (
-        set::class('fast-menu bg-white p-4 shadow-sm rounded rounded-sm'),
+        setClass('fast-menu bg-white p-4 shadow-sm rounded rounded-sm'),
         $searchForm,
         menu
         (
-            set::class('p-0'),
+            setClass('p-0'),
             $menuItems
         ),
     ),
     moduleMenu
     (
-        set::class('module-menu'),
+        setClass('module-menu'),
         set::title($lang->extension->byCategory),
         set::modules($moduleTree),
         set::activeKey($moduleID),
@@ -169,25 +169,25 @@ foreach($extensions as $extension)
 
     $extensionItems[] = div
     (
-        set::class('pb-2' . ($i < $extensionCount ? ' border-b' : '') . ($i > 1 ? ' mt-5' : '')),
+        setClass('pb-2' . ($i < $extensionCount ? ' border-b' : '') . ($i > 1 ? ' mt-5' : '')),
         div
         (
-            set::class('font-bold mb-2'),
+            setClass('font-bold mb-2'),
             $extension->name . "($currentRelease->releaseVersion)",
             span
             (
-                set::class("label $labelClass size-sm font-medium ml-2"),
+                setClass("label $labelClass size-sm font-medium ml-2"),
                 $lang->extension->obtainOfficial[$extension->offcial]
             ),
             $latestRelease && $latestRelease->releaseVersion != $currentRelease->releaseVersion ? div
             (
-                set::class('pull-right text-sm text-warning'),
+                setClass('pull-right text-sm text-warning'),
                 html(sprintf($lang->extension->latest, $latestRelease->viewLink, $latestRelease->releaseVersion, $latestRelease->zentaoCompatible))
             ) : null,
         ),
         div
         (
-            set::class('mb-2'),
+            setClass('mb-2'),
             $extension->abstract
         ),
         div
@@ -204,7 +204,7 @@ foreach($extensions as $extension)
             ),
             div
             (
-                set::class('pull-right'),
+                setClass('pull-right'),
                 btnGroup
                 (
                     set::items($btnItems),
@@ -229,10 +229,10 @@ if($pager->recTotal)
 
 div
 (
-    set::class('flex col gap-y-1 p-5 bg-white'),
+    setClass('flex col gap-y-1 p-5 bg-white'),
     $extensions ? $extensionItems : div
     (
-        set::class('alert ghost text-danger flex items-center'),
+        setClass('alert ghost text-danger flex items-center'),
         icon
         (
             'exclamation-sign',
@@ -243,7 +243,7 @@ div
         (
             div
             (
-                set::class('font-bold, text-lg'),
+                setClass('font-bold text-lg'),
                 $lang->extension->errorOccurs,
             ),
             p
diff --git a/module/extension/ui/safe.html.php b/module/extension/ui/safe.html.php
index 97c8f8888c..af44a60a5c 100644
--- a/module/extension/ui/safe.html.php
+++ b/module/extension/ui/safe.html.php
@@ -14,7 +14,7 @@ panel
 (
     p
     (
-        set::class('text-danger mb-3'),
+        setClass('text-danger mb-3'),
         html($error),
     ),
     btn
diff --git a/module/extension/ui/structure.html.php b/module/extension/ui/structure.html.php
index bc2b98a5eb..6e33905c85 100644
--- a/module/extension/ui/structure.html.php
+++ b/module/extension/ui/structure.html.php
@@ -19,7 +19,7 @@ set::title($extension->name . '[' . $extension->code . ']' . $lang->extension->s
 
 div
 (
-    set::class('border bg-surface p-2'),
+    setClass('border bg-surface p-2'),
     $fileItems
 );
 
diff --git a/module/extension/ui/uninstall.html.php b/module/extension/ui/uninstall.html.php
index a99ba609a1..defd32bf6b 100644
--- a/module/extension/ui/uninstall.html.php
+++ b/module/extension/ui/uninstall.html.php
@@ -16,11 +16,11 @@ if(isset($confirm) && $confirm == 'no')
 {
     div
     (
-        set::class('alert bg-white text-warning'),
+        setClass('alert bg-white text-warning'),
         icon
         (
             'exclamation-sign',
-            set::class('alert-icon')
+            setClass('alert-icon')
         ),
         $lang->extension->confirmUninstall,
         a
@@ -34,23 +34,23 @@ elseif(!empty($error))
 {
     div
     (
-        set::class('alert bg-white text-warning'),
+        setClass('alert bg-white text-warning'),
         icon
         (
             'exclamation-sign',
             set::size('2x'),
-            set::class('alert-icon')
+            setClass('alert-icon')
         ),
         div
         (
             div 
             (
-                set::class('alert-heading'),
+                setClass('alert-heading'),
                 $lang->extension->uninstallFailed
             ),
             p
             (
-                set::class('alert-content py-4'),
+                setClass('alert-content py-4'),
                 html($error)
             )
         )
@@ -61,40 +61,40 @@ else
     set::closeBtn(false);
     div
     (
-        set::class('p-2'),
+        setClass('p-2'),
         div
         (
-            set::class('flex mb-3'),
+            setClass('flex mb-3'),
             icon
             (
                 'exclamation-sign',
                 set::size('2x'),
-                set::class('text-warning mr-4'),
+                setClass('text-warning mr-4'),
             ),
             div
             (
-                set::class('article-h2 leading-8 mb-2'),
+                setClass('article-h2 leading-8 mb-2'),
                 $title,
             )
         ),
         (!empty($backupFile) || !empty($removeCommands)) ? div
         (
-            set::class('alert'),
+            setClass('alert'),
             icon
             (
                 'check-circle',
-                set::class('alert-icon')
+                setClass('alert-icon')
             ),
             div
             (
-                set::class('alert-content'),
+                setClass('alert-content'),
                 !empty($backupFile) ? p
                 (
                     sprintf($lang->extension->backDBFile, $backupFile)
                 ) : null,
                 $removeCommands ? p
                 (
-                    set::class('font-bold'),
+                    setClass('font-bold'),
                     $lang->extension->unremovedFiles,
                 ) : null,
                 $removeCommands ? html($removeCommands) : null,
@@ -102,12 +102,13 @@ else
         ) : null,
         div
         (
-            set::class('text-center'),
+            setClass('text-center'),
             btn
             (
-                set::class('mr-4'),
+                setClass('mr-4'),
                 set::type('primary'),
                 set::url(createLink('extension', 'browse', "status=available")),
+                set('data-dismiss', 'modal'),
                 $lang->extension->viewAvailable
             ),
             btn