Merge remote-tracking branch 'origin/V20221019' into brainkanban

options/locale/locale_en-US.ini

@@ -1058,6 +1058,7 @@ modify_image=Modify Image
 image_exist=Image name has been used, please use a new one.
 image_committing=Image is submitting, please try again later.
 image_commit_fail=Failed to submit image, please try again later.
+image_over_20g=Failed to submit image, the size of image can not be over 20GB.
 image_not_exist=Image does not exits.
 image_edit_fail=Failed to edit image, please try again later.
 image_delete_fail=Failed to delete image, please try again later.
@@ -1373,7 +1374,9 @@ fork_guest_user = Sign in to fork this repository.
 copy_link = Copy
 copy_link_success = Link has been copied
 copy_link_error = Use ⌘C or Ctrl-C to copy
+copy = Copy
 copied = Copied OK
+copied_error = Copied error
 unwatch = Unwatch
 watch = Watch
 unstar = Unstar

options/locale/locale_zh-CN.ini

@@ -1059,6 +1059,7 @@ modify_image=修改镜像
 image_exist=镜像Tag已被使用，请修改镜像Tag。
 image_committing=镜像正在提交中，请稍后再试。
 image_commit_fail=提交镜像失败，请稍后再试。
+image_over_20g=提交镜像失败，镜像大小不能超过20GB。
 image_not_exist=镜像不存在。
 image_edit_fail=编辑镜像失败，请稍后再试。
 image_delete_fail=删除镜像失败，请稍后再试。
@@ -1389,7 +1390,9 @@ fork_guest_user=登录并 派生 这个项目。
 copy_link=复制链接
 copy_link_success=已复制链接
 copy_link_error=请按下 ⌘-C 或 Ctrl-C 复制
+copy=复制
 copied=复制成功
+copied_error=复制失败
 unwatch=取消关注
 watch=关注
 unstar=取消点赞
@@ -2022,7 +2025,7 @@ settings.githooks=管理 Git 钩子
 settings.basic_settings=基本设置
 settings.mirror_settings=镜像设置
 settings.sync_mirror=同步
-settings.mirror_sync_in_progress=镜像同步正在进行中，请稍后后再试。
+settings.mirror_sync_in_progress=镜像同步正在进行中，请稍后再试。
 settings.email_notifications.enable=启用邮件通知
 settings.email_notifications.onmention=只在被提到时邮件通知
 settings.email_notifications.disable=停用邮件通知

routers/repo/cloudbrain.go

@@ -1147,6 +1147,8 @@ func CloudBrainCommitImage(ctx *context.Context, form auth.CommitImageCloudBrain
 
 		} else if models.IsErrorImageCommitting(err) {
 			ctx.JSON(200, models.BaseErrorMessage(ctx.Tr("repo.image_committing")))
+		} else if isOver20GError(err) {
+			ctx.JSON(200, models.BaseErrorMessage(ctx.Tr("repo.image_over_20g")))
 		} else {
 			ctx.JSON(200, models.BaseErrorMessage(ctx.Tr("repo.image_commit_fail")))
 		}
@@ -1156,6 +1158,10 @@ func CloudBrainCommitImage(ctx *context.Context, form auth.CommitImageCloudBrain
 	ctx.JSON(200, models.BaseOKMessage)
 }
 
+func isOver20GError(err error) bool {
+	return strings.Contains(err.Error(), "over max image size 20GB")
+}
+
 func checkTopics(Topics string) ([]string, string) {
 	var topics = make([]string, 0)
 	var topicsStr = strings.TrimSpace(Topics)

templates/admin/cloudbrain/list.tmpl

@@ -205,11 +205,12 @@
                                 <!-- 云脑侧名称 -->
                                 <div class="two wide column text center nowrap"
                                     style="overflow: hidden;text-overflow:ellipsis;width:10% !important;">
-                                    <span class="ui poping up clipboard" data-position="top center" id="clipboard-btn" style="cursor:pointer" 
+                                    <span class="ui poping up clipboard" data-position="top center" id="clipboard-btn-{{.JobName}}" style="cursor:pointer" 
                                         data-clipboard-text="{{.JobName}}"
-                                        data-success="{{$.i18n.Tr "repo.copy_link_success"}}" 
-                                        data-error="{{$.i18n.Tr "repo.copy_link_error"}}"
-                                        data-content="{{$.i18n.Tr "repo.copy_link"}}"
+                                        data-original="{{$.i18n.Tr "repo.copy"}}"
+                                        data-success="{{$.i18n.Tr "repo.copied"}}" 
+                                        data-error="{{$.i18n.Tr "repo.copied_error"}}"
+                                        data-content="{{$.i18n.Tr "repo.copy"}}"
                                         data-variation="inverted tiny"
                                     >
                                         <span class="fitted"  title="{{.JobName}}">{{.JobName}}</span>

templates/user/dashboard/cloudbrains.tmpl

@@ -15,11 +15,11 @@
         data-all-compute="{{.i18n.Tr "admin.cloudbrain.all_computing_resources"}}"
         data-all-status="{{.i18n.Tr "admin.cloudbrain.all_status"}}"></div>
     {{template "admin/cloudbrain/search_dashboard" .}}
-    <div class="ui container" style="width: 90%;">
+    <div class="ui container" style="width:90%;overflow-x:auto;overflow-y:hidden">
         {{template "base/alert" .}}
-        <div class="ui grid">
+        <div class="ui grid" style="min-width:1700px;">
             <div class="row">
-                <div class="ui sixteen wide column">
+                <div class="ui sixteen wide column" style="margin-bottom:15px;">
                     <!-- 任务展示 -->
                     <div class="dataset list">
                         <!-- 表头 -->
@@ -377,19 +377,18 @@
                         </div>
 
                         {{end}}
-                        {{end}}
-                        <div id="app" style="margin-top: 2rem;">
-                            <div class="center">
-                                <el-pagination background @current-change="handleCurrentChange" :current-page="page"
-                                    :page-sizes="[10]" :page-size="10" layout="total, sizes, prev, pager, next, jumper"
-                                    :total="{{.Page.Paginater.Total}}">
-                                </el-pagination>
-                            </div>
-                        </div>
+                        {{end}}                        
                     </div>
-
                 </div>
             </div>
+        </div>        
+    </div>
+    <div id="app" style="margin-top: 2rem;margin-bottom: 2rem;">
+        <div class="center">
+            <el-pagination background @current-change="handleCurrentChange" :current-page="page"
+                :page-sizes="[10]" :page-size="10" layout="total, sizes, prev, pager, next, jumper"
+                :total="{{.Page.Paginater.Total}}">
+            </el-pagination>
         </div>
     </div>
     <!-- 确认模态框 -->

web_src/vuepages/pages/resources/specification/index.vue

@@ -21,8 +21,8 @@
       </div>
     </div>
     <div class="table-container">
-      <div style="min-height:600px;">
-        <el-table border :data="tableData" style="width: 100%;min-width:1700px;" v-loading="loading" stripe>
+      <div style="min-height:600px;overflow-x:auto;">
+        <el-table border :data="tableData" style="width:100%;min-width:1700px;" v-loading="loading" stripe>
           <el-table-column prop="ID" label="ID" align="center" header-align="center" width="60"></el-table-column>
           <el-table-column prop="SpecStr" :label="$t('resourcesManagement.resourceSpecification')" align="left"
             header-align="center" min-width="160">