Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* install: unify the style of installation steps.

Browse Source
This commit is contained in:
liugang
2024-04-23 10:54:21 +08:00
parent f370984368
commit c235c491b7
16 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/install/css/showtableprogress.ui.css
-1
View File
@@ -1 +0,0 @@
.progress{overflow:hidden; height:400px; display: block; white-space: normal;}
module/install/css/step1.ui.css
-1
View File
@@ -1 +0,0 @@
.panel .panel-heading {justify-content: flex-start; gap: 0.125rem;}
module/install/css/step2.ui.css
-1
View File
@@ -1 +0,0 @@
.table.bordered > * > tr > th:first-child {text-align: right;}
module/install/css/step4.ui.css
+1 -6
View File
@@ -1,6 +1 @@
.panel {width: 1000px; margin: auto; padding-bottom: 32px;}
.panel .panel-heading {justify-content: flex-start; padding: 24px 16px; gap: 0.125rem;}
.panel .panel-body {padding: 0px 16px;}
.panel .panel-body .table.bordered > thead {background-color: var(--color-gray-100); color: var(--color-gray-900);}
.table.bordered > * > tr > td {text-align: center;}
.table.bordered > * > tr > td:first-child {text-align: left;}
.panel .panel-body {padding-top: 0px;}
module/install/css/step5.ui.css
-2
View File
@@ -1,2 +0,0 @@
#mainContent .panel {padding: 1rem; margin-top: 10%;}
#mainContent .panel-heading {width: 24rem; margin: auto; padding: 0.75rem;}
module/install/ui/app.html.php
+4 -2
View File
@@ -28,10 +28,12 @@ foreach($components->category as $item)
jsVar('category', $category);
div
(
set::id('main'),
setID('main'),
setClass('flex justify-center'),
div
(
set::id('mainContent'),
setID('mainContent'),
setClass('px-1 mt-2 w-full max-w-7xl'),
formPanel
(
set::formID('solutionForm'),
module/install/ui/index.html.php
+4 -3
View File
@@ -17,11 +17,12 @@ foreach($app->config->langs as $key => $value) $langItems[] = array('text' => $v
div
(
set::id('main'),
setID('main'),
setClass('flex justify-center'),
div
(
set::id('mainContent'),
setClass('px-1 mt-2'),
setID('mainContent'),
setClass('px-1 mt-2 w-full max-w-7xl'),
panel
(
setClass('p-8'),
module/install/ui/license.html.php
+4 -3
View File
@@ -16,11 +16,12 @@ jsVar('nextLink', $config->inQuickon ? inlink('step5') : inlink('step1'));
div
(
set::id('main'),
setID('main'),
setClass('flex justify-center'),
div
(
set::id('mainContent'),
setClass('px-1 mt-2'),
setID('mainContent'),
setClass('px-1 mt-2 w-full max-w-7xl'),
panel
(
setClass('p-8'),
module/install/ui/progress.html.php
+4 -2
View File
@@ -74,10 +74,12 @@ if(!helper::isAjaxRequest('modal'))
div
(
set::id('main'),
setID('main'),
setClass('flex justify-center'),
div
(
set::id('mainContent'),
setID('mainContent'),
setClass('px-1 mt-2 w-full max-w-7xl'),
h::importCss($app->getWebRoot() . 'js/xterm/xterm.css'),
set('data-loading', $lang->solution->notices->uninstallingSolution),
formPanel
module/install/ui/showtableprogress.html.php
+5 -3
View File
@@ -15,17 +15,19 @@ set::zui(true);
jsVar('dbFinish', $lang->install->dbFinish);
div
(
set::id('main'),
setID('main'),
setClass('flex justify-center'),
div
(
set::id('mainContent'),
setID('mainContent'),
setClass('px-1 mt-2 w-full max-w-7xl'),
panel
(
setClass('py-2'),
set::title($lang->install->dbProgress),
form
(
h::pre(setID('progress'), setClass('progress')),
h::pre(setID('progress'), setClass('progress block overflow-hidden h-96')),
set::actions(array(array('disabled' => true, 'text' => $lang->install->next, 'class' => 'primary next')))
)
)
module/install/ui/step1.html.php
+4 -2
View File
@@ -63,10 +63,12 @@ foreach($dirItems as $dirItem)
div
(
set::id('main'),
setID('main'),
setClass('flex justify-center'),
div
(
set::id('mainContent'),
setID('mainContent'),
setClass('px-1 mt-2 w-full max-w-7xl'),
panel
(
setClass('py-2'),
module/install/ui/step2.html.php
+15 -17
View File
@@ -16,10 +16,12 @@ set::zui(true);
div
(
set::id('main'),
setID('main'),
setClass('flex justify-center'),
div
(
set::id('mainContent'),
setID('mainContent'),
setClass('px-1 mt-2 w-full max-w-7xl'),
panel
(
setClass('py-2'),
@@ -33,17 +35,13 @@ div
setClass('table bordered'),
h::tr
(
h::th
(
width('1/5'),
$lang->install->key
),
h::th(setClass('text-right w-1/5'), $lang->install->key),
h::th($lang->install->value),
h::th()
),
h::tr
(
h::th($lang->install->timezone),
h::th(setClass('text-right'), $lang->install->timezone),
h::td
(
picker
@@ -58,7 +56,7 @@ div
),
h::tr
(
h::th($lang->install->defaultLang),
h::th(setClass('text-right'), $lang->install->defaultLang),
h::td
(
picker
@@ -74,7 +72,7 @@ div
$config->edition != 'open' ? h::tr
(
$config->inQuickon ? setClass('hidden') : null,
h::th($lang->install->dbDriver),
h::th(setClass('text-right'), $lang->install->dbDriver),
h::td
(
picker
@@ -95,7 +93,7 @@ div
h::tr
(
$config->inQuickon ? setClass('hidden') : null,
h::th($lang->install->dbHost),
h::th(setClass('text-right'), $lang->install->dbHost),
h::td
(
formGroup
@@ -112,7 +110,7 @@ div
h::tr
(
$config->inQuickon ? setClass('hidden') : null,
h::th($lang->install->dbPort),
h::th(setClass('text-right'), $lang->install->dbPort),
h::td
(
formGroup
@@ -128,7 +126,7 @@ div
h::tr
(
$config->inQuickon ? setClass('hidden') : null,
h::th($lang->install->dbEncoding),
h::th(setClass('text-right'), $lang->install->dbEncoding),
h::td
(
formGroup
@@ -145,7 +143,7 @@ div
h::tr
(
$config->inQuickon ? setClass('hidden') : null,
h::th($lang->install->dbUser),
h::th(setClass('text-right'), $lang->install->dbUser),
h::td
(
formGroup
@@ -162,7 +160,7 @@ div
h::tr
(
$config->inQuickon ? setClass('hidden') : null,
h::th($lang->install->dbPassword),
h::th(setClass('text-right'), $lang->install->dbPassword),
h::td
(
formGroup
@@ -178,7 +176,7 @@ div
),
h::tr
(
h::th($lang->install->dbName),
h::th(setClass('text-right'), $lang->install->dbName),
h::td
(
formGroup
@@ -194,7 +192,7 @@ div
),
h::tr
(
h::th($lang->install->dbPrefix),
h::th(setClass('text-right'), $lang->install->dbPrefix),
h::td
(
formGroup
module/install/ui/step3.html.php
+4 -3
View File
@@ -45,11 +45,12 @@ if(is_writable($configRoot) && @file_put_contents($myConfigFile, $configContent)
div
(
set::id('main'),
setID('main'),
setClass('flex justify-center'),
div
(
set::id('mainContent'),
setClass('px-1 mt-2'),
setID('mainContent'),
setClass('px-1 mt-2 w-full max-w-7xl'),
panel
(
set::title($lang->install->saveConfig),
module/install/ui/step4.html.php
+23 -12
View File
@@ -25,7 +25,11 @@ foreach($disabledFeatures as $feature)
if(is_array($feature) && empty($disabledScrumFeatures)) continue;
$trs[] = h::tr
(
h::td(is_array($feature) && !empty($disabledScrumFeatures) ? sprintf($this->lang->custom->scrum->common, implode($lang->comma, $disabledScrumFeatures)) : $this->lang->custom->features[$feature]),
h::td
(
setClass('text-left'),
is_array($feature) && !empty($disabledScrumFeatures) ? sprintf($lang->custom->scrum->common, implode($lang->comma, $disabledScrumFeatures)) : $lang->custom->features[$feature]
),
h::td
(
icon
@@ -51,7 +55,11 @@ foreach($config->custom->allFeatures as $feature)
$trs[] = h::tr
(
h::td(($feature == 'scrumDetail' && !empty($enabledScrumFeatures)) ? sprintf($this->lang->custom->scrum->common, implode($lang->comma, $enabledScrumFeatures)) : $this->lang->custom->features[$feature]),
h::td
(
setClass('text-left'),
($feature == 'scrumDetail' && !empty($enabledScrumFeatures)) ? sprintf($lang->custom->scrum->common, implode($lang->comma, $enabledScrumFeatures)) : $lang->custom->features[$feature]
),
h::td
(
icon
@@ -73,18 +81,21 @@ foreach($config->custom->allFeatures as $feature)
div
(
set::id('main'),
setID('main'),
setClass('flex justify-center'),
div
(
set::id('mainContent'),
setID('mainContent'),
setClass('px-1 mt-2 w-full max-w-7xl'),
formPanel
(
setClass('bg-canvas'),
setClass('bg-canvas m-auto pb-8'),
set::title($lang->install->selectMode),
set::titleClass('text-xl'),
set::actions(array()),
to::heading
(
setClass('justify-start gap-1'),
span
(
setClass('text-gray'),
@@ -93,12 +104,12 @@ div
setClass('text-warning px-1'),
'help'
),
$this->lang->upgrade->remarkDesc
$lang->upgrade->remarkDesc
)
),
h::table
(
setClass('table bordered'),
setClass('table bordered text-center'),
h::thead
(
h::tr
@@ -111,12 +122,12 @@ div
h::td
(
width('1/3'),
$this->lang->custom->modeList['light']
$lang->custom->modeList['light']
),
h::td
(
width('1/3'),
$this->lang->custom->modeList['ALM']
$lang->custom->modeList['ALM']
)
)
),
@@ -124,9 +135,9 @@ div
(
h::tr
(
h::td($lang->custom->usage),
h::td($this->lang->custom->modeIntroductionList['light']),
h::td($this->lang->custom->modeIntroductionList['ALM']),
h::td(setClass('text-left'), $lang->custom->usage),
h::td($lang->custom->modeIntroductionList['light']),
h::td($lang->custom->modeIntroductionList['ALM']),
),
$trs,
h::tr
module/install/ui/step5.html.php
+5 -2
View File
@@ -21,10 +21,12 @@ if(isset($error))
div
(
set::id('main'),
setID('main'),
setClass('flex justify-center'),
div
(
set::id('mainContent'),
setID('mainContent'),
setClass('px-1 mt-2 w-full max-w-7xl'),
isset($success) ? panel
(
set::title($lang->install->success),
@@ -37,6 +39,7 @@ div
(
setClass('bg-canvas m-auto mw-auto'),
set::title($lang->install->getPriv),
set::headingClass('w-96 m-auto'),
set::formClass('w-96 m-auto'),
set::submitBtnText(!empty($config->inQuickon) ? $lang->install->next : $lang->save),
formRow
module/install/ui/step6.html.php
+4 -2
View File
@@ -16,10 +16,12 @@ $joinZentao = ($installFileDeleted ? $lang->install->successLabel : $lang->insta
div
(
set::id('main'),
setID('main'),
setClass('flex justify-center'),
div
(
set::id('mainContent'),
setID('mainContent'),
setClass('px-1 mt-2 w-full max-w-7xl'),
panel
(
setClass('p-2'),