diff --git a/module/convert/css/convertjira.ui.css b/module/convert/css/convertjira.ui.css new file mode 100644 index 0000000000..0739d84207 --- /dev/null +++ b/module/convert/css/convertjira.ui.css @@ -0,0 +1 @@ +.border-hover:hover {border-color: var(--color-primary-500)} diff --git a/module/convert/lang/de.php b/module/convert/lang/de.php index d222d2d91d..54167b64ca 100644 --- a/module/convert/lang/de.php +++ b/module/convert/lang/de.php @@ -123,8 +123,8 @@ $lang->convert->jira->importFromFile = 'Import From File'; $lang->convert->jira->mapJira2Zentao = 'Map Jira To Zentao'; $lang->convert->jira->dbNameNotice = "Please enter the Jira database name."; $lang->convert->jira->importNotice = 'Notice: Importing data is risky! Make sure to complete the following steps in sequence before merging.'; -$lang->convert->jira->dbDesc = '

If your Jira uses MySQL database, please choose this way.

'; -$lang->convert->jira->fileDesc = '

Choose this method if your Jira uses a non-MySQL database.

'; +$lang->convert->jira->dbDesc = 'If your Jira uses MySQL database, please choose this way.'; +$lang->convert->jira->fileDesc = 'Choose this method if your Jira uses a non-MySQL database.'; $lang->convert->jira->jiraObject = 'Jira Issues'; $lang->convert->jira->zentaoObject = 'Zentao Object'; $lang->convert->jira->jiraLinkType = 'Jira Relates'; diff --git a/module/convert/lang/en.php b/module/convert/lang/en.php index a8153df5cc..02bfc78d94 100644 --- a/module/convert/lang/en.php +++ b/module/convert/lang/en.php @@ -123,8 +123,8 @@ $lang->convert->jira->importFromFile = 'Import From File'; $lang->convert->jira->mapJira2Zentao = 'Map Jira To Zentao'; $lang->convert->jira->dbNameNotice = "Please enter the Jira database name."; $lang->convert->jira->importNotice = 'Notice: Importing data is risky! Make sure to complete the following steps in sequence before merging.'; -$lang->convert->jira->dbDesc = '

If your Jira uses MySQL database, please choose this way.

'; -$lang->convert->jira->fileDesc = '

Choose this method if your Jira uses a non-MySQL database.

'; +$lang->convert->jira->dbDesc = 'If your Jira uses MySQL database, please choose this way.'; +$lang->convert->jira->fileDesc = 'Choose this method if your Jira uses a non-MySQL database.'; $lang->convert->jira->jiraObject = 'Jira Issues'; $lang->convert->jira->zentaoObject = 'Zentao Object'; $lang->convert->jira->jiraLinkType = 'Jira Relates'; diff --git a/module/convert/lang/fr.php b/module/convert/lang/fr.php index 0278498f81..4cdcedda7b 100644 --- a/module/convert/lang/fr.php +++ b/module/convert/lang/fr.php @@ -123,8 +123,8 @@ $lang->convert->jira->importFromFile = 'Import From File'; $lang->convert->jira->mapJira2Zentao = 'Map Jira To Zentao'; $lang->convert->jira->dbNameNotice = "Please enter the Jira database name."; $lang->convert->jira->importNotice = 'Notice: Importing data is risky! Make sure to complete the following steps in sequence before merging.'; -$lang->convert->jira->dbDesc = '

If your Jira uses MySQL database, please choose this way.

'; -$lang->convert->jira->fileDesc = '

Choose this method if your Jira uses a non-MySQL database.

'; +$lang->convert->jira->dbDesc = 'If your Jira uses MySQL database, please choose this way.'; +$lang->convert->jira->fileDesc = 'Choose this method if your Jira uses a non-MySQL database.'; $lang->convert->jira->jiraObject = 'Jira Issues'; $lang->convert->jira->zentaoObject = 'Zentao Object'; $lang->convert->jira->jiraLinkType = 'Jira Relates'; diff --git a/module/convert/lang/zh-cn.php b/module/convert/lang/zh-cn.php index 5f98d6acda..43d9f1bcb4 100644 --- a/module/convert/lang/zh-cn.php +++ b/module/convert/lang/zh-cn.php @@ -123,8 +123,8 @@ $lang->convert->jira->importFromFile = '从文件导入'; $lang->convert->jira->mapJira2Zentao = '设置Jira与禅道数据对应关系'; $lang->convert->jira->dbNameNotice = '请输入Jira数据库名字'; $lang->convert->jira->importNotice = '注意:导入数据有风险!请务必确保如下操作步骤依次完成,再进行合并。'; -$lang->convert->jira->dbDesc = '

如果您的Jira使用Mysql数据库, 请选择此方式

'; -$lang->convert->jira->fileDesc = '

如果您的Jira使用非Mysql数据库, 请选择此方式

'; +$lang->convert->jira->dbDesc = '如果您的Jira使用Mysql数据库, 请选择此方式'; +$lang->convert->jira->fileDesc = '如果您的Jira使用非Mysql数据库, 请选择此方式'; $lang->convert->jira->jiraObject = 'Jira Issues'; $lang->convert->jira->zentaoObject = '禅道对象'; $lang->convert->jira->jiraLinkType = 'Jira 关联关系'; diff --git a/module/convert/ui/convertjira.html.php b/module/convert/ui/convertjira.html.php new file mode 100644 index 0000000000..95064c745c --- /dev/null +++ b/module/convert/ui/convertjira.html.php @@ -0,0 +1,52 @@ + + * @package convert + * @link https://www.zentao.net + */ +namespace zin; + +div +( + setClass('bg-white'), + div + ( + setClass('flex justify-between panel-form text-center mx-auto size-sm p-8'), + div + ( + setClass('border border-hover rounded-md cursor-pointer open-url p-4 w-72 h-28'), + set(array('data-url' => createLink('convert', 'importNotice', 'type=db'))), + div + ( + setClass('text-xl font-bold mb-4'), + $lang->convert->jira->importFromDB + ), + div + ( + setClass('text-primary mb-4'), + $lang->convert->jira->dbDesc + ) + ), + div + ( + setClass('border border-hover rounded-md cursor-pointer open-url p-4 w-72 h-28'), + set(array('data-url' => createLink('convert', 'importNotice', 'type=file'))), + div + ( + setClass('text-xl font-bold mb-4'), + $lang->convert->jira->importFromFile + ), + div + ( + setClass('text-primary mb-4'), + $lang->convert->jira->fileDesc + ) + ) + ) +); + +render();