From 2c79c59a6ec286ac034b03fbf2114247aa4ba253 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 14 Nov 2023 10:20:32 +0800 Subject: [PATCH] * Remove `,` at the end of row in the lastest children in extension. --- module/extension/ui/activate.html.php | 4 ++-- module/extension/ui/browse.html.php | 4 ++-- module/extension/ui/deactivate.html.php | 6 +++--- module/extension/ui/erase.html.php | 6 +++--- module/extension/ui/install.html.php | 16 ++++++++-------- module/extension/ui/obtain.html.php | 24 ++++++++++++------------ module/extension/ui/safe.html.php | 4 ++-- module/extension/ui/uninstall.html.php | 8 ++++---- module/extension/ui/upload.html.php | 6 +++--- 9 files changed, 39 insertions(+), 39 deletions(-) diff --git a/module/extension/ui/activate.html.php b/module/extension/ui/activate.html.php index 2afbcb732f..8d512fbc87 100644 --- a/module/extension/ui/activate.html.php +++ b/module/extension/ui/activate.html.php @@ -32,12 +32,12 @@ else ( 'exclamation-sign', set::size('2x'), - setClass('text-warning mr-4'), + setClass('text-warning mr-4') ), div ( setClass('article-h2 leading-8 mb-2'), - $title, + $title ) ), div diff --git a/module/extension/ui/browse.html.php b/module/extension/ui/browse.html.php index af8aba213f..0e548ea8fb 100755 --- a/module/extension/ui/browse.html.php +++ b/module/extension/ui/browse.html.php @@ -62,7 +62,7 @@ foreach($extensions as $extension) setClass('pull-right'), btnGroup ( - set::items($btnItems), + set::items($btnItems) ) ) ), @@ -94,7 +94,7 @@ toolbar 'text' => $lang->extension->obtain, 'class' => 'primary', 'url' => createLink('extension', 'obtain') - ))) : null, + ))) : null ); div diff --git a/module/extension/ui/deactivate.html.php b/module/extension/ui/deactivate.html.php index 1929724d54..be7a392692 100644 --- a/module/extension/ui/deactivate.html.php +++ b/module/extension/ui/deactivate.html.php @@ -24,18 +24,18 @@ div ( 'exclamation-sign', set::size('2x'), - setClass('text-warning mr-4'), + setClass('text-warning mr-4') ), div ( setClass('article-h2 leading-8 mb-2'), - $title, + $title ) ), $removeCommands ? div ( setClass('font-bold mb-2'), - $lang->extension->unremovedFiles, + $lang->extension->unremovedFiles ) : null, $removeCommands ? div ( diff --git a/module/extension/ui/erase.html.php b/module/extension/ui/erase.html.php index 2f400e558f..a3eef8d4a2 100644 --- a/module/extension/ui/erase.html.php +++ b/module/extension/ui/erase.html.php @@ -22,12 +22,12 @@ div ( 'check-circle', set::size('2x'), - setClass('text-success mr-4'), + setClass('text-success mr-4') ), div ( setClass('article-h2 leading-8 mb-2 text-success'), - $title, + $title ) ), $removeCommands ? div @@ -38,7 +38,7 @@ div setClass('font-bold'), $lang->extension->unremovedFiles ), - html(\implode('
', $removeCommands)), + html(\implode('
', $removeCommands)) ) : null, div ( diff --git a/module/extension/ui/install.html.php b/module/extension/ui/install.html.php index 8ee49232f2..06a51fdda2 100644 --- a/module/extension/ui/install.html.php +++ b/module/extension/ui/install.html.php @@ -36,13 +36,13 @@ foreach($files as $fileName => $md5) p ( setClass('text-danger mb-3'), - html($error), + html($error) ), btn ( set::type('primary'), set::onclick('window.reloadPage(this)'), - $lang->extension->refreshPage, + $lang->extension->refreshPage ) ) : null; @@ -61,7 +61,7 @@ empty($error) && isset($license) ? div ( set::rows(15), set::name('license'), - set::value($license), + set::value($license) ) ), btn @@ -69,7 +69,7 @@ empty($error) && isset($license) ? div set::type('primary'), set('data-load', 'modal'), set('url', $agreeLink), - $lang->extension->agreeLicense, + $lang->extension->agreeLicense ) ) : null; @@ -85,7 +85,7 @@ empty($error) && !isset($license) ? div set::type('success'), set('load-url', createLink('extension', 'browse')), set::onclick('window.loadParentUrl(this)'), - $lang->extension->viewInstalled, + $lang->extension->viewInstalled ), div ( @@ -95,11 +95,11 @@ empty($error) && !isset($license) ? div setClass('alert-content'), p ( - $lang->extension->successDownloadedPackage, + $lang->extension->successDownloadedPackage ), p ( - $lang->extension->successCopiedFiles, + $lang->extension->successCopiedFiles ), ul ( @@ -107,7 +107,7 @@ empty($error) && !isset($license) ? div ), p ( - $lang->extension->successInstallDB, + $lang->extension->successInstallDB ) ) ) diff --git a/module/extension/ui/obtain.html.php b/module/extension/ui/obtain.html.php index 48ffd5b80e..ca5d677b71 100644 --- a/module/extension/ui/obtain.html.php +++ b/module/extension/ui/obtain.html.php @@ -44,7 +44,7 @@ foreach(array('byUpdatedTime', 'byAddedTime', 'byDownloads') as $listType) ( setClass($active), set::href(createLink('extension', 'obtain', "type=$listType")), - $lang->extension->$listType, + $lang->extension->$listType ) ); } @@ -59,7 +59,7 @@ foreach($lang->extension->featureBar['browse'] as $browseType => $browseLabel) ( set('href', createLink('extension', 'browse', "type=$browseType")), set('data-id', $browseType), - $browseLabel, + $browseLabel ) ); } @@ -82,7 +82,7 @@ toolbar 'text' => $lang->extension->obtain, 'class' => 'primary', 'url' => createLink('extension', 'obtain') - ))) : null, + ))) : null ); foreach($moduleTree as $module) $module->url = createLink('extension', 'obtain', "type=bymodule¶m=" . base64_encode($module->id)); @@ -98,7 +98,7 @@ sidebar ( setClass('p-0'), $menuItems - ), + ) ), moduleMenu ( @@ -183,7 +183,7 @@ foreach($extensions as $extension) ( setClass('pull-right text-sm text-warning'), html(sprintf($lang->extension->latest, $latestRelease->viewLink, $latestRelease->releaseVersion, $latestRelease->zentaoCompatible)) - ) : null, + ) : null ), div ( @@ -207,10 +207,10 @@ foreach($extensions as $extension) setClass('pull-right'), btnGroup ( - set::items($btnItems), + set::items($btnItems) ) - ), - ), + ) + ) ); $i ++; } @@ -223,7 +223,7 @@ if($pager->recTotal) set::type('full'), set::page($pager->page), set::recTotal($pager->recTotal), - set::recPerPage($pager->recPerPage), + set::recPerPage($pager->recPerPage) ); } @@ -244,14 +244,14 @@ div div ( setClass('font-bold text-lg'), - $lang->extension->errorOccurs, + $lang->extension->errorOccurs ), p ( - html($lang->extension->errorGetExtensions), + html($lang->extension->errorGetExtensions) ) ) - ), + ) ); render(); diff --git a/module/extension/ui/safe.html.php b/module/extension/ui/safe.html.php index af44a60a5c..91562f06ff 100644 --- a/module/extension/ui/safe.html.php +++ b/module/extension/ui/safe.html.php @@ -15,13 +15,13 @@ panel p ( setClass('text-danger mb-3'), - html($error), + html($error) ), btn ( on::click('loadCurrentPage'), set::type('primary'), - $lang->extension->refreshPage, + $lang->extension->refreshPage ) ); diff --git a/module/extension/ui/uninstall.html.php b/module/extension/ui/uninstall.html.php index d49688b8c4..4d08d56fff 100644 --- a/module/extension/ui/uninstall.html.php +++ b/module/extension/ui/uninstall.html.php @@ -71,12 +71,12 @@ else ( 'exclamation-sign', set::size('2x'), - setClass('text-warning mr-4'), + setClass('text-warning mr-4') ), div ( setClass('article-h2 leading-8 mb-2'), - $title, + $title ) ), (!empty($backupFile) || !empty($removeCommands)) ? div @@ -97,9 +97,9 @@ else $removeCommands ? p ( setClass('font-bold'), - $lang->extension->unremovedFiles, + $lang->extension->unremovedFiles ) : null, - $removeCommands ? html($removeCommands) : null, + $removeCommands ? html($removeCommands) : null ) ) : null, div diff --git a/module/extension/ui/upload.html.php b/module/extension/ui/upload.html.php index bab101ec11..0d6b27fef4 100755 --- a/module/extension/ui/upload.html.php +++ b/module/extension/ui/upload.html.php @@ -20,7 +20,7 @@ if(!empty($error)) set('data-load', 'modal'), set('url', createLink('extension', 'upload')), set::type('primary'), - $lang->extension->refreshPage, + $lang->extension->refreshPage ) ); } @@ -39,10 +39,10 @@ else upload ( set::limitSize($maxUploadSize . 'B'), - set::exceededSizeHint($exceedLimitMsg), + set::exceededSizeHint($exceedLimitMsg) ) ), - set::submitBtnText($lang->extension->install), + set::submitBtnText($lang->extension->install) ); }