Merge pull request 'dev-small-fix' (#4) from dev-small-fix into develop

Reviewed-by: palytoxin <sxty32@126.com>

modules/templates/helper.go

@@ -303,6 +303,7 @@ func NewFuncMap() []template.FuncMap {
 		},
 		"tasks":      tasks,
 		"categories": categories,
+		"licenses":   licenses,
 	}}
 }
 
@@ -729,6 +730,10 @@ func categories() []string {
 	return []string{"computer_vision", "natural_language_processing", "speech_processing", "computer_vision_natural_language_processing"}
 }
 
+func licenses() []string {
+	return []string{"MIT", "GPL", "GFDL", "Apache 2.0", "CC BY 2.0", "CC BY 3.0", "CC BY-SA 3.0", "CC BY-SA 4.0", "CC0: Public Domain", "CDLA Permissive 1.0", "Open Database License", "Research or commercial", "Research and commercial", "Creative Commons CC BY 3.0", "Creative Commons CC BY 4.0", "Creative Commons Attribution 3.0", "Creative Commons Attribution 4.0", "GNU Free Documentation License", "Creative Commons Attribution (CC-BY) license", "Creative Commons Attribution 3.0 Unported License", "Creative Commons Attribution-NoDerivatives 4.0 International License", "Creative Commons CC BY 4.0"}
+}
+
 // Dataset tasks
 func tasks() []string {
 	return []string{"machine_translation", "question_answering_system", "information_retrieval", "knowledge_graph", "text_annotation", "text_categorization", "emotion_analysis", "language_modeling", "speech_recognition", "automatic_digest", "information_extraction", "description_generation", "image_classification", "face_recognition", "image_search", "target_detection", "image_description_generation", "vehicle_license_plate_recognition", "medical_image_analysis", "unmanned", "unmanned_security", "drone", "vr_ar", "2_d_vision", "2.5_d_vision", "3_d_reconstruction", "image_processing", "video_processing", "visual_input_system", "speech_coding", "speech_enhancement", "speech_recognition", "speech_synthesis"}

templates/datasets/form.tmpl

@@ -30,8 +30,7 @@
     <i class="dropdown icon"></i>
     <div class="default text" style="min-width:20vw">{{.i18n.Tr "dataset.category"}}</div>
     <div class="menu">
-      {{$categories := categories}}
-      {{range $category := $categories}}
+      {{range $category := categories}}
         <div class="item" data-value="{{$category}}">
           {{$.i18n.Tr (printf "dataset.category.%s" $category)}}
         </div>
@@ -47,8 +46,7 @@
     <div class="default text" style="min-width:20vw">{{.i18n.Tr "dataset.task"}}</div>
     <i class="dropdown icon"></i>
     <div class="menu">
-      {{$tasks := tasks}}
-      {{range $task := $tasks}}
+      {{range $task := tasks}}
         <div class="item" data-value="{{$task}}">
           {{$.i18n.Tr (printf "dataset.task.%s" $task)}}
         </div>
@@ -64,18 +62,11 @@
     <div class="default text" style="min-width:20vw">{{.i18n.Tr "dataset.license"}}</div>
     <i class="dropdown icon"></i>
     <div class="menu">
-      <div class="item" data-value="Creative Commons CC BY 4.0">
-        Creative Commons CC BY 4.0
-      </div>
-      <div class="item" data-value="GFDL and CC BY-SA 3.0">
-        GFDL and CC BY-SA 3.0
-      </div>
-      <div class="item" data-value="Apache 2.0">
-        Apache 2.0
-      </div>
-      <div class="item" data-value="CC BY 2.0">
-        CC BY 2.0
-      </div>
+      {{range $license := licenses}}
+        <div class="item" data-value="{{$license}}">
+          {{$license}}
+        </div>
+      {{end}}
     </div>
   </div>
 </div>

templates/datasets/show.tmpl

@@ -15,10 +15,10 @@
       <ul id="dataset-list">
           <li class="ui grid">
             <div class="ui four wide column meta">
-              {{if eq .dataset.Status 2 }}
-                <span class="ui yellow label">{{$.i18n.Tr "dataset.public"}}</span>
-              {{else}}
+              {{if .dataset.IsPrivate }}
                 <span class="ui green label">{{$.i18n.Tr "dataset.private"}}</span>
+              {{else}}
+                <span class="ui yellow label">{{$.i18n.Tr "dataset.public"}}</span>
               {{end}}
               <span class="tag text blue">
                 <a href=""><i class="tag icon"></i> {{$.i18n.Tr (printf "dataset.task.%s" .dataset.Task)}}</a>