diff options
| -rw-r--r-- | cmd/web.go | 1 | ||||
| -rw-r--r-- | routers/repo/issue.go | 9 | ||||
| -rw-r--r-- | templates/issue/milestone.tmpl | 4 | ||||
| -rw-r--r-- | templates/issue/milestone_edit.tmpl | 62 | ||||
| -rw-r--r-- | templates/issue/milestone_new.tmpl | 2 |
5 files changed, 75 insertions, 3 deletions
@@ -187,6 +187,7 @@ func runWeb(*cli.Context) { r.Post("/issues/:index/assignee", repo.UpdateAssignee) r.Get("/issues/milestones", repo.Milestones) r.Get("/issues/milestones/new", repo.NewMilestones) + r.Get("/issues/milestones/edit", repo.UpdateMilestones) r.Post("/comment/:action", repo.Comment) r.Get("/releases/new", repo.ReleasesNew) }, reqSignIn, middleware.RepoAssignment(true)) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 62189595..3ef6236a 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -498,3 +498,12 @@ func NewMilestones(ctx *middleware.Context) { ctx.HTML(200, "issue/milestone_new") } + +func UpdateMilestones(ctx *middleware.Context) { + ctx.Data["Title"] = "Update Milestones" + ctx.Data["IsRepoToolbarIssues"] = true + ctx.Data["IsRepoToolbarIssuesList"] = true + + ctx.HTML(200, "issue/milestone_edit") +} + diff --git a/templates/issue/milestone.tmpl b/templates/issue/milestone.tmpl index a688fb4c..0b69a75d 100644 --- a/templates/issue/milestone.tmpl +++ b/templates/issue/milestone.tmpl @@ -23,7 +23,7 @@ <span class="issue-open label label-success">12</span> <span class="issue-close label label-warning">2</span> <p class="actions pull-right"> - <a href="#">Edit</a> + <a href="{{.RepoLink}}/issues/milestones/edit">Edit</a> <a href="#">Open</a> <a href="#">Close</a> <a class="text-danger" href="#">Delete</a> @@ -37,7 +37,7 @@ <span class="issue-open label label-success">12</span> <span class="issue-close label label-warning">2</span> <p class="actions pull-right"> - <a href="#">Edit</a> + <a href="{{.RepoLink}}/issues/milestones/edit">Edit</a> <a href="#">Open</a> <a href="#">Close</a> <a class="text-danger" href="#">Delete</a> diff --git a/templates/issue/milestone_edit.tmpl b/templates/issue/milestone_edit.tmpl new file mode 100644 index 00000000..2db55ae9 --- /dev/null +++ b/templates/issue/milestone_edit.tmpl @@ -0,0 +1,62 @@ +{{template "base/head" .}} +{{template "base/navbar" .}} +{{template "repo/nav" .}} +{{template "repo/toolbar" .}} +<div id="body" class="container"> + <div id="issue"> + <form class="form" action="{{.RepoLink}}/issues/milestones/new" method="post" id="issue-create-form"> + {{.CsrfTokenHtml}} + {{template "base/alert" .}} + <div class="col-md-1"> + <img class="avatar" src="{{.SignedUser.AvatarLink}}" alt=""/> + </div> + <div class="col-md-8 panel panel-default"> + <div class="form-group panel-body"> + <input class="form-control input-lg" type="text" name="title" required="required" placeholder="Title" value="{{.title}}" /> + </div> + <div class="form-group panel-body"> + <div class="md-help pull-right"><!-- todo help link --> + Content with <a href="https://help.github.com/articles/markdown-basics">Markdown</a> + </div> + <ul class="nav nav-tabs" data-init="tabs"> + <li class="active issue-write"><a href="#issue-textarea" data-toggle="tab">Write</a></li> + <li class="issue-preview"><a href="#issue-preview" data-toggle="tab" data-ajax="/api/v1/markdown" data-ajax-name="issue-preview" data-ajax-context="{{.RepoLink}}" data-ajax-method="post" data-preview="#issue-preview">Preview</a></li> + </ul> + <div class="tab-content"> + <div class="tab-pane" id="issue-textarea"> + <div class="form-group"> + <textarea class="form-control" name="content" id="issue-content" rows="10" placeholder="Write some content" data-ajax-rel="issue-preview" data-ajax-val="val" data-ajax-field="text">{{.content}}</textarea> + </div> + </div> + <div class="tab-pane issue-preview-content" id="issue-preview">loading...</div> + </div> + </div> + <div class="text-right panel-body"> + <div class="form-group"> + <input type="hidden" value="id" name="repo-id"/> + <button class="btn-success btn">Create new issue</button> + </div> + </div> + </div> + <div class="col-md-3"> + <h4>Milestone Due Date</h4> + + <div class="form-group"> + <input name="due_date" type="text" class="form-control" id="milestone-due-date"> + </div> + </div> + </form> + </div> +</div> +<script src="/js/bootstrap-datepicker.js"></script> +<script> + $(function(){ + $('#milestone-due-date').datepicker({ + weekStart: 1, + todayBtn: "linked", + calendarWeeks: true, + todayHighlight: true + }); + }); +</script> +{{template "base/footer" .}} diff --git a/templates/issue/milestone_new.tmpl b/templates/issue/milestone_new.tmpl index 544ae6ea..2db55ae9 100644 --- a/templates/issue/milestone_new.tmpl +++ b/templates/issue/milestone_new.tmpl @@ -4,7 +4,7 @@ {{template "repo/toolbar" .}} <div id="body" class="container"> <div id="issue"> - <form class="form" action="{{.RepoLink}}/issues/new" method="post" id="issue-create-form"> + <form class="form" action="{{.RepoLink}}/issues/milestones/new" method="post" id="issue-create-form"> {{.CsrfTokenHtml}} {{template "base/alert" .}} <div class="col-md-1"> |