diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/help.tmpl | 11 | ||||
| -rw-r--r-- | templates/issue/list.tmpl | 4 | ||||
| -rw-r--r-- | templates/issue/view.tmpl | 35 |
3 files changed, 17 insertions, 33 deletions
diff --git a/templates/help.tmpl b/templates/help.tmpl deleted file mode 100644 index e835c2981e..0000000000 --- a/templates/help.tmpl +++ /dev/null @@ -1,11 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -<div id="body-nav"> - <div class="container"> - <h3>Help</h3> - </div> -</div> -<div id="body" class="container" data-page="user"> - {{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}} -</div> -{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/issue/list.tmpl b/templates/issue/list.tmpl index edf855932d..2853312394 100644 --- a/templates/issue/list.tmpl +++ b/templates/issue/list.tmpl @@ -15,7 +15,7 @@ </div> <div class="label-filter"> <h4>Label</h4> - <ul class="list-unstyled" id="label-list" data-ajax="/{url}"> + <ul class="list-unstyled" id="label-list" data-ajax="{{$.RepoLink}}/issues/labels/delete"> {{range .Labels}} <li class="label-item" id="label-{{.Id}}" data-id="{{.Id}}"><a href="#"> <span class="pull-right count">{{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}</span> @@ -60,7 +60,7 @@ {{template "base/alert" .}} <div class="filter-option"> <div class="btn-group"> - <a class="btn btn-default issue-open{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/issues?type={{.ViewType}}">{{..IssueStats.OpenCount}} Open</a> + <a class="btn btn-default issue-open{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/issues?type={{.ViewType}}">{{.IssueStats.OpenCount}} Open</a> <a class="btn btn-default issue-close{{if .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/issues?type={{.ViewType}}&state=closed">{{.IssueStats.ClosedCount}} Closed</a> </div> </div> diff --git a/templates/issue/view.tmpl b/templates/issue/view.tmpl index ea5777cb15..ba1fe16b79 100644 --- a/templates/issue/view.tmpl +++ b/templates/issue/view.tmpl @@ -118,7 +118,7 @@ </div> <div class="issue-bar col-md-2"> - <div class="labels" data-ajax="{url}"> + <div class="labels" data-ajax="{{.Issue.Index}}/label"> <div class="pull-right action"> <button class="btn btn-default btn-sm" data-toggle="dropdown"> <i class="fa fa-tags"></i> @@ -126,26 +126,24 @@ </button> <div class="dropdown-menu dropdown-menu-right no"> <ul class="list-unstyled"> - <li class="checked" data-id="1"> - <span class="check pull-left"><i class="fa fa-check"></i></span> - <span class="color" style="background-color: #f59e00"></span> - <span class="name">bug</span> - </li> - <li class="no-checked" data-id="2"> - <span class="color" style="background-color: #f59e00"></span> - <span class="name">bug</span> - </li> - <li class="no-checked" data-id="3"> - <span class="color" style="background-color: #f59e00"></span> - <span class="name">bug</span> + {{range .Labels}} + <li class="{{if not .IsChecked}}no-{{end}}checked" data-id="{{.Id}}"> + {{if .IsChecked}}<span class="check pull-left"><i class="fa fa-check"></i></span>{{end}} + <span class="color" style="background-color: {{.Color}}"></span> + <span class="name">{{.Name}}</span> </li> + {{end}} </ul> </div> </div> <h4>Labels</h4> - <p id="label-1" class="label-item label-white" style="background-color: #e75316"><strong>bug</strong></p> - <p id="label-2" class="label-item label-white" style="background-color: #e8f0ff"><strong>bug</strong></p> - <p>Not yet</p> + {{if .Issue.Labels}} + {{range .Issue.Labels}} + <p id="label-{{.Id}}" class="label-item label-white" style="background-color: {{.Color}}"><strong>{{.Name}}</strong></p> + {{end}} + {{else}} + <p>None yet</p> + {{end}} </div> <div class="milestone" data-milestone="{{.Milestone.Id}}" data-ajax="{{.Issue.Index}}/milestone"> <div class="pull-right action"> @@ -223,10 +221,7 @@ <h4>Assignee</h4> <p>{{if .Issue.Assignee}}<img src="{{.Issue.Assignee.AvatarLink}}"><strong>{{.Issue.Assignee.Name}}</strong>{{else}}No one assigned{{end}}</p> </div> - </div><!-- - <div class="col-md-3"> - label dashboard - </div>--> + </div> </div> </div> </div> |