Add buttons on empty repository page

Author: lunny

routers/web/repo/view.go

@@ -826,7 +826,15 @@ func renderCode(ctx *context.Context) {
 	ctx.Data["PageIsViewCode"] = true
 
 	if ctx.Repo.Repository.IsEmpty {
+<<<<<<< HEAD:routers/web/repo/view.go
 		ctx.HTML(http.StatusOK, tplRepoEMPTY)
+=======
+		if ctx.Repo.CanWrite(models.UnitTypeCode) {
+			ctx.Data["CanAddFile"] = true
+			ctx.Data["CanUploadFile"] = setting.Repository.Upload.Enabled
+		}
+		ctx.HTML(200, tplRepoEMPTY)
+>>>>>>> 7d4422307 (Add buttons on empty repository page):routers/repo/view.go
 		return
 	}
 

templates/repo/empty.tmpl

@@ -15,27 +15,28 @@
 						{{.i18n.Tr "repo.quick_guide"}}
 					</h4>
 					<div class="ui attached guide table segment">
-						
 						<div class="item">
 							<h3>{{.i18n.Tr "repo.clone_this_repo"}} <small>{{.i18n.Tr "repo.clone_helper" "http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository" | Str2html}}</small></h3>
-							<div class="ui action small input">
-								<div class="right fitted item mr-0" id="file-buttons">
-									<div class="ui tiny primary buttons">
-										{{if .Repository.CanEnableEditor}}
-											{{if .CanAddFile}}
-												<a href="{{.RepoLink}}/_new/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}" class="ui button">
-													{{.i18n.Tr "repo.editor.new_file"}}
-												</a>
-											{{end}}
-											{{if .CanUploadFile}}
-												<a href="{{.RepoLink}}/_upload/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}" class="ui button">
-													{{.i18n.Tr "repo.editor.upload_file"}}
-												</a>
-											{{end}}
+							<div class="left fitted item mr-0 dib" id="file-buttons">
+								<div class="ui primary buttons">
+									{{if .Repository.CanEnableEditor}}
+										{{if .CanAddFile}}
+											<a href="{{.RepoLink}}/_new/{{EscapePound .BranchName}}/" class="ui basic clone button no-transition">
+												{{.i18n.Tr "repo.editor.new_file"}}
+											</a>
 										{{end}}
-									</div>
+										{{if .CanUploadFile}}
+											<a href="{{.RepoLink}}/_upload/{{EscapePound .BranchName}}/" class="ui basic clone button no-transition">
+												{{.i18n.Tr "repo.editor.upload_file"}}
+											</a>
+										{{end}}
+									{{end}}
+								</div>
+							</div>
+							<div class="fitted item dib">
+								<div class="ui action small input">
+									{{template "repo/clone_buttons" .}}
 								</div>
-								{{template "repo/clone_buttons" .}}
 							</div>
 						</div>