milestone: edit

3 files changed, 15 insertions, 44 deletions

diff --git a/templates/repo/issue/milestone_edit.tmpl b/templates/repo/issue/milestone_edit_old.tmpl
index dee36152e5..dee36152e5 100644
--- a/templates/repo/issue/milestone_edit.tmpl
+++ b/templates/repo/issue/milestone_edit_old.tmpl
diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl
index d3b4c49259..108afb0cb6 100644
--- a/templates/repo/issue/milestone_new.tmpl
+++ b/templates/repo/issue/milestone_new.tmpl
@@ -8,8 +8,13 @@
 		<div class="ui divider"></div>
 		<div class="sixteen wide column page grid">
 			<h2 class="ui dividing header">
+				{{if .PageIsEditMilestone}}
+			  {{.i18n.Tr "repo.milestones.edit"}}
+			  <div class="sub header">{{.i18n.Tr "repo.milestones.edit_subheader"}}</div>
+				{{else}}
 			  {{.i18n.Tr "repo.milestones.new"}}
 			  <div class="sub header">{{.i18n.Tr "repo.milestones.new_subheader"}}</div>
+			  {{end}}
 			</h2>
 			<form class="ui form grid" action="{{.Link}}" method="post">
         {{.CsrfTokenHtml}}
@@ -21,7 +26,7 @@
 				<div class="eleven wide column">
 					<div class="field {{if .Err_Title}}error{{end}}">
 						<label>{{.i18n.Tr "repo.milestones.title"}}</label>
-						<input name="title" placeholder="{{.i18n.Tr "repo.milestones.title"}}" value="{{.title}}" required>
+						<input name="title" placeholder="{{.i18n.Tr "repo.milestones.title"}}" value="{{.title}}" autofocus required>
 					</div>
 					<div class="field">
 						<label>{{.i18n.Tr "repo.milestones.desc"}}</label>
@@ -41,9 +46,18 @@
 					</div>
 				</div>
 				<div class="ui divider"></div>
+				{{if .PageIsEditMilestone}}
+				<button class="ui right green button">
+					{{.i18n.Tr "repo.milestones.modify"}}
+				</button>
+				<a class="ui right blue basic button" href="{{.RepoLink}}/milestones">
+					{{.i18n.Tr "repo.milestones.cancel"}}
+				</a>
+				{{else}}
 				<button class="ui right green button">
 					{{.i18n.Tr "repo.milestones.create"}}
 				</button>
+				{{end}}
 			</form>
 		</div>
 	</div>
diff --git a/templates/repo/issue/milestone_old.tmpl b/templates/repo/issue/milestone_old.tmpl
deleted file mode 100644
index 6a9e5f3790..0000000000
--- a/templates/repo/issue/milestone_old.tmpl
+++ /dev/null
@@ -1,43 +0,0 @@
-{{template "base/head_old" .}}
-{{template "base/navbar" .}}
-{{template "repo/nav" .}}
-{{template "repo/toolbar" .}}
-<div id="body" class="container">
-    <div id="issue">
-        <div class="col-md-3 filter-list">
-            <ul class="list-unstyled">
-                <li><a href="{{.RepoLink}}/milestones"{{if eq .State "open"}} class="active"{{end}}>Open Milestones <strong class="pull-right">{{.Repository.NumOpenMilestones}}</strong></a></li>
-                <li><a href="{{.RepoLink}}/milestones?state=closed"{{if eq .State "closed"}} class="active"{{end}}>Close Milestones <strong class="pull-right">{{.Repository.NumClosedMilestones}}</strong></a></li>
-            </ul>
-            <hr/>
-            <a href="{{.RepoLink}}/milestones/new" class="text-center">
-                <button class="btn btn-default btn-block">Create new milestone</button>
-            </a>
-        </div>
-        <div class="col-md-9">
-            <div class="milestones list-group">
-                {{range .Milestones}}
-                <div class="list-group-item milestone-item">
-                    <h4 class="title pull-left"><a href="{{$.RepoLink}}/issues?milestone={{.Index}}{{if .IsClosed}}&state=closed{{end}}">{{.Name}}</a></h4>
-                    <span class="issue-open label label-success">{{.NumOpenIssues}}</span>
-                    <span class="issue-close label label-warning">{{.NumClosedIssues}}</span>
-                    <p class="actions pull-right">
-                        <a href="{{$.RepoLink}}/milestones/{{.Index}}/edit">Edit</a>
-                        {{if .IsClosed}}
-                        <a href="{{$.RepoLink}}/milestones/{{.Index}}/open">Open</a>
-                        {{else}}
-                        <a href="{{$.RepoLink}}/milestones/{{.Index}}/close">Close</a>
-                        {{end}}
-                        <a class="text-danger" href="{{$.RepoLink}}/milestones/{{.Index}}/delete">Delete</a>
-                        <a href="{{$.RepoLink}}/issues?milestone={{.Index}}{{if .IsClosed}}&state=closed{{end}}">Issues</a>
-                    </p>
-                    <hr/>
-                    <p class="description">{{.RenderedContent | Str2html}}</p>
-                </div>
-                {{end}}
-            </div>
-        </div>
-    </div>
-</div>
-</div>
-{{template "base/footer_old" .}}