From 8a6f0b77570930745788fa4db634e46b4a9e85ff Mon Sep 17 00:00:00 2001 From: zenggang Date: Wed, 9 Aug 2023 08:21:17 +0000 Subject: [PATCH] * Adjust devops in quickon mode --- module/space/ui/browse.html.php | 2 +- module/space/ui/createapplication.html.php | 241 +++++++++++---------- 2 files changed, 123 insertions(+), 120 deletions(-) diff --git a/module/space/ui/browse.html.php b/module/space/ui/browse.html.php index f4aea19c57..d9129fa3c2 100644 --- a/module/space/ui/browse.html.php +++ b/module/space/ui/browse.html.php @@ -27,7 +27,7 @@ featureBar toolBar ( - $canInstall ? item(set(array + $config->inQuickon && $canInstall ? item(set(array ( 'text' => $lang->store->cloudStore, 'icon' => 'program', diff --git a/module/space/ui/createapplication.html.php b/module/space/ui/createapplication.html.php index 2829def9ca..6f922d475c 100644 --- a/module/space/ui/createapplication.html.php +++ b/module/space/ui/createapplication.html.php @@ -26,135 +26,138 @@ $showVersion = getenv('ALLOW_SELECT_VERSION') && (strtolower(getenv('ALLOW_SELEC $dbTypeItems = array(); foreach($lang->instance->dbTypes as $type => $db) $dbTypeItems[] = array('text' => $db, 'value' => $type); -formPanel -( - setClass('storePanel'), - set::id('createStoreAppForm'), - set::title($lang->space->install), - $appID ? set::submitBtnText($lang->instance->install) : null, - $appID ? set::actions(array('submit', array('text' => $lang->instance->stop, 'data-type' => 'submit', 'data-dismiss' => 'modal'))) : null, - formRow +if($config->inQuickon) +{ + formPanel ( - setStyle('display', $appID ? 'block' : 'none'), - formGroup + setClass('storePanel'), + set::id('createStoreAppForm'), + set::title($lang->space->install), + $appID ? set::submitBtnText($lang->instance->install) : null, + $appID ? set::actions(array('submit', array('text' => $lang->instance->stop, 'data-type' => 'submit', 'data-dismiss' => 'modal'))) : null, + formRow ( - set::width('2/3'), - set::label($lang->instance->name), - set::name('customName'), - set::control('input'), - set::value($appID ? $apps[$appID] : ''), - set::required(true), - ) - ), - formRow - ( - setStyle('display', $appID ? 'none' : 'block'), - formGroup - ( - set::width('2/3'), - set::label($lang->app->common), - set::name('storeAppType'), - set::items($apps), - set::value($appID ? $appID : $defaultApp), - set::disabled(!!$appID), - set::required(true), - on::change('onChangeStoreAppType'), - ) - ), - formRow - ( - setStyle('display', $appID ? 'none' : 'block'), - formGroup - ( - set::label($lang->space->addType), - set::name('type'), - set::value('store'), - set::disabled(!!$appID), - set::control('radioListInline'), - set::items(array(array('text' => $lang->store->common, 'value' => 'store'), array('text' => $lang->space->handConfig, 'value' => 'external'))), - set::required(true), - on::change('onChangeType'), - ) - ), - $showVersion ? formGroup - ( - set::width('2/3'), - set::label($lang->instance->version), - set::name('version'), - set::required(true), - set::control('picker'), - set::items($versionList) - ) : formGroup - ( - set::width('2/3'), - set::label($lang->instance->version), - set::name('app_version'), - set::required(true), - set::readonly(true), - input - ( - set::type('hidden'), - set::name('version'), - ) - ), - formRow - ( - formGroup - ( - set::width('2/3'), - set::label($lang->instance->domain), - set::required(true), - inputGroup + setStyle('display', $appID ? 'block' : 'none'), + formGroup ( - input - ( - setClass('form-control'), - set::name('customDomain'), - set::value($thirdDomain), - ), - $this->cne->sysDomain(), - ), - ), - ), - formRow - ( - setClass('dbType'), - formGroup - ( - set::label($lang->instance->dbType), - set::control('radioListInline'), - set::name('dbType'), - set::items($dbTypeItems), - set::value('sharedDB'), - set::required(true), - on::change('onChangeDbType'), - h::a - ( - setClass('leading-8 ml-4'), - set::href('https://www.qucheng.com/book/Installation-manual/app-install-33.html'), - set::target('_blank'), - $lang->instance->howToSelectDB + set::width('2/3'), + set::label($lang->instance->name), + set::name('customName'), + set::control('input'), + set::value($appID ? $apps[$appID] : ''), + set::required(true), ) ), - - ), - formRow - ( - setClass('dbType dbService'), - formGroup + formRow + ( + setStyle('display', $appID ? 'none' : 'block'), + formGroup + ( + set::width('2/3'), + set::label($lang->app->common), + set::name('storeAppType'), + set::items($apps), + set::value($appID ? $appID : $defaultApp), + set::disabled(!!$appID), + set::required(true), + on::change('onChangeStoreAppType'), + ) + ), + formRow + ( + setStyle('display', $appID ? 'none' : 'block'), + formGroup + ( + set::label($lang->space->addType), + set::name('type'), + set::value('store'), + set::disabled(!!$appID), + set::control('radioListInline'), + set::items(array(array('text' => $lang->store->common, 'value' => 'store'), array('text' => $lang->space->handConfig, 'value' => 'external'))), + set::required(true), + on::change('onChangeType'), + ) + ), + $showVersion ? formGroup ( set::width('2/3'), - set::label($lang->space->instanceType), - set::name('dbService'), - set::items(array()), + set::label($lang->instance->version), + set::name('version'), set::required(true), + set::control('picker'), + set::items($versionList) + ) : formGroup + ( + set::width('2/3'), + set::label($lang->instance->version), + set::name('app_version'), + set::required(true), + set::readonly(true), + input + ( + set::type('hidden'), + set::name('version'), + ) ), - ), -); + formRow + ( + formGroup + ( + set::width('2/3'), + set::label($lang->instance->domain), + set::required(true), + inputGroup + ( + input + ( + setClass('form-control'), + set::name('customDomain'), + set::value($thirdDomain), + ), + $this->cne->sysDomain(), + ), + ), + ), + formRow + ( + setClass('dbType'), + formGroup + ( + set::label($lang->instance->dbType), + set::control('radioListInline'), + set::name('dbType'), + set::items($dbTypeItems), + set::value('sharedDB'), + set::required(true), + on::change('onChangeDbType'), + h::a + ( + setClass('leading-8 ml-4'), + set::href('https://www.qucheng.com/book/Installation-manual/app-install-33.html'), + set::target('_blank'), + $lang->instance->howToSelectDB + ) + ), + + ), + formRow + ( + setClass('dbType dbService'), + formGroup + ( + set::width('2/3'), + set::label($lang->space->instanceType), + set::name('dbService'), + set::items(array()), + set::required(true), + ), + ), + ); +} formPanel ( - setClass('externalPanel hidden'), + $config->inQuickon ? setClass('externalPanel hidden') : setClass('externalPanel'), set::id('createAppForm'), set::title($lang->space->install), set::url($this->createLink('gitlab', 'create')), @@ -167,7 +170,7 @@ formPanel set::required(true), on::change('onChangeAppType'), ), - formGroup + $config->inQuickon ? formGroup ( set::label($lang->space->addType), set::name('type'), @@ -176,7 +179,7 @@ formPanel set::items(array(array('text' => $lang->store->common, 'value' => 'store'), array('text' => $lang->space->handConfig, 'value' => 'external'))), set::required(true), on::change('onChangeType'), - ), + ) : null, formGroup ( set::width('2/3'),