Browse Source

feat: adjust the ui for openui

tags/vopendata0.1.2
colorfulberry 5 years ago
parent
commit
cfdf5285d4
4 changed files with 34 additions and 20 deletions
  1. +12
    -11
      custom/templates/datasets/dataset_list.tmpl
  2. +17
    -8
      custom/templates/datasets/index.tmpl
  3. +4
    -1
      custom/templates/explore/navbar.tmpl
  4. +1
    -0
      routers/dataset/dataset.go

+ 12
- 11
custom/templates/datasets/dataset_list.tmpl View File

@@ -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">


+ 17
- 8
custom/templates/datasets/index.tmpl View File

@@ -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" .}}
<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" .}}

+ 4
- 1
custom/templates/explore/navbar.tmpl View File

@@ -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>


+ 1
- 0
routers/dataset/dataset.go View File

@@ -26,6 +26,7 @@ type ListOptions struct {
}

func MyList(ctx *context.Context) {
ctx.Data["PageIsDatasets"] = true

var (
datasets []*models.Dataset


Loading…
Cancel
Save