From cfdf5285d4d57cbeddf48c5f0f5d4c505d83269b Mon Sep 17 00:00:00 2001
From: colorfulberry <senluowanxiangt@gmail.com>
Date: Wed, 27 May 2020 09:11:05 +0800
Subject: [PATCH] feat: adjust the ui for openui

---
 custom/templates/datasets/dataset_list.tmpl | 23 ++++++++++---------
 custom/templates/datasets/index.tmpl        | 25 ++++++++++++++-------
 custom/templates/explore/navbar.tmpl        |  5 ++++-
 routers/dataset/dataset.go                  |  1 +
 4 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/custom/templates/datasets/dataset_list.tmpl b/custom/templates/datasets/dataset_list.tmpl
index 934ddd6ad..0ec78c147 100644
--- a/custom/templates/datasets/dataset_list.tmpl
+++ b/custom/templates/datasets/dataset_list.tmpl
@@ -1,14 +1,13 @@
-<div class="ui container">
-  <h2 class="ui left floated medium header">
-    {{.i18n.Tr "datasets"}}
-  </h2>
-  <div class="ui right floated secondary filter menu">
-    <!-- Sort -->
-    <div class="ui right dropdown type jump item">
-		<span class="text">
-			{{.i18n.Tr "repo.issues.filter_sort"}}
+<h2 class="ui left floated medium header">
+  {{.i18n.Tr "datasets"}}
+</h2>
+<div class="ui right floated secondary filter menu">
+  <!-- Sort -->
+  <div class="ui right dropdown type jump item">
+    <span class="text">
+      {{.i18n.Tr "repo.issues.filter_sort"}}
                 <i class="dropdown icon"></i>
-		</span>
+    </span>
     <div class="menu">
         <a class="{{if eq .SortType "newest"}}active{{end}} item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a>
         <a class="{{if eq .SortType "oldest"}}active{{end}} item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a>
@@ -24,7 +23,9 @@
   </div>
 </div>
 
-<div class="ui container dataset list">
+<div class="ui clearing divider"></div>
+
+<div class="ui dataset list">
   <div class="ui sixteen wide mobile ten wide tablet ten wide computer colum">
     {{range .datasets}}
       <div class="item">
diff --git a/custom/templates/datasets/index.tmpl b/custom/templates/datasets/index.tmpl
index cefe2fc02..6064cf973 100644
--- a/custom/templates/datasets/index.tmpl
+++ b/custom/templates/datasets/index.tmpl
@@ -1,9 +1,18 @@
 {{template "base/head" .}}
-  <div class="explore repositories">
-    {{template "datasets/dataset_search" .}}
-    <div class="ui list">
-      {{template "datasets/dataset_list" .}}
-      {{template "base/paginate" .}}
-    </div>
-  </div>
-{{template "base/footer" .}}
\ No newline at end of file
+<div class="explore datasets">
+	{{template "explore/repo_search" .}}
+	<div class="ui container">
+		<div class="ui grid">
+			{{template "explore/navbar" .}}
+
+			<div class="ui sixteen mobile ten wide tablet computer column">
+				{{template "datasets/dataset_list" .}}
+				{{template "base/paginate" .}}
+			</div>
+			<div class="ui sixteen mobile six tablet four wide computer column">
+				{{template "explore/repo_right" .}}
+			</div>
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}
diff --git a/custom/templates/explore/navbar.tmpl b/custom/templates/explore/navbar.tmpl
index 6b3fde217..0f8404cd8 100644
--- a/custom/templates/explore/navbar.tmpl
+++ b/custom/templates/explore/navbar.tmpl
@@ -17,13 +17,16 @@
 	</div>
 </div>
 <!--平板、移动端-->
-			
+
 <div class="computer only two wide computer column">
 	<div class="ui grid">
 		<div class="sixteen wide column ui secondary sticky pointing tabular vertical menu">
 			<a class="{{if .PageIsExploreRepositories}}active{{end}} item" href="{{AppSubUrl}}/explore/repos">
 				{{svg "octicon-repo" 16}} {{.i18n.Tr "explore.repos"}}
 			</a>
+			<a class="{{if .PageIsDatasets}}active{{end}} item" href="{{AppSubUrl}}/datasets">
+				{{svg "octicon-file-submodule" 16}} {{.i18n.Tr "datasets"}}
+			</a>
 			<a class="{{if .PageIsExploreUsers}}active{{end}} item" href="{{AppSubUrl}}/explore/users">
 				{{svg "octicon-person" 16}} {{.i18n.Tr "explore.users"}}
 			</a>
diff --git a/routers/dataset/dataset.go b/routers/dataset/dataset.go
index 1145f94d9..69ab3a601 100644
--- a/routers/dataset/dataset.go
+++ b/routers/dataset/dataset.go
@@ -26,6 +26,7 @@ type ListOptions struct {
 }
 
 func MyList(ctx *context.Context) {
+	ctx.Data["PageIsDatasets"] = true
 
 	var (
 		datasets []*models.Dataset