Web editor: improve delete file process

7 files changed, 80 insertions, 71 deletions

diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
index 4d37481a2f..ae09b25246 100644
--- a/templates/repo/branch_dropdown.tmpl
+++ b/templates/repo/branch_dropdown.tmpl
@@ -1,5 +1,5 @@
 <div class="fitted item choose reference">
-	<div id="branch-dropdown" class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}">
+	<div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}">
 			<div class="ui basic small button">
 			<span class="text">
 				<i class="octicon octicon-git-branch"></i>
@@ -31,12 +31,12 @@
 			</div>
 			<div id="branch-list" class="scrolling menu" {{if .IsViewTag}}style="display: none"{{end}}>
 				{{range .Branches}}
-					<div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/{{if $.PageIsCommits}}commits{{else}}src{{end}}/{{EscapePound .}}{{if $.TreeName}}/{{EscapePound $.TreeName}}{{end}}">{{.}}</div>
+					<div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/{{if $.PageIsCommits}}commits{{else}}src{{end}}/{{EscapePound .}}{{if $.TreePath}}/{{EscapePound $.TreePath}}{{end}}">{{.}}</div>
 				{{end}}
 			</div>
 			<div id="tag-list" class="scrolling menu" {{if not .IsViewTag}}style="display: none"{{end}}>
 				{{range .Tags}}
-					<div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/{{if $.PageIsCommits}}commits{{else}}src{{end}}/{{EscapePound .}}{{if $.TreeName}}/{{EscapePound $.TreeName}}{{end}}">{{.}}</div>
+					<div class="item {{if eq $.BranchName .}}selected{{end}}" data-url="{{$.RepoLink}}/{{if $.PageIsCommits}}commits{{else}}src{{end}}/{{EscapePound .}}{{if $.TreePath}}/{{EscapePound $.TreePath}}{{end}}">{{.}}</div>
 				{{end}}
 			</div>
 		</div>
diff --git a/templates/repo/diff_box.tmpl b/templates/repo/diff_box.tmpl
index 35af649b0f..8394598875 100644
--- a/templates/repo/diff_box.tmpl
+++ b/templates/repo/diff_box.tmpl
@@ -152,21 +152,21 @@
 
 	{{if .IsSplitStyle}}
 		<script>
-		(function() {
-			$('.add-code').each(function() {
-				var prev = $(this).prev();
-				if(prev.is('.del-code') && prev.children().eq(3).text().trim() === '') {
-					while(prev.prev().is('.del-code') && prev.prev().children().eq(3).text().trim() === '') {
-						prev = prev.prev();
+			(function() {
+				$('.add-code').each(function() {
+					var prev = $(this).prev();
+					if(prev.is('.del-code') && prev.children().eq(3).text().trim() === '') {
+						while(prev.prev().is('.del-code') && prev.prev().children().eq(3).text().trim() === '') {
+							prev = prev.prev();
+						}
+						prev.children().eq(3).html($(this).children().eq(3).html());
+						prev.children().eq(2).html($(this).children().eq(2).html());
+						prev.children().eq(3).addClass('add-code');
+						prev.children().eq(2).addClass('add-code');
+						$(this).remove();
 					}
-					prev.children().eq(3).html($(this).children().eq(3).html());
-					prev.children().eq(2).html($(this).children().eq(2).html());
-					prev.children().eq(3).addClass('add-code');
-					prev.children().eq(2).addClass('add-code');
-					$(this).remove();
-				}
-			});
-		}());
+				});
+			}());
 		</script>
 	{{end}}
 {{end}}
diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl
new file mode 100644
index 0000000000..74126ac018
--- /dev/null
+++ b/templates/repo/editor/commit_form.tmpl
@@ -0,0 +1,43 @@
+<div class="commit-form-wrapper">
+	<img width="48" height="48" class="ui image commit-avatar" src="{{.SignedUser.AvatarLink}}">
+	<div class="commit-form">
+		<h3>{{.i18n.Tr "repo.editor.commit_changes"}}</h3>
+		<div class="field">
+			<input name="commit_summary" placeholder="{{if .PageIsDelete}}{{.i18n.Tr "repo.editor.delete" .TreePath}}{{else if .IsNewFile}}{{.i18n.Tr "repo.editor.add_tmpl" .TreePath}}{{else}}{{.i18n.Tr "repo.editor.update" .TreePath}}{{end}}" value="{{.commit_summary}}" autofocus>
+		</div>
+		<div class="field">
+			<textarea name="commit_message" placeholder="{{.i18n.Tr "repo.editor.commit_message_desc"}}" rows="5">{{.commit_message}}</textarea>
+		</div>
+		<div class="quick-pull-choice js-quick-pull-choice">
+			<div class="field">
+		 		<div class="ui radio checkbox">
+					<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct" {{if eq .commit_choice "direct"}}checked{{end}}>
+					<label>
+						<i class="octicon octicon-git-commit" height="16" width="14"></i>
+						{{.i18n.Tr "repo.editor.commit_directly_to_this_branch" .BranchName | Safe}}
+					</label>
+				</div>
+			</div>
+			<div class="field">
+				<div class="ui radio checkbox">
+					<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
+					<label>
+						<i class="octicon octicon-git-pull-request" height="16" width="12"></i>
+						{{.i18n.Tr "repo.editor.create_new_branch" | Safe}}
+					</label>
+				</div>
+			</div>
+			<div class="quick-pull-branch-name {{if not (eq .commit_choice "commit-to-new-branch")}}hide{{end}}">
+				<div class="new-branch-name-input field {{if .Err_NewBranchName}}error{{end}}">
+					<i class="octicon octicon-git-branch" height="16" width="10"></i>
+					<input type="text" name="new_branch_name" value="{{.new_branch_name}}" class="input-contrast mr-2 js-quick-pull-new-branch-name" placeholder="{{.i18n.Tr "repo.editor.new_branch_name_desc"}}" {{if eq .commit_choice "commit-to-new-branch"}}required{{end}}>
+					<span class="text-muted js-quick-pull-normalization-info"></span>
+				</div>
+			</div>
+		</div>
+	</div>
+	<button type="submit" class="ui green button">
+		{{.i18n.Tr "repo.editor.commit_changes"}}
+	</button>
+	<a class="ui button red" href="{{EscapePound $.BranchLink}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.editor.cancel"}}</a>
+</div>
\ No newline at end of file
diff --git a/templates/repo/editor/delete.tmpl b/templates/repo/editor/delete.tmpl
new file mode 100644
index 0000000000..a874253079
--- /dev/null
+++ b/templates/repo/editor/delete.tmpl
@@ -0,0 +1,12 @@
+{{template "base/head" .}}
+<div class="repository file editor delete">
+	{{template "repo/header" .}}
+	<div class="ui container">
+		{{template "base/alert" .}}
+		<form class="ui form" method="post">
+			{{.CsrfTokenHtml}}
+			{{template "repo/editor/commit_form" .}}
+		</form>
+	</div>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl
index f6a2393110..377c00bf01 100644
--- a/templates/repo/editor/edit.tmpl
+++ b/templates/repo/editor/edit.tmpl
@@ -50,49 +50,7 @@
 					{{.i18n.Tr "repo.release.loading"}}
 				</div>
 			</div>
-			<div class="commit-form-wrapper">
-				<img width="48" height="48" class="ui image commit-avatar" src="{{.SignedUser.AvatarLink}}">
-				<div class="commit-form">
-					<h3>{{.i18n.Tr "repo.commit_changes"}}</h3>
-					<div class="field">
-						<input name="commit_summary" placeholder="{{if .IsNewFile}}{{.i18n.Tr "repo.add"}} '{{.TreePath}}/<filename>'{{else}}{{.i18n.Tr "repo.update"}} '{{.TreePath}}'{{end}}" value="{{.commit_summary}}">
-					</div>
-					<div class="field">
-						<textarea name="commit_message" placeholder="{{.i18n.Tr "repo.default_commit_message"}}" rows="5">{{.commit_message}}</textarea>
-					</div>
-					<div class="quick-pull-choice js-quick-pull-choice">
-						<div class="field">
-					 		<div class="ui radio checkbox">
-								<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct" {{if eq .commit_choice "direct"}}checked{{end}}>
-								<label>
-									<i class="octicon octicon-git-commit" height="16" width="14"></i>
-									{{.i18n.Tr "repo.editor.commit_directly_to_this_branch" .BranchName | Safe}}
-								</label>
-							</div>
-						</div>
-						<div class="field">
-							<div class="ui radio checkbox">
-								<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
-								<label>
-									<i class="octicon octicon-git-pull-request" height="16" width="12"></i>
-									{{.i18n.Tr "repo.editor.create_new_branch" | Safe}}
-								</label>
-							</div>
-						</div>
-						<div class="quick-pull-branch-name {{if not (eq .commit_choice "commit-to-new-branch")}}hide{{end}}">
-							<div class="new-branch-name-input{{if .Err_NewBranchName}} error{{end}}">
-								<i class="octicon octicon-git-branch" height="16" width="10"></i>
-								<input type="text" name="new_branch_name" value="{{.new_branch_name}}" class="form-control input-contrast mr-2 js-quick-pull-new-branch-name" placeholder="New branch name…">
-								<span class="text-muted js-quick-pull-normalization-info"></span>
-							</div>
-						</div>
-					</div>
-				</div>
-				<button type="submit" class="ui green button">
-					{{.i18n.Tr "repo.commit_changes"}}
-				</button>
-				<a class="ui button red" href="{{EscapePound $.BranchLink}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.cancel"}}</a>
-			</div>
+			{{template "repo/editor/commit_form" .}}
 		</form>
 	</div>
 </div>
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index bba5827744..5c6a536c2c 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -34,9 +34,9 @@
 			</div>
 			<div class="right fitted item">
 				<div id="file-buttons" class="ui tiny buttons">
-					{{if .NewFileLink}}
-						<a href="{{EscapePound .NewFileLink}}" class="ui button">
-							{{.i18n.Tr "repo.new_file"}}
+					{{if .CanAddFile}}
+						<a href="{{.RepoLink}}/_new/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}" class="ui button">
+							{{.i18n.Tr "repo.editor.new_file"}}
 						</a>
 					{{end}}
 					{{if .UploadFileLink}}
diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
index 3d85ad5492..5e1faf36ec 100644
--- a/templates/repo/view_file.tmpl
+++ b/templates/repo/view_file.tmpl
@@ -21,18 +21,14 @@
 					<a class="ui button" href="{{EscapePound .FileLink}}">{{.i18n.Tr "repo.file_raw"}}</a>
 				</div>
 				{{if .CanEditFile}}
-					<a href="{{.RepoLink}}/_edit/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}"><i class="poping up octicon octicon-pencil btn-octicon"  data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted"></i></a>
+					<a href="{{.RepoLink}}/_edit/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}"><i class="octicon octicon-pencil btn-octicon poping up"  data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted"></i></a>
 				{{else}}
-					<i class="octicon btn-octicon octicon-pencil poping up disabled" data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted"></i>
+					<i class="octicon octicon-pencil btn-octicon poping up disabled" data-content="{{.EditFileTooltip}}" data-position="bottom center" data-variation="tiny inverted"></i>
 				{{end}}
 				{{if .CanDeleteFile}}
-					<form id="delete-file-form" class="ui form inline-form" action="{{.RepoLink}}/_delete/{{EscapePound .BranchName}}/{{.TreePath}}" method="post">
-						{{.CsrfTokenHtml}}
-						<button onclick="submitDeleteForm()" class="octicon octicon-trashcan btn-octicon btn-octicon-danger poping up" type="button" data-content="{{.FileDeleteLinkTooltip}}" data-position="bottom center" data-variation="tiny inverted"></button>
-						<input type="hidden" id="delete-message" name="commit_message" value="">
-					</form>
+					<a href="{{.RepoLink}}/_delete/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}"><i class="octicon octicon-trashcan btn-octicon btn-octicon-danger poping up"  data-content="{{.DeleteFileTooltip}}" data-position="bottom center" data-variation="tiny inverted"></i></a>
 				{{else}}
-					<i class="octicon btn-octicon octicon-trashcan poping up disabled" data-content="{{.FileDeleteLinkTooltip}}" data-position="bottom center" data-variation="tiny inverted"></i>
+					<i class="octicon octicon-trashcan btn-octicon poping up disabled" data-content="{{.DeleteFileTooltip}}" data-position="bottom center" data-variation="tiny inverted"></i>
 				{{end}}
 			</div>
 		{{end}}