From 7372042441804370ddcdf00c5ea29acedef99e1d Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 9 Aug 2015 22:45:38 +0800 Subject: list view: issue, label, milestone --- templates/repo/issue/alert.tmpl | 5 - templates/repo/issue/labels.tmpl | 102 ++++++++++----------- templates/repo/issue/list.tmpl | 122 ++++++++++++------------- templates/repo/issue/milestones.tmpl | 172 +++++++++++++++++------------------ templates/repo/issue/navbar.tmpl | 10 +- templates/repo/issue/view.tmpl | 2 +- 6 files changed, 195 insertions(+), 218 deletions(-) delete mode 100644 templates/repo/issue/alert.tmpl (limited to 'templates/repo/issue') diff --git a/templates/repo/issue/alert.tmpl b/templates/repo/issue/alert.tmpl deleted file mode 100644 index bdc32ce4fc..0000000000 --- a/templates/repo/issue/alert.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -{{if .Flash}} -
- {{template "base/alert" .}} -
-{{end}} \ No newline at end of file diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index 4fcaec0714..1ed7408e6a 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -1,77 +1,73 @@ {{template "base/head" .}}
{{template "repo/header" .}} -
+
{{template "repo/issue/navbar" .}} {{if .IsRepositoryAdmin}} -
+
+
{{.i18n.Tr "repo.issues.new_label"}}
+
+ {{end}} +
+
+ {{.CsrfTokenHtml}} -
-
-
- +
+
+
+
-
-
- -
+
+
-
+
{{template "repo/issue/label_precolors"}}
- +
+
{{.i18n.Tr "repo.milestones.cancel"}}
+ +
- {{end}}
- {{template "repo/issue/alert" .}} -
-
{{.i18n.Tr "repo.issues.label_count" .NumLabels}}
-
+ {{template "base/alert" .}} +
{{.i18n.Tr "repo.issues.label_count" .NumLabels}}
-
-
- {{range .Labels}} -
  • -
    {{.Name}}
    - {{if $.IsRepositoryAdmin}} - {{$.i18n.Tr "repo.issues.label_delete"}} - {{$.i18n.Tr "repo.issues.label_edit"}} - {{end}} - {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenIssues}} -
    • +
    + {{range .Labels}} +
  • +
    {{.Name}}
    + {{if $.IsRepositoryAdmin}} + {{$.i18n.Tr "repo.issues.label_delete"}} + {{$.i18n.Tr "repo.issues.label_edit"}} {{end}} -
    • + {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenIssues}} + + {{end}}
    {{if .IsRepositoryAdmin}} -
    -
    +
    +
    + {{.i18n.Tr "repo.issues.label_deletion"}}
    -
    - -
    -
    -

    {{.i18n.Tr "repo.issues.label_deletion_desc"}}

    -
    +

    {{.i18n.Tr "repo.issues.label_deletion_desc"}}

    -
    -
    - - {{.i18n.Tr "modal.no"}} -
    -
    - - {{.i18n.Tr "modal.yes"}} -
    +
    + + {{.i18n.Tr "modal.no"}} +
    +
    + + {{.i18n.Tr "modal.yes"}}
    @@ -84,14 +80,16 @@
    {{.CsrfTokenHtml}} -
    -
    - +
    +
    +
    + +
    -
    - +
    +
    -
    +
    {{template "repo/issue/label_precolors"}}
    diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 128b3c0ba6..fa3f660fa8 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -1,28 +1,26 @@ {{template "base/head" .}}
    {{template "repo/header" .}} -
    +
    {{template "repo/issue/navbar" .}} -
    +
    {{.i18n.Tr "repo.issues.new"}}
    -
    -
    - - - {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} - - - - {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} - -
    +
    + + + {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} + + + + {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} +
    -
    +
    {{.i18n.Tr "repo.issues.filter_label"}} @@ -34,7 +32,7 @@ {{end}}
    -
    +
    {{.i18n.Tr "repo.issues.filter_milestone"}} @@ -46,7 +44,7 @@ {{end}}
    - -
    +
    {{.i18n.Tr "repo.issues.filter_type"}} @@ -71,57 +69,55 @@
    -
    -
    - {{range .Issues}} - {{ $timeStr:= TimeSince .Created $.Lang }} -
  • -
    #{{.Index}}
    - {{.Name}} +
    + {{range .Issues}} + {{ $timeStr:= TimeSince .Created $.Lang }} +
  • +
    #{{.Index}}
    + {{.Name}} - {{range .Labels}} - {{.Name}} - {{end}} + {{range .Labels}} + {{.Name}} + {{end}} - {{if .NumComments}} - {{.NumComments}} - {{end}} + {{if .NumComments}} + {{.NumComments}} + {{end}} -

    - {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.Name|Str2html}} - {{if .Milestone}} - {{with .Milestone}} - - {{.Name}} - - {{end}} - {{end}} -

    -
    • - {{end}} - - {{with .Page}} - {{if gt .TotalPages 1}} -
    - +

    + {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.Name|Str2html}} + {{if .Milestone}} + {{with .Milestone}} + + {{.Name}} + + {{end}} + {{end}} +

    + + {{end}} + + {{with .Page}} + {{if gt .TotalPages 1}} +
    + - {{end}} - {{end}}
    + {{end}} + {{end}}
    diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index b9b159ea57..8bbc2c3666 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -1,125 +1,115 @@ {{template "base/head" .}}
    {{template "repo/header" .}} -
    +
    {{template "repo/issue/navbar" .}} {{if .IsRepositoryAdmin}} -
    +
    {{.i18n.Tr "repo.milestones.new"}}
    {{end}}
    - {{template "repo/issue/alert" .}} -
    -
    - - - {{.i18n.Tr "repo.milestones.open_tab" .OpenCount}} - - - - {{.i18n.Tr "repo.milestones.close_tab" .ClosedCount}} - -
    + {{template "base/alert" .}} +
    + + + {{.i18n.Tr "repo.milestones.open_tab" .OpenCount}} + + + + {{.i18n.Tr "repo.milestones.close_tab" .ClosedCount}} +
    -
    -
    - {{range .Milestones}} -
  • - {{.Name}} -
    -
    -
    -
    -
    -
    - {{ $closedDate:= TimeSince .ClosedDate $.Lang }} - {{if .IsClosed}} - {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} - {{else}} - - {{if .DeadlineString}} - {{.DeadlineString}} - {{else}} - {{$.i18n.Tr "repo.milestones.no_due_date"}} - {{end}} - {{end}} - - {{$.i18n.Tr "repo.issues.open_tab" .NumOpenIssues}} - {{$.i18n.Tr "repo.issues.close_tab" .NumClosedIssues}} - -
    - {{if $.IsRepositoryAdmin}} -
    - {{$.i18n.Tr "repo.issues.label_edit"}} - {{if .IsClosed}} - {{$.i18n.Tr "repo.milestones.open"}} +
    + {{range .Milestones}} +
  • + {{.Name}} +
    +
    +
    +
    +
    +
    + {{ $closedDate:= TimeSince .ClosedDate $.Lang }} + {{if .IsClosed}} + {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} + {{else}} + + {{if .DeadlineString}} + {{.DeadlineString}} {{else}} - {{$.i18n.Tr "repo.milestones.close"}} + {{$.i18n.Tr "repo.milestones.no_due_date"}} {{end}} - {{$.i18n.Tr "repo.issues.label_delete"}} -
    - {{if .Content}} -
    - {{.RenderedContent|Str2html}} -
    {{end}} + + {{$.i18n.Tr "repo.issues.open_tab" .NumOpenIssues}} + {{$.i18n.Tr "repo.issues.close_tab" .NumClosedIssues}} + +
    • + {{if $.IsRepositoryAdmin}} +
    + {{$.i18n.Tr "repo.issues.label_edit"}} + {{if .IsClosed}} + {{$.i18n.Tr "repo.milestones.open"}} + {{else}} + {{$.i18n.Tr "repo.milestones.close"}} {{end}} - - {{end}} - - {{with .Page}} - {{if gt .TotalPages 1}} -
    - + {{$.i18n.Tr "repo.issues.label_delete"}} +
    + {{if .Content}} +
    + {{.RenderedContent|Str2html}}
    {{end}} {{end}} + + {{end}} + + {{with .Page}} + {{if gt .TotalPages 1}} +
    +
    + {{end}} + {{end}}
    {{if .IsRepositoryAdmin}} -
    -
    +
    +
    + {{.i18n.Tr "repo.milestones.deletion"}}
    -
    - -
    -
    -

    {{.i18n.Tr "repo.milestones.deletion_desc"}}

    -
    +

    {{.i18n.Tr "repo.milestones.deletion_desc"}}

    -
    -
    - - {{.i18n.Tr "modal.no"}} -
    -
    - - {{.i18n.Tr "modal.yes"}} -
    +
    + + {{.i18n.Tr "modal.no"}} +
    +
    + + {{.i18n.Tr "modal.yes"}}
    diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index 509ee5f66e..4c11a8e75a 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,7 +1,5 @@ -
    -
    - {{.i18n.Tr "repo.issues"}} - {{.i18n.Tr "repo.labels"}} - {{.i18n.Tr "repo.milestones"}} -
    +
    + {{.i18n.Tr "repo.issues"}} + {{.i18n.Tr "repo.labels"}} + {{.i18n.Tr "repo.milestones"}}
    \ No newline at end of file diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl index 2889856f3a..6b1d48ff5d 100644 --- a/templates/repo/issue/view.tmpl +++ b/templates/repo/issue/view.tmpl @@ -253,7 +253,7 @@

    Milestone

    {{if .Milestone}}

     

    -

    {{.Milestone.Name}}

    +

    {{.Milestone.Name}}

    {{else}}

    No milestone

    {{end}} -- cgit v1.2.3