Merge pull request '修复#205数据集名字过长样式重叠问题，及调整宽度样式' (#483) from web into V20210927-patch

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/483

templates/repo/datasets/dataset_list.tmpl

@@ -2,62 +2,44 @@
   {{range .Attachments}}
   <div class="ui grid item" id="{{.UUID}}">
     <div class="row">
-      <div class="{{if $.Permission.CanWrite $.UnitTypeDatasets}}five{{else}}nine{{end}} wide column">
+      <div class="eight wide column">
+        <span class="ui right">{{.Size | FileSize}}</span>
         <a class="title" href="{{.DownloadURL}}?type={{$.Type}}">
-          <span class="fitted">{{svg "octicon-cloud-download" 16}}</span>  {{.Name}}
+          {{svg "octicon-cloud-download" 16}}  {{.Name}}
         </a>
       </div>
-      <div class="two wide column">
-        {{.Size | FileSize}}
-      </div>
-      <div class="two wide column">
-        <span class="ui text center" data-tooltip='{{$.i18n.Tr "dataset.download_count"}}' data-position="bottom right">{{svg "octicon-flame" 16}} {{(.DownloadCount | PrettyNumber)}}</span>
-      </div>
-
-      <div class="one wide column" style="{{if ne $.Type 0}}visibility: hidden;{{end}}">
-        <span class="ui text center clipboard"  data-clipboard-text="{{.DownloadURL}}" data-tooltip='{{$.i18n.Tr "dataset.copy_url"}}' data-clipboard-action="copy">{{svg "octicon-file" 16}}</span>
-      </div>
-
-      <div class="one wide column">
-        <span class="ui text center clipboard"  data-clipboard-text="{{.FileChunk.Md5}}" data-tooltip='{{$.i18n.Tr "dataset.copy_md5"}}' data-clipboard-action="copy">{{svg "octicon-file-binary" 16}}</span>
-      </div>
-
-      <div class="wide column one" style="{{if ne .DecompressState 1}}visibility: hidden;{{end}}">
-        <a class="ui text center" href="datasets/dirs/{{.UUID}}?type={{$.Type}}" data-tooltip='{{$.i18n.Tr "dataset.directory"}}'>{{svg "octicon-file-directory" 16}}</a>
-      </div>
-      {{if $.IsSigned}}
-        <div class="wide column one" style="{{if ne .DecompressState 1}}visibility: hidden;{{end}}">
-          <a class="ui text center" href="datasets/label/{{.UUID}}?type={{$.Type}}" data-tooltip='{{$.i18n.Tr "dataset.create_label_task"}}'><i class="fa fa-pencil-square-o" aria-hidden="true"></i></a>
+      <div class="eight wide column right aligned">
+        <div class="ui mini icon buttons" style="margin-right: 10px;">
+          <span class="ui basic button" data-tooltip='{{$.i18n.Tr "dataset.download_count"}}' data-position="bottom right">{{svg "octicon-flame" 16}} {{(.DownloadCount | PrettyNumber)}}</span>
+          <span class="ui button" data-clipboard-text="{{.DownloadURL}}" data-tooltip='{{$.i18n.Tr "dataset.copy_url"}}' data-clipboard-action="copy"{{if ne $.Type 0}} style="display:none;"{{end}}>{{svg "octicon-file" 16}}</span>
+          <span class="ui button" data-clipboard-text="{{.FileChunk.Md5}}" data-tooltip='{{$.i18n.Tr "dataset.copy_md5"}}' data-clipboard-action="copy">{{svg "octicon-file-binary" 16}}</span>
         </div>
-      {{end}}
-      {{if not .CanDel}}
-        <div class="two wide column">
-          <a class="ui button mini" disabled='true'>{{if .IsPrivate}} {{$.i18n.Tr "dataset.private"}} {{else}} {{$.i18n.Tr "dataset.public"}} {{end}}</a>
+        <div class="ui mini icon buttons" style="margin-right: 10px;">
+          <a class="ui basic{{if ne .DecompressState 1}} disabled{{else}} blue{{end}} button" href="datasets/dirs/{{.UUID}}?type={{$.Type}}" data-tooltip='{{$.i18n.Tr "dataset.directory"}}'>{{svg "octicon-file-directory" 16}}</a>
+          {{if $.IsSigned}}
+          <a class="ui blue basic{{if ne .DecompressState 1}} disabled{{else}} blue{{end}}{{end}} button" href="datasets/label/{{.UUID}}?type={{$.Type}}" data-tooltip='{{$.i18n.Tr "dataset.create_label_task"}}'>{{svg "octicon-pencil" 16}}</a>
+          {{end}}
         </div>
-      {{else}}
-        {{if $.Permission.CanWrite $.UnitTypeDatasets}}
-          {{if $.Repository.IsPrivate}}
-            <div class="two wide column">
-              <a class="ui button mini" disabled='true' data-tooltip='{{$.i18n.Tr "dataset.how_to_public"}}'>{{$.i18n.Tr "dataset.private"}}</a>
-            </div>
-          {{ else }}
-            <div class="two wide column">
-              <div class="ui buttons mini">
-                <a class="ui button mini {{if .IsPrivate}}positive active{{end}}" href="javascript:void(0)" data-dataset-status="true-{{.UUID}}" data-csrf="{{$.CsrfToken}}"  data-url="{{AppSubUrl}}/attachments/private" data-uuid={{.UUID}} data-private="true" data-is-private={{.IsPrivate}}>{{$.i18n.Tr "dataset.private"}}</a>
+        {{if not .CanDel}}
+          <a class="ui right small button" disabled='true'>{{if .IsPrivate}} {{$.i18n.Tr "dataset.private"}} {{else}} {{$.i18n.Tr "dataset.public"}} {{end}}</a>
+        {{else}}
+          {{if $.Permission.CanWrite $.UnitTypeDatasets}}
+            {{if $.Repository.IsPrivate}}
+              <a class="ui small button" disabled='true' data-tooltip='{{$.i18n.Tr "dataset.how_to_public"}}'>{{$.i18n.Tr "dataset.private"}}</a>
+            {{else}}
+              <div class="compact small ui buttons" style="margin-right: 10px;">
+                <a class="ui button{{if .IsPrivate}} positive active{{end}}" href="javascript:void(0)" data-dataset-status="true-{{.UUID}}" data-csrf="{{$.CsrfToken}}"  data-url="{{AppSubUrl}}/attachments/private" data-uuid={{.UUID}} data-private="true" data-is-private={{.IsPrivate}}>{{$.i18n.Tr "dataset.private"}}</a>
                 <div class="or"></div>
-                <a class="ui button mini {{if not .IsPrivate}}positive active{{end}}" href="javascript:void(0)" data-dataset-status="false-{{.UUID}}" data-csrf="{{$.CsrfToken}}" data-url="{{AppSubUrl}}/attachments/private" data-uuid={{.UUID}} data-private="false" data-is-private={{.IsPrivate}}>{{$.i18n.Tr "dataset.public"}}</a>
+                <a class="ui button{{if not .IsPrivate}} positive active{{end}}" href="javascript:void(0)" data-dataset-status="false-{{.UUID}}" data-csrf="{{$.CsrfToken}}" data-url="{{AppSubUrl}}/attachments/private" data-uuid={{.UUID}} data-private="false" data-is-private={{.IsPrivate}}>{{$.i18n.Tr "dataset.public"}}</a>
               </div>
-            </div>
+            {{end}}
+            <a class="ui right small red button" href="javascript:void(0)" data-uuid={{.UUID}} data-dataset-delete data-remove-url="{{AppSubUrl}}/attachments/delete" data-csrf="{{$.CsrfToken}}">{{$.i18n.Tr "dataset.delete"}}</a>          
+          {{else}}
+            <a class="ui small button" disabled='true'>{{if .IsPrivate}} {{$.i18n.Tr "dataset.private"}} {{else}} {{$.i18n.Tr "dataset.public"}} {{end}}</a>          
           {{end}}
-          <div class="two wide column right aligned">
-            <a class="ui red button mini" href="javascript:void(0)" data-uuid={{.UUID}} data-dataset-delete data-remove-url="{{AppSubUrl}}/attachments/delete" data-csrf="{{$.CsrfToken}}">{{$.i18n.Tr "dataset.delete"}}</a>
-          </div>
-        {{else}}
-          <div class="two wide column">
-            <a class="ui button mini" disabled='true'>{{if .IsPrivate}} {{$.i18n.Tr "dataset.private"}} {{else}} {{$.i18n.Tr "dataset.public"}} {{end}}</a>
-          </div>
         {{end}}
-      {{end}}
+      </div>
+
     </div>
   </div>
   {{end}}

templates/repo/datasets/index.tmpl

@@ -80,7 +80,7 @@
         <div class="ui sixteen wide column">
           <div class="ui two column stackable grid">
             <div class="column">
-              <h2>{{if eq .Type 0}}{{.i18n.Tr "repo.cloudbrain1"}}{{else}}{{.i18n.Tr "repo.cloudbrain2"}}{{end}}-{{.i18n.Tr "datasets"}}</h2>
+              <strong>{{if eq .Type 0}}{{.i18n.Tr "repo.cloudbrain1"}}{{else}}{{.i18n.Tr "repo.cloudbrain2"}}{{end}}-{{.i18n.Tr "datasets"}}</strong>
             </div>
             <div class="column right aligned" style="z-index:1">
               <div class="ui right dropdown type jump item">

web_src/js/components/MinioUploader.vue

@@ -1,17 +1,16 @@
 <template>
   <div class="dropzone-wrapper dataset-files">
-    <div class="ui pointing below red basic label">
-      <i class="icon info circle"></i>只有zip格式的数据集才能发起云脑任务 
-  </div>
     <div
       id="dataset"
       class="dropzone"
     />
     <p class="upload-info">
       {{ file_status_text }}
-      <span class="success">{{ status }}</span>
+      <strong class="success text red">{{ status }}</strong>
     </p>
-    <p>云脑1提供 <span class="text blue">CPU / GPU</span> 资源，云脑2提供 <span class="text blue">Ascend NPU</span> 资源；调试使用的数据集也需要上传到对应的环境。</p>
+    <p>说明：<br>
+      - 只有zip格式的数据集才能发起云脑任务；<br>
+      - 云脑1提供 <span class="text blue">CPU / GPU</span> 资源，云脑2提供 <span class="text blue">Ascend NPU</span> 资源；调试使用的数据集也需要上传到对应的环境。</p>
   </div>
 </template>