Merge pull request '改变字体大小和中英文国际化' (#2736) from fix-2546 into V20220830

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2736
Reviewed-by: chenshihai <chenshh@pcl.ac.cn>

options/locale/locale_en-US.ini

@@ -3119,7 +3119,8 @@ wrong_specification=You cannot use this specification, please choose another ite
 
 
 job_name_rule = Please enter letters, numbers, _ and - up to 64 characters and cannot end with a dash (-).
-dataset_path_rule = The dataset location is stored in the environment variable <strong style="color:#010101">data_url</strong>, and the output path is stored in the environment variable <strong style="color:#010101">train_url</strong>.
+train_dataset_path_rule = The dataset location is stored in the environment variable <strong style="color:#010101">data_url</strong>, and the output path is stored in the environment variable <strong style="color:#010101">train_url</strong>.
+infer_dataset_path_rule = The dataset location is stored in the environment variable <strong style="color:#010101">data_url</strong>, and the output path is stored in the environment variable <strong style="color:#010101">train_url</strong>.
 view_sample = View sample
 inference_output_path_rule = The inference output path is stored in the environment variable result_url.
 model_file_path_rule=The model file location is stored in the environment variable ckpt_url

options/locale/locale_zh-CN.ini

@@ -3134,7 +3134,8 @@ card_type = 卡类型
 wrong_specification=您目前不能使用这个资源规格，请选择其他资源规格。
 
 job_name_rule = 请输入字母、数字、_和-，最长64个字符，且不能以中划线（-）结尾。
-dataset_path_rule = 数据集位置存储在环境变量<strong style="color:#010101">data_url</strong>中，输出路径存储在环境变量<strong style="color:#010101">train_url</strong>中。
+train_dataset_path_rule = 数据集位置存储在环境变量<strong style="color:#010101">data_url</strong>中，训练输出路径存储在环境变量<strong style="color:#010101">train_url</strong>中。
+infer_dataset_path_rule = 数据集位置存储在环境变量<strong style="color:#010101">data_url</strong>中，推理输出路径存储在环境变量<strong style="color:#010101">train_url</strong>中。
 view_sample = 查看样例
 inference_output_path_rule = 推理输出路径存储在环境变量result_url中。
 model_file_path_rule = 模型文件位置存储在环境变量ckpt_url中。

templates/custom/wait_count.tmpl

@@ -13,9 +13,9 @@
 	{{ end }}
 	<i
 		class="ri-error-warning-line"
-		style="margin-right: 0.5rem; font-size: 16px"
+		style="margin-right: 0.5rem; font-size: 14px"
 	></i>
-	<span id="gpu-nums"
+	<span id="gpu-nums" style="font-size: 12px"
 		>{{.i18n.Tr "repo.wait_count_start"}}
 		{{if .QueuesDetail}}
 		{{ $gpuQueue }}

templates/custom/wait_count_train.tmpl

@@ -14,9 +14,9 @@
 	{{ end }}
 	<i
 		class="ri-error-warning-line"
-		style="margin-right: 0.5rem; font-size: 16px"
+		style="margin-right: 0.5rem; font-size: 14px"
 	></i>
-	<span id="gpu-nums"
+	<span id="gpu-nums" style="font-size: 12px"
 		>{{.ctx.i18n.Tr "repo.wait_count_start"}}
 		{{if .type}}
 		{{ $gpuQueue }}

templates/repo/modelarts/inferencejob/new.tmpl

@@ -86,7 +86,7 @@
                     {{template "custom/wait_count_train" Dict "ctx" $}}
                     <div style="display: flex;align-items: center;margin-left: 155px;margin-top: 0.5rem;">
                         <i class="ri-error-warning-line" style="color: #f2711c;margin-right: 0.5rem;"></i>
-                        <span style="color: #888;font-size: 12px;">{{.i18n.Tr "cloudbrain.dataset_path_rule" | Safe}}</span>
+                        <span style="color: #888;font-size: 12px;">{{.i18n.Tr "cloudbrain.infer_dataset_path_rule" | Safe}}</span>
                     </div>
                 </div>
                 <div class="required min_title inline field">

templates/repo/modelarts/trainjob/new.tmpl

@@ -113,7 +113,7 @@
                     {{template "custom/wait_count_train" Dict "ctx" $}}
                     <div style="display: flex;align-items: center;margin-left: 155px;margin-top: 0.5rem;">
                         <i class="ri-error-warning-line" style="color: #f2711c;margin-right: 0.5rem;"></i>
-                        <span style="color: #888;font-size: 12px;">{{.i18n.Tr "cloudbrain.dataset_path_rule" | Safe}}</span>
+                        <span style="color: #888;font-size: 12px;">{{.i18n.Tr "cloudbrain.train_dataset_path_rule" | Safe}}</span>
                     </div>
                 </div>
                 <div class="required inline min_title field">

templates/repo/modelarts/trainjob/version_new.tmpl

@@ -73,6 +73,11 @@
                 <input type="hidden" id="ai_engine_name" name="engine_names" value="">
                 <input type="hidden" id="ai_flaver_name" name="flaver_names" value="">
                 <input type="hidden" id="display_job_name" name="display_job_name" value="{{.display_job_name}}">
+                {{template "custom/wait_count_train" Dict "ctx" $}}
+                <div style="display: flex;align-items: center;margin-left: 155px;margin-top: 0.5rem;">
+                    <i class="ri-error-warning-line" style="color: #f2711c;margin-right: 0.5rem;"></i>
+                    <span style="color: #888;font-size: 12px;">{{.i18n.Tr "cloudbrain.train_dataset_path_rule" | Safe}}</span>
+                </div>
                 <h4 class="unite title ui header ">{{.i18n.Tr "repo.modelarts.train_job.basic_info"}}:</h4>
                 <div class="required unite min_title inline field">
                     <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.job_name"}}</label>
@@ -152,26 +157,9 @@
                         </span>
                         <a  href="https://git.openi.org.cn/OpenIOSSG/MINIST_Example" target="_blank">{{.i18n.Tr "cloudbrain.view_sample"}}</a>
                 </div>
-                
-                <!-- <div class="required unite min_title inline field">
-                    <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.dataset"}}</label>
-                    <select class="ui dropdown width80" id="trainjob_datasets" name="attachment" placeholder="{{.i18n.Tr "cloudbrain.select_dataset"}}">
-                        {{if .dataset_name}}
-                            <option name="attachment" value="{{.uuid}}">{{.dataset_name}}</option>
-                        {{end}}
-                        {{range .attachments}}
-                            <option value="">{{$.i18n.Tr "cloudbrain.select_dataset"}}</option>
-                            {{if ne $.uuid .UUID}}
-                            <option name="attachment" value="{{.UUID}}">{{.Attachment.Name}}</option>
-                            {{end}}
-                        {{end}}
-                    </select>
-                    <span class="tooltips">{{.i18n.Tr "cloudbrain.dataset_path_rule"}}</span>
-                </div> -->
                 <div id="select-multi-dataset">
 
                 </div>
-                <span class="tooltips" style="margin-left: 11.5rem;margin-bottom: 1rem;">{{.i18n.Tr "cloudbrain.dataset_path_rule"}}</span>
                 <div class="inline unite min_title field">
                     <label style="font-weight: normal;">{{.i18n.Tr "repo.modelarts.train_job.run_parameter"}}</label>
                     <span id="add_run_para" style="margin-left: 0.5rem;cursor:pointer;color: rgba(3, 102, 214, 100);font-size: 14px;line-height: 26px;font-family: SourceHanSansSC-medium;"><i class="plus square outline icon"></i>{{.i18n.Tr "repo.modelarts.train_job.add_run_parameter"}}</span>