From d0a0239bacf02eb004634dfe1bb0a3f7dfe5adb6 Mon Sep 17 00:00:00 2001 From: Richard Mahn Date: Thu, 11 Aug 2016 05:48:08 -0700 Subject: Squashed commit of the following: commit 0afcb843d7ffd596991c4885cab768273a6eb42c Author: Richard Mahn Date: Sun Jul 31 17:13:29 2016 -0600 Removed Upload stats as the upload table is just a temporary table commit 7ecd73ff5535612d79d471409173ee7f1fcfa157 Author: Richard Mahn Date: Sun Jul 31 08:42:41 2016 -0600 Fix for CodeMirror mode commit c29b9ab531e2e7af0fb5db24dc17e51027dd1174 Author: Richard Mahn Date: Sun Jul 31 08:03:33 2016 -0600 Made tabbing in editor use spaces commit 23af384c53206a8a40e11e45bf49d7a149c4adcd Author: Richard Mahn Date: Sun Jul 31 07:56:46 2016 -0600 Fix for data-url commit cfb8a97591cb6fc0a92e49563b7b764c524db0e9 Merge: 7fc8a89 991ce42 Author: Richard Mahn Date: Sun Jul 31 07:42:53 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go public/js/gogs.js commit 7fc8a89cb495478225b02d613e647f99a1489634 Merge: fd3d86c c03d040 Author: Richard Mahn Date: Sun Jul 31 07:40:00 2016 -0600 Merge branch 'feature-create-and-edit-repo-file' of github.com:richmahn/gogs into feature-create-and-edit-repo-file commit fd3d86ca6bbc02cfda566a504ffd6b03db4f75ef Author: Richard Mahn Date: Sun Jul 31 07:39:44 2016 -0600 Code cleanup commit c03d0401c1049eeeccc32ab1f9c3303c130be5ee Author: Richard Mahn Date: Fri Jul 29 15:38:23 2016 -0600 Code cleanup commit 98e1206ccf9f9a4503c020e3a7830cf9f861dfae Author: Richard Mahn Date: Thu Jul 28 18:36:01 2016 -0600 Code cleanup and fixes commit c2895dc742f25f8412879c9fa15e18f27f42f194 Author: Richard Mahn Date: Thu Jul 28 18:24:04 2016 -0600 Fixes per Unknwon's requests commit 6aa7e46b21ad4c96e562daa2eac26a8fb408f8ef Merge: 889e9fa ad7ea88 Author: Richard Mahn Date: Thu Jul 28 17:13:43 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go modules/setting/setting.go commit 889e9faf1bd8559a4979c8f46005d488c1a234d4 Author: Richard Mahn Date: Fri Jul 22 14:09:18 2016 -0600 Fix in gogs.js commit 47603edf223f147b114be65f3bd27bc1e88827a5 Merge: bb57912 cf85e9e Author: Richard Mahn Date: Fri Jul 22 14:07:36 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go public/js/gogs.js commit bb5791255867a71c11a77b639db050ad09c597a4 Author: Richard Mahn Date: Fri Jul 22 14:02:18 2016 -0600 Update for using CodeMirror mode addon commit d10d128c51039be19e2af9c66c63db66a9f2ec6d Author: Richard Mahn Date: Tue Jul 19 16:12:57 2016 -0600 Update for Edit commit 34a34982025144e3225e389f7849eb6273c1d576 Merge: fa1b752 1c7dcdd Author: Richard Mahn Date: Tue Jul 19 11:52:02 2016 -0600 Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file Conflicts: modules/bindata/bindata.go commit fa1b752be29cd455c5184ddac2ffe80b3489763e Author: Richard Mahn Date: Fri Jul 15 18:35:42 2016 -0600 Feature for editing, creating, uploading and deleting files --- templates/base/alert.tmpl | 6 +-- templates/base/head.tmpl | 5 ++ templates/repo/branch_dropdown.tmpl | 51 ++++++++++++++++-- templates/repo/diff_box.tmpl | 8 +-- templates/repo/diff_preview.tmpl | 32 ++++++++++++ templates/repo/diff_preview_new.tmpl | 12 +++++ templates/repo/edit.tmpl | 97 +++++++++++++++++++++++++++++++++++ templates/repo/home.tmpl | 20 ++++++-- templates/repo/issue/comment_tab.tmpl | 5 +- templates/repo/upload.tmpl | 79 ++++++++++++++++++++++++++++ templates/repo/view_file.tmpl | 34 ++++++++++-- templates/repo/wiki/new.tmpl | 2 +- 12 files changed, 328 insertions(+), 23 deletions(-) create mode 100644 templates/repo/diff_preview.tmpl create mode 100644 templates/repo/diff_preview_new.tmpl create mode 100644 templates/repo/edit.tmpl create mode 100644 templates/repo/upload.tmpl (limited to 'templates') diff --git a/templates/base/alert.tmpl b/templates/base/alert.tmpl index 60b7b588..4f53db74 100644 --- a/templates/base/alert.tmpl +++ b/templates/base/alert.tmpl @@ -1,15 +1,15 @@ {{if .Flash.ErrorMsg}}
-

{{.Flash.ErrorMsg}}

+

{{.Flash.ErrorMsg | Safe}}

{{end}} {{if .Flash.SuccessMsg}}
-

{{.Flash.SuccessMsg}}

+

{{.Flash.SuccessMsg | Safe}}

{{end}} {{if .Flash.InfoMsg}}
-

{{.Flash.InfoMsg}}

+

{{.Flash.InfoMsg| Safe}}

{{end}} diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 68ea4789..0c19b19c 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -24,6 +24,11 @@ {{if .RequireSimpleMDE}} + + + {{end}} diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 5eb12324..91db79ba 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -1,6 +1,6 @@
-
-
+
+ +{{if .IsWriter}} + +{{end}} + diff --git a/templates/repo/diff_box.tmpl b/templates/repo/diff_box.tmpl index fefca9b6..a048ce60 100644 --- a/templates/repo/diff_box.tmpl +++ b/templates/repo/diff_box.tmpl @@ -90,8 +90,8 @@ {{if $.IsSplitStyle}} - {{range $j, $section := .Sections}} - {{range $k, $line := .Lines}} + {{range $j, $section := $file.Sections}} + {{range $k, $line := $section.Lines}} {{if eq .GetType 4}}
{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}} @@ -109,8 +109,8 @@ {{end}} {{end}} {{else}} - {{range $j, $section := .Sections}} - {{range $k, $line := .Lines}} + {{range $j, $section := $file.Sections}} + {{range $k, $line := $section.Lines}}
diff --git a/templates/repo/diff_preview.tmpl b/templates/repo/diff_preview.tmpl new file mode 100644 index 00000000..1c4787a3 --- /dev/null +++ b/templates/repo/diff_preview.tmpl @@ -0,0 +1,32 @@ +{{$highlightClass := .File.GetHighlightClass}} +
+
+
+ + + {{range $j, $section := .File.Sections}} + {{range $k, $line := $section.Lines}} + + {{if eq .GetType 4}} + + {{else}} + + + {{end}} + + + {{end}} + {{end}} + +
+ {{/* {{if gt $j 0}}{{end}} */}} + + {{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}} + + {{if $line.RightIdx}}{{$line.RightIdx}}{{end}} + + 
{{$section.GetComputedInlineDiffFor $line}}
+
+
+
+
diff --git a/templates/repo/diff_preview_new.tmpl b/templates/repo/diff_preview_new.tmpl new file mode 100644 index 00000000..34abfe18 --- /dev/null +++ b/templates/repo/diff_preview_new.tmpl @@ -0,0 +1,12 @@ +
+
+ + + + + + + + 
    {{.FileContent}}
+
+
diff --git a/templates/repo/edit.tmpl b/templates/repo/edit.tmpl new file mode 100644 index 00000000..ba75a988 --- /dev/null +++ b/templates/repo/edit.tmpl @@ -0,0 +1,97 @@ +{{template "base/head" .}} +
+ {{template "repo/header" .}} +
+ {{.branchName}} + {{template "base/alert" .}} +
+ {{.CsrfTokenHtml}} + +
+
+
+ {{.Repository.Name}} + {{ $n := len .TreeNames}} + {{ $l := Subtract $n 1}} + {{range $i, $v := .TreeNames}} +
/
+ {{if eq $i $l}} + + {{else}} + {{$v}} + {{end}} + {{end}} + + {{.i18n.Tr "repo.or"}} {{.i18n.Tr "repo.cancel_lower"}} + +
+
+
+
+
+ {{.i18n.Tr "repo.edit_file"}} + {{.i18n.Tr "repo.release.preview"}} + {{.i18n.Tr "repo.preview_changes"}} +
+
+ +
+
+ {{.i18n.Tr "repo.release.loading"}} +
+
+ {{.i18n.Tr "repo.release.loading"}} +
+
+
+ +
+

{{.i18n.Tr "repo.commit_changes"}}

+
+ '{{else}}{{.i18n.Tr "repo.update"}} '{{.TreeName}}'{{end}}" value="{{.CommitSummary}}"> +
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+
+ + + +
+
+
+
+ + {{.i18n.Tr "repo.cancel"}} +
+
+
+
+{{template "base/footer" .}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 03052263..be8a52d2 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -31,8 +31,20 @@ {{end}} - {{if eq $n 0}} -
+
+
+ {{if .NewFileLink}} + + {{.i18n.Tr "repo.new_file"}} + + {{end}} + {{if .UploadFileLink}} + + {{.i18n.Tr "repo.upload_file"}} + + {{end}} +
+ {{if eq $n 0}}
- - {{end}} + {{end}} + {{if .IsFile}} {{template "repo/view_file" .}} diff --git a/templates/repo/issue/comment_tab.tmpl b/templates/repo/issue/comment_tab.tmpl index 851c3b1f..6f9c9154 100644 --- a/templates/repo/issue/comment_tab.tmpl +++ b/templates/repo/issue/comment_tab.tmpl @@ -4,13 +4,14 @@ {{.i18n.Tr "repo.release.preview"}}
- +
{{.i18n.Tr "repo.release.loading"}}
{{if .IsAttachmentEnabled}} -
+
{{end}} diff --git a/templates/repo/upload.tmpl b/templates/repo/upload.tmpl new file mode 100644 index 00000000..9253b5cc --- /dev/null +++ b/templates/repo/upload.tmpl @@ -0,0 +1,79 @@ +{{template "base/head" .}} +
+ {{template "repo/header" .}} +
+ {{.branchName}} + {{template "base/alert" .}} +
+ {{.CsrfTokenHtml}} +
+
+
+ {{.Repository.Name}} + {{ $n := len .TreeNames}} + {{ $l := Subtract $n 1}} + {{range $i, $v := .TreeNames}} +
/
+ {{if eq $i $l}} + + {{else}} + {{$v}} + {{end}} + {{end}} + + {{.i18n.Tr "repo.or"}} {{.i18n.Tr "repo.cancel_lower"}} + +
+
+
+
+
+
+
+
+ +
+

{{.i18n.Tr "repo.commit_changes"}}

+
+ +
+
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+
+ + + +
+
+
+
+ + {{.i18n.Tr "repo.cancel"}} +
+
+
+
+{{template "base/footer" .}} diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 76175334..0321dbd0 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -12,20 +12,34 @@ {{.FileName}} {{FileSize .FileSize}} {{end}} {{if not .ReadmeInList}} -
-
+
+
{{if not .IsViewCommit}} {{.i18n.Tr "repo.file_permalink"}} {{end}} {{.i18n.Tr "repo.file_history"}} {{.i18n.Tr "repo.file_raw"}}
+ {{if .FileEditLink}} + + {{else}} + + {{end}} + {{if .FileDeleteLink}} +
+ {{.CsrfTokenHtml}} + + +
+ {{else}} + + {{end}}
{{end}}
-
- {{if .ReadmeExist}} +
+ {{if .IsMarkdown}} {{if .FileContent}}{{.FileContent | Str2html}}{{end}} {{else if not .IsFileText}}
@@ -34,7 +48,7 @@ {{else if .IsPDFFile}} {{else}} - {{.i18n.Tr "repo.file_view_raw"}} + {{.i18n.Tr "repo.file_view_raw"}} {{end}}
{{else if .FileSize}} @@ -54,3 +68,13 @@
+ + diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 0e96f58b..af87e9c4 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -18,7 +18,7 @@
- +
-- cgit v1.2.3