Merge branch 'master' of github.com:gogits/gogs

gogs.go

@@ -19,7 +19,7 @@ import (
 // Test that go1.2 tag above is included in builds. main.go refers to this definition.
 const go12tag = true
 
-const APP_VER = "0.1.9.0328 Alpha"
+const APP_VER = "0.1.9.0329 Alpha"
 
 func init() {
 	base.AppVer = APP_VER

routers/repo/issue.go

@@ -221,6 +221,7 @@ func UpdateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
 }
 
 func Comment(ctx *middleware.Context, params martini.Params) {
+	fmt.Println(ctx.Query("change_status"))
 	if !ctx.Repo.IsValid {
 		ctx.Handle(404, "issue.Comment(invalid repo):", nil)
 	}

templates/issue/view.tmpl

@@ -87,10 +87,8 @@
                             <div class="text-right">
                                 <div class="form-group">
                                     {{if .Issue.IsClosed}}
-                                    <input type="hidden" value="reopen" name="change_status"/>
+                                    <input type="submit" class="btn-default btn issue-open" id="issue-open-btn" data-origin="Re-Open" data-text="Re-Open & Comment" name="change_status" value="Reopen"/>{{else}}
-                                    <button class="btn-default btn issue-open" id="issue-open-btn" data-origin="Re-Open" data-text="Re-Open & Comment">Reopen</button>{{else}}
+                                    <input type="submit" class="btn-default btn issue-close" id="issue-close-btn" data-origin="Close" data-text="Close & Comment" name="change_status" value="Close"/>{{end}}&nbsp;&nbsp;
-                                    <input type="hidden" value="close" name="change_status"/>
-                                    <button class="btn-default btn issue-close" id="issue-close-btn" data-origin="Close" data-text="Close & Comment">Close</button>{{end}}&nbsp;&nbsp;
                                     <button class="btn-success btn" id="issue-reply-btn">Comment</button>
                                 </div>
                             </div>

templates/user/dashboard.tmpl

@@ -18,7 +18,7 @@
         {{range .Feeds}}
             <li>
                 <i class="icon fa fa-{{ActionIcon .OpType}}"></i>
-                <div class="info"><span class="meta">{{TimeSince .Created}}</span><br>{{ActionDesc . | str2html}}</div>
+                <div class="info"><span class="meta">{{TimeSince .Created}}</span><br>{{ActionDesc . $.SignedUser.AvatarLink  | str2html}}</div>
                 <span class="clearfix"></span>
             </li>
         {{else}}

templates/user/profile.tmpl

@@ -32,11 +32,10 @@
             {{if eq .TabName "activity"}}
             <div class="tab-pane active">
                 <ul class="list-unstyled activity-list">
-                {{$avatarLink := .Owner.AvatarLink}}
                 {{range .Feeds}}
                     <li>
                         <i class="icon fa fa-{{ActionIcon .OpType}}"></i>
-                        <div class="info"><span class="meta">{{TimeSince .Created}}</span><br>{{ActionDesc . $avatarLink | str2html}}</div>
+                        <div class="info"><span class="meta">{{TimeSince .Created}}</span><br>{{ActionDesc . $.Owner.AvatarLink | str2html}}</div>
                         <span class="clearfix"></span>
                     </li>
                 {{else}}