Mirror fix on UI

diff --git a/routers/install.go b/routers/install.go
index e30c3cfd23ed40ef1e5fe1ffb770f4427622bf25..28c2d87f71f782ef9cfc27fa65c37856749cfc87 100644 (file)
--- a/routers/install.go
+++ b/routers/install.go
@@ -156,7 +156,7 @@ func Install(ctx *middleware.Context, form auth.InstallForm) {
        base.Cfg.SetValue("server", "DOMAIN", form.Domain)
        base.Cfg.SetValue("server", "ROOT_URL", form.AppUrl)
 
-       if len(form.Host) > 0 {
+       if len(strings.TrimSpace(form.SmtpHost)) > 0 {
                base.Cfg.SetValue("mailer", "ENABLED", "true")
                base.Cfg.SetValue("mailer", "HOST", form.SmtpHost)
                base.Cfg.SetValue("mailer", "USER", form.SmtpEmail)

diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index f2d8959a046055fe4c96d5e8473c198e1c027f01..6cad2c25d2ccac4840f0599689314a5056d45fc2 100644 (file)
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -164,7 +164,7 @@ func ViewIssue(ctx *middleware.Context, params martini.Params) {
        ctx.Data["Title"] = issue.Name
        ctx.Data["Issue"] = issue
        ctx.Data["Comments"] = comments
-       ctx.Data["IsIssueOwner"] = ctx.Repo.IsOwner || issue.PosterId == ctx.User.Id
+       ctx.Data["IsIssueOwner"] = ctx.Repo.IsOwner || (ctx.IsSigned && issue.PosterId == ctx.User.Id)
        ctx.Data["IsRepoToolbarIssues"] = true
        ctx.Data["IsRepoToolbarIssuesList"] = false
        ctx.HTML(200, "issue/view")

diff --git a/templates/issue/view.tmpl b/templates/issue/view.tmpl
index df8b660769349fc9dca6f06cc7779deffcb9bdbc..e619451cc10f605845f30a19fc918a280ce6e9af 100644 (file)
--- a/templates/issue/view.tmpl
+++ b/templates/issue/view.tmpl
@@ -14,7 +14,7 @@
                 <p class="info pull-left">
                     {{if .IsIssueOwner}}<a class="btn btn-default pull-right issue-edit" href="#" id="issue-edit-btn">Edit</a>
                     <a class="btn btn-danger pull-right issue-edit-cancel hidden" href="#">Cancel</a>
-                    <a class="btn btn-primary pull-right issue-edit-save hidden" href="#" data-ajax="/{{.RepositoryLink}}/issues/{{.Issue.Index}}" data-ajax-name="issue-edit-save" data-ajax-method="post">Save</a>{{end}}
+                    <a class="btn btn-primary pull-right issue-edit-save hidden" href="#" data-ajax="{{.RepoLink}}/issues/{{.Issue.Index}}" data-ajax-name="issue-edit-save" data-ajax-method="post">Save</a>{{end}}
                     <span class="status label label-{{if .Issue.IsClosed}}danger{{else}}success{{end}}">{{if .Issue.IsClosed}}Closed{{else}}Open{{end}}</span>
                     <a href="/user/{{.Issue.Poster.Name}}" class="author"><strong>{{.Issue.Poster.Name}}</strong></a> opened this issue
                     <span class="time">{{TimeSince .Issue.Created}}</span> · {{.Issue.NumComments}} comments

diff --git a/templates/repo/nav.tmpl b/templates/repo/nav.tmpl
index 02096c34c183dc030ddd9d77e7720e2b1c9e42b3..6156d5791e18d425cc86a9c3ab8f63cd86c69eb1 100644 (file)
--- a/templates/repo/nav.tmpl
+++ b/templates/repo/nav.tmpl
@@ -7,12 +7,6 @@
             </div>
             <div class="col-md-5 actions text-right clone-group-btn">
                 {{if not .IsBareRepo}}
-                <!--<div class="btn-group" id="repo-clone">
-                    <button type="button" class="btn btn-default"><i class="fa fa-download fa-lg fa-m"></i></button>
-                    <button type="button" class="btn btn-default dropdown-toggle" data-container="body" data-toggle="popover" data-placement="bottom" data-content="<label>SSH:</label><div class='input-group'><input type='text' class='form-control' value='{{.CloneLink.SSH}}'></div>" data-html="1">
-                        <span class="caret"></span>
-                    </button>
-                </div>-->
                 <div class="btn-group" id="repo-clone">
                     <button type="button" class="btn btn-default"><i class="fa fa-download fa-lg fa-m"></i></button>
                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -30,10 +24,10 @@
                             </span>
                         </div>
                         <p class="help-block text-center">Need help cloning? Visit <a href="#">Help</a>!</p>
-                        <hr/>
+                        <!-- <hr/>
                         <div class="clone-zip text-center">
                             <a class="btn btn-success btn-lg" href="#"><i class="fa fa-suitcase"></i>Download ZIP</a>
-                        </div>
+                        </div> -->
                     </div>
                 </div>
                 <div class="btn-group {{if .IsRepositoryWatching}}watching{{else}}no-watching{{end}}" id="repo-watching" data-watch="/{{.Owner.Name}}/{{.Repository.Name}}/action/watch" data-unwatch="/{{.Owner.Name}}/{{.Repository.Name}}/action/unwatch">
@@ -61,9 +55,9 @@
                     <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Star"><i class="fa fa-star"></i>&nbsp;{{.Repository.NumStars}}</button>
                 </div> -->
                 {{end}}
-                <div class="btn-group">
+                <!-- <div class="btn-group">
                     <a type="button" {{if not .IsRepositoryOwner}}href="/{{.Username}}/{{.Reponame}}/fork"{{end}} class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Fork"><i class="fa fa-code-fork fa-lg"></i>&nbsp;{{.Repository.NumForks}}</a>
-                </div>
+                </div> -->
             </div>
         </div>
     </div>