Finish release

2 files changed, 38 insertions, 41 deletions

diff --git a/templates/release/list.tmpl b/templates/release/list.tmpl
index 9541265c94..dd37e9c1a2 100644
--- a/templates/release/list.tmpl
+++ b/templates/release/list.tmpl
@@ -10,50 +10,47 @@
             <!-- comment : if in tag page, show a.release and span.tag please -->
         </h4>
         <ul id="release-list" class="list-unstyled">
-            <li class="release-item release-tag clearfix" id="release-tag-{release_tag_id}">
+            {{range .Releases}}
+            <li class="release-item clearfix" id="release-{{.SHA1}}">
+                {{if .PublisherId}}
                 <div class="col-md-2 text-right">
-                    <a class="commit" href="{commit_link}"><i class="fa fa-code"></i>commit-sha</a>
+                    {{if .IsPrerelease}}<span class="btn btn-warning status pre-release">Pre-Release</span>{{else}}<span class="btn btn-success status stable">Stable</span>{{end}}
+                    <a class="tag" href="{{$.RepoLink}}/src/{{.TagName}}"><i class="fa fa-tag"></i>{{.TagName}}</a>
+                    <a class="commit" href="{{$.RepoLink}}/src/{{.SHA1}}"><i class="fa fa-code"></i>{{ShortSha .SHA1}}</a>
                 </div>
                 <div class="col-md-10">
-                    <h5 class="title"><a href="{release_single_link}">Release Tag</a><i class="fa fa-tag"></i></h5>
+                    <h4 class="title"><a href="{{$.RepoLink}}/src/{{.TagName}}">{{.Title}}</a></h4>
                     <p class="info">
-                        <span class="author"><img class="avatar" src="http://1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132" alt="" width="20">&nbsp;&nbsp;
-                        <a href="/user/fuxiaohei">fuxiaohei</a></span>
-                        <span class="time">1 week ago</span>
-                        <span class="ahead"><strong>0</strong> commits since this tag</span>
+                        <span class="author"><img class="avatar" src="{{.Publisher.AvatarLink}}" alt="" width="20">&nbsp;&nbsp;
+                        <a href="/user/{{.Publisher.Name}}">{{.Publisher.Name}}</a></span>
+                        {{if .Created}}<span class="time">{{TimeSince .Created}}</span>{{end}}
+                        <span class="ahead"><strong>{{.NumCommitsBehind}}</strong> commits since this release</span>
                     </p>
+                    <div class="markdown desc">
+                        {{str2html .Note}}
+                    </div>
                     <p class="download">
-                        <a class="download-link" href="{release_download_link}"><i class="fa fa-download"></i>zip</a>
-                        <a class="download-link" href="{release_download_link}"><i class="fa fa-download"></i>tar.gz</a>
+                        <a class="btn btn-default" href="{{$.RepoLink}}/archive/{{.TagName}}/{{$.Repository.Name}}.zip"><i class="fa fa-download"></i>Source Code (ZIP)</a>
+                        <!-- <a class="btn btn-default" href="{release_download_link}"><i class="fa fa-download"></i>Source Code (TAR.GZ)</a> -->
                     </p>
                     <span class="dot">&nbsp;</span>
                 </div>
-            </li>
-            <li class="release-item clearfix" id="release-{release_id}">
+                {{else}}
                 <div class="col-md-2 text-right">
-                    <span class="btn btn-success status stable">Stable</span>
-                    <a class="tag" href="{commit_link}"><i class="fa fa-tag"></i>release tag</a>
-                    <a class="commit" href="{commit_link}"><i class="fa fa-code"></i>commit-sha</a>
+                    <a class="commit" href="{{$.RepoLink}}/src/{{.SHA1}}"><i class="fa fa-code"></i>{{ShortSha .SHA1}}</a>
                 </div>
                 <div class="col-md-10">
-                    <h4 class="title"><a href="{release_single_link}">Release Title</a></h4>
-                    <p class="info">
-                        <span class="author"><img class="avatar" src="http://1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132" alt="" width="20">&nbsp;&nbsp;
-                        <a href="/user/fuxiaohei">fuxiaohei</a></span>
-                        <span class="time">1 week ago</span>
-                        <span class="ahead"><strong>0</strong> commits since this tag</span>
-                    </p>
-                    <div class="markdown desc">
-                        release descriptions, support markdown content
-                    </div>
+                    <h5 class="title"><a href="{{$.RepoLink}}/src/{{.TagName}}">{{.TagName}}</a><i class="fa fa-tag"></i></h5>
                     <p class="download">
-                        <a class="btn btn-default" href="{release_download_link}"><i class="fa fa-download"></i>Source Code (ZIP)</a>
-                        <a class="btn btn-default" href="{release_download_link}"><i class="fa fa-download"></i>Source Code (TAR.GZ)</a>
+                        <a class="download-link" href="{{$.RepoLink}}/archive/{{.TagName}}/{{$.Repository.Name}}.zip"><i class="fa fa-download"></i>zip</a>
+                        <!-- <a class="download-link" href="{release_download_link}"><i class="fa fa-download"></i>tar.gz</a> -->
                     </p>
                     <span class="dot">&nbsp;</span>
                 </div>
+                {{end}}
             </li>
-            <li class="release-item clearfix" id="release-{release_id}">
+            {{end}}
+            <!-- <li class="release-item clearfix" id="release-{release_id}">
                 <div class="col-md-2 text-right">
                     <span class="btn btn-warning status pre-release">Pre-Release</span>
                     <a class="tag" href="{commit_link}"><i class="fa fa-tag"></i>release tag</a>
@@ -76,11 +73,8 @@
                     </p>
                     <span class="dot">&nbsp;</span>
                 </div>
-            </li>
+            </li> -->
         </ul>
     </div>
-    {{range .Releases}}
-        {{.}}
-    {{end}}
 </div>
 {{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/release/new.tmpl b/templates/release/new.tmpl
index fe5aa179c9..439496ea62 100644
--- a/templates/release/new.tmpl
+++ b/templates/release/new.tmpl
@@ -5,30 +5,34 @@
 <div id="body" class="container">
     <div id="release">
         <h4 id="release-head">New Release</h4>
-        <form id="release-new-form" action="" class="form form-inline">
+        {{template "base/alert" .}}
+        <form id="release-new-form" action="{{.RepoLink}}/releases/new" method="post" class="form form-inline">
+            {{.CsrfTokenHtml}}
             <div class="form-group">
-                <input id="release-tag-name" type="text" class="form-control" placeholder="tag name"/>
+                <input id="tag-name" name="tag_name" type="text" class="form-control" placeholder="tag name" value="{{.tag_name}}" />
                 <span class="target-at">@</span>
                 <div class="btn-group" id="release-new-target-select">
                     <button type="button" class="btn btn-default"><i class="fa fa-code-fork fa-lg fa-m"></i>
                         <span class="target-text">Target : </span>
-                        <strong id="release-new-target-name"> master</strong>
+                        <strong id="release-new-target-name"> {{.Repository.DefaultBranch}}</strong>
                     </button>
                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                         <span class="caret"></span>
                     </button>
                     <div class="dropdown-menu clone-group-btn" id="release-new-target-branch-list">
                         <ul class="list-group">
+                            {{range .Branches}}
                             <li class="list-group-item">
-                                <a href="#" rel="master"><i class="fa fa-code-fork"></i>master</a>
+                                <a href="#" rel="{{.}}"><i class="fa fa-code-fork"></i>{{.}}</a>
                             </li>
+                            {{end}}
                         </ul>
                     </div>
                 </div>
-                <p class="help-block">Choose an existing tag without release notes</p>
+                <p class="help-block">Choose an existing tag, or create a new tag on publish</p>
             </div>
             <div class="form-group" style="display: block">
-                <input class="form-control input-lg" id="release-new-title" name="title" type="text" placeholder="release title"/>
+                <input class="form-control input-lg" id="release-new-title" name="title" type="text" placeholder="release title" value="{{.title}}" />
             </div>
             <div class="form-group col-md-8" style="display: block" id="release-new-content-div">
                 <div class="md-help pull-right">
@@ -41,7 +45,7 @@
                 <div class="tab-content">
                     <div class="tab-pane active" id="release-textarea">
                         <div class="form-group">
-                            <textarea class="form-control" name="content" id="release-new-content" rows="10" placeholder="Write some content" data-ajax-rel="release-preview" data-ajax-val="val" data-ajax-field="content"></textarea>
+                            <textarea class="form-control" name="content" id="release-new-content" rows="10" placeholder="Write some content" data-ajax-rel="release-preview" data-ajax-val="val" data-ajax-field="content">{{.content}}</textarea>
                         </div>
                     </div>
                     <div class="tab-pane release-preview-content" id="release-preview">loading...</div>
@@ -50,15 +54,14 @@
             <div class="text-right form-group col-md-8" style="display: block">
                 <hr/>
                 <label for="release-new-pre-release">
-                    <input id="release-new-pre-release" type="checkbox" name="is-pre-release" value="true"/>
+                    <input id="release-new-pre-release" type="checkbox" name="prerelease" {{if .prerelease}}checked{{end}}/>
                     <strong>This is a pre-release</strong>
                 </label>
                 <p class="help-block">We’ll point out that this release is identified as non-production ready.</p>
             </div>
             <div class="text-right form-group col-md-8" style="display: block">
-                <input type="hidden" value="id" name="repo-id">
                 <button class="btn-success btn">Publish release</button>
-                <input class="btn btn-default" type="submit" name="is-draft" value="Save Draft"/>
+                <!-- <input class="btn btn-default" type="submit" name="draft" value="Save Draft"/> -->
             </div>
         </form>
     </div>