From 1e997b1583a581d426e8f3c4e1a49b78889dd2fb Mon Sep 17 00:00:00 2001
From: colorfulberry <senluowanxiangt@gmail.com>
Date: Wed, 3 Jun 2020 09:20:37 +0800
Subject: [PATCH] feat: adjust the page for the unpublic

---
 options/locale/locale_en-US.ini           |  4 ++
 options/locale/locale_zh-CN.ini           |  4 ++
 templates/repo/datasets/dataset_list.tmpl | 22 ++++-----
 templates/repo/datasets/index.tmpl        |  6 +--
 templates/repo/datasets/right_side.tmpl   | 82 ++++++++++++++++++-------------
 5 files changed, 71 insertions(+), 47 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 1c484b314..52dd0b476 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -625,6 +625,7 @@ email_notifications.submit = Set Email Preference
 
 [dataset]
 dataset = Dataset
+dataset_setting= Dataset Setting
 title = Name
 description = Description
 create_dataset = Create Dataset
@@ -694,6 +695,9 @@ category.speech_processing= speech processing
 category.computer_vision_natural_language_processing= computer vision and natural language processing
 attachment.delete= delete this version of dataset
 attachment.delete_desc= Are you sure you will delete this version of dataset, once deelted can not be recovery
+public= public
+private= private
+delete= deelte
 
 [repo]
 owner = Owner
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index e894c3f31..92c3117b4 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -625,6 +625,7 @@ email_notifications.submit=邮件通知设置
 
 [dataset]
 dataset=数据集
+dataset_setting=数据集设置
 title=名称
 description=描述
 create_dataset=创建数据集
@@ -694,6 +695,9 @@ category.speech_processing=语音处理
 category.computer_vision_natural_language_processing=计算机视觉、自然语言处理
 attachment.delete= 删除该版本的数据集
 attachment.delete_desc= 你确定要删除该版本的数据集么？一旦删除不能恢复。
+public=公有
+private=私有
+delete=删除
 
 [repo]
 owner=拥有者
diff --git a/templates/repo/datasets/dataset_list.tmpl b/templates/repo/datasets/dataset_list.tmpl
index d619a4880..7d492ddbf 100644
--- a/templates/repo/datasets/dataset_list.tmpl
+++ b/templates/repo/datasets/dataset_list.tmpl
@@ -2,7 +2,7 @@
   {{range .Attachments}}
   <div class="ui grid item" id="{{.UUID}}">
     <div class="row">
-      <div class="six wide column">
+      <div class="{{if $.Permission.CanWrite $.UnitTypeDatasets}}six{{else}}ten{{end}} wide column">
         <a class="title" href="{{.DownloadURL}}">
           <span class="fitted">{{svg "octicon-cloud-download" 16}}</span>  {{.Name}}
         </a>
@@ -18,18 +18,18 @@
         <span class="ui text center" data-tooltip='{{$.i18n.Tr "dataset.copy_url"}}' data-position="bottom right">{{svg "octicon-file" 16}}</span>
       </div>
 
-      <div class="three 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}}>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}}>public</a>
+      {{if $.Permission.CanWrite $.UnitTypeDatasets}}
+        <div class="three 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>
+            <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>
+          </div>
         </div>
-      </div>
 
-      {{if $.Permission.CanWrite $.UnitTypeDatasets}}
-      <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}}">删除</a>
-      </div>
+        <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>
       {{end}}
     </div>
   </div>
diff --git a/templates/repo/datasets/index.tmpl b/templates/repo/datasets/index.tmpl
index 344e093a9..11aa49c62 100644
--- a/templates/repo/datasets/index.tmpl
+++ b/templates/repo/datasets/index.tmpl
@@ -64,9 +64,9 @@
           <div class="dataset ui middle very relaxed page">
             <div class="column">
               {{if .Permission.CanWrite $.UnitTypeDatasets}}
-              <form class="ui form" action="{{.Link}}" method="post">
-                {{template "repo/datasets/dataset" .}}
-              </form>
+                <form class="ui form" action="{{.Link}}" method="post">
+                  {{template "repo/datasets/dataset" .}}
+                </form>
               {{end}}
             </div>
           </div>
diff --git a/templates/repo/datasets/right_side.tmpl b/templates/repo/datasets/right_side.tmpl
index adfaf4056..0ed751b5e 100644
--- a/templates/repo/datasets/right_side.tmpl
+++ b/templates/repo/datasets/right_side.tmpl
@@ -1,13 +1,14 @@
 <div class="ui segment metas">
   <div class="ui basic">
-		<span class="text branch-name">数据集设置</span>
+		<span class="text branch-name">{{.i18n.Tr "dataset.dataset_setting"}}</span>
 	</div>
   <div class="ui divider"></div>
   <div class="ui floating jump select-milestone dropdown">
+    {{if $.Permission.CanWrite $.UnitTypeDatasets}}
       <span class="text" id="menutext_1">
-				<strong>{{.i18n.Tr "dataset.category"}}</strong>
+        <strong>{{.i18n.Tr "dataset.category"}}</strong>
         {{svg "octicon-gear" 16}}
-			</span>
+      </span>
       <div class="filter menu">
         <input type="hidden" name="category" id="category" value="{{.dataset.Category}}">
         {{range $category := categories}}
@@ -19,6 +20,9 @@
           </a>
         {{end}}
       </div>
+    {{else}}
+      <span class="text"><strong>{{.i18n.Tr "dataset.category"}}</strong></span>
+    {{end}}
   </div>
   <div class="ui select-milestone list">
     {{if .dataset.Category}}
@@ -29,21 +33,27 @@
   </div>
   <div class="ui divider"></div>
   <div class="ui floating jump select-milestone dropdown">
-    <span class="text" id="menutext_1">
-      <strong>{{.i18n.Tr "dataset.task"}}</strong>
-      {{svg "octicon-gear" 16}}
-    </span>
-    <div class="filter menu">
-      <input type="hidden" name="task" id="task" value="{{.dataset.Task}}">
-      {{range $task := tasks}}
-        <a class="item" data-task-id="{{$task}}">
-          {{if eq $task $.dataset.Task}}
-            <span class="octicon-check">{{svg "octicon-check" 16}}</span>
-          {{end}}
-          {{$.i18n.Tr (printf "dataset.task.%s" $task)}}
-        </a>
-      {{end}}
-    </div>
+    {{if $.Permission.CanWrite $.UnitTypeDatasets}}
+      <span class="text" id="menutext_2">
+        <strong>{{.i18n.Tr "dataset.task"}}</strong>
+        {{svg "octicon-gear" 16}}
+      </span>
+      <div class="filter menu">
+        <input type="hidden" name="task" id="task" value="{{.dataset.Task}}">
+        {{range $task := tasks}}
+          <a class="item" data-task-id="{{$task}}">
+            {{if eq $task $.dataset.Task}}
+              <span class="octicon-check">{{svg "octicon-check" 16}}</span>
+            {{end}}
+            {{$.i18n.Tr (printf "dataset.task.%s" $task)}}
+          </a>
+        {{end}}
+      </div>
+    {{else}}
+      <span class="text">
+        <strong>{{.i18n.Tr "dataset.task"}}</strong>
+      </span>
+    {{end}}
   </div>
   <div class="ui select-milestone list">
     {{if .dataset.Task}}
@@ -54,21 +64,27 @@
   </div>
   <div class="ui divider"></div>
   <div class="ui floating jump select-milestone dropdown">
-    <span class="text" id="menutext_1">
-      <strong>{{.i18n.Tr "dataset.license"}}</strong>
-      {{svg "octicon-gear" 16}}
-    </span>
-    <div class="filter menu">
-      <input type="hidden" name="license" id="license" value="{{.dataset.License}}">
-      {{range $license := licenses}}
-        <a class="item" data-license-id="{{$license}}">
-          {{if eq $license $.dataset.License}}
-            <span class="octicon-check">{{svg "octicon-check" 16}}</span>
-          {{end}}
-          {{$license}}
-        </a>
-      {{end}}
-    </div>
+    {{if $.Permission.CanWrite $.UnitTypeDatasets}}
+      <span class="text" id="menutext_3">
+        <strong>{{.i18n.Tr "dataset.license"}}</strong>
+        {{svg "octicon-gear" 16}}
+      </span>
+      <div class="filter menu">
+        <input type="hidden" name="license" id="license" value="{{.dataset.License}}">
+        {{range $license := licenses}}
+          <a class="item" data-license-id="{{$license}}">
+            {{if eq $license $.dataset.License}}
+              <span class="octicon-check">{{svg "octicon-check" 16}}</span>
+            {{end}}
+            {{$license}}
+          </a>
+        {{end}}
+      </div>
+    {{else}}
+      <span class="text">
+        <strong>{{.i18n.Tr "dataset.license"}}</strong>
+      </span>
+    {{end}}
   </div>
   <div class="ui select-milestone list">
     {{if .dataset.License}}