diff options
| author | 6543 <24977596+6543@users.noreply.github.com> | 2019-10-15 12:44:36 +0200 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-10-15 13:44:36 +0300 |
| commit | d7d348ea86bd8066aeb079ad121120095d5cba4d (patch) | |
| tree | 20ae4c56632dcf03889cbd3a86c27ada62ff46e5 | |
| parent | 1e9b33052553bb546ca526f04816579e2853c8da (diff) | |
| download | gitea-d7d348ea86bd8066aeb079ad121120095d5cba4d.tar.gz gitea-d7d348ea86bd8066aeb079ad121120095d5cba4d.zip | |
[UI] Pull Request Download diff Button (#8470)
* Add Diff Download to Compare List
* Add&Change Text for Diff Options
* move button to seperate template
* add drop down menue with options
* Update: Compare
update Gogs, BitBucket, RhodeCode and remove gitea issue link
Co-Authored-By: Lauris BH <lauris@nix.lv>
* remove last things from TESTing
| -rw-r--r-- | docs/content/doc/features/comparison.en-us.md | 1 | ||||
| -rw-r--r-- | options/locale/locale_en-US.ini | 5 | ||||
| -rw-r--r-- | templates/repo/diff/box.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/diff/options_dropdown.tmpl | 9 |
4 files changed, 16 insertions, 3 deletions
diff --git a/docs/content/doc/features/comparison.en-us.md b/docs/content/doc/features/comparison.en-us.md index 6bbbfba3b4..1d36d855c2 100644 --- a/docs/content/doc/features/comparison.en-us.md +++ b/docs/content/doc/features/comparison.en-us.md @@ -105,6 +105,7 @@ _Symbols used in table:_ | Revert specific commits or a merge request | [✘](https://github.com/go-gitea/gitea/issues/5158) | ✘ | ✓ | ✓ | ✓ | ✓ | ✘ | | Pull/Merge requests templates | ✓ | ✓ | ✓ | ✓ | ✓ | ✘ | ✘ | | Cherry-picking changes | [✘](https://github.com/go-gitea/gitea/issues/5158) | ✘ | ✘ | ✓ | ✓ | ✘ | ✘ | +| Download Patch | ✓ | ✘ | ✓ | ✓ | ✓ | [/](https://jira.atlassian.com/plugins/servlet/mobile#issue/BCLOUD-8323) | ✘ | #### 3rd-party integrations diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index b5a3d8c592..45b86dea9a 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1370,7 +1370,10 @@ diff.parent = parent diff.commit = commit diff.git-notes = Notes diff.data_not_available = Diff Content Not Available -diff.show_diff_stats = Show Diff Stats +diff.options_button = Diff Options +diff.show_diff_stats = Show Stats +diff.download_patch = Download Patch File +diff.download_diff = Download Diff File diff.show_split_view = Split View diff.show_unified_view = Unified View diff.whitespace_button = Whitespace diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index b5fde36a6f..0179af2a51 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -7,7 +7,7 @@ {{else}} <a class="ui tiny basic toggle button" href="?style={{if .IsSplitStyle}}unified{{else}}split{{end}}">{{ if .IsSplitStyle }}{{.i18n.Tr "repo.diff.show_unified_view"}}{{else}}{{.i18n.Tr "repo.diff.show_split_view"}}{{end}}</a> {{end}} - <a class="ui tiny basic toggle button" data-target="#diff-files">{{.i18n.Tr "repo.diff.show_diff_stats"}}</a> + {{template "repo/diff/options_dropdown" .}} {{if and .PageIsPullFiles $.SignedUserID (not .IsArchived)}} {{template "repo/diff/new_review" .}} {{end}} @@ -26,7 +26,7 @@ {{else}} <a class="ui tiny basic toggle button" href="?style={{if .IsSplitStyle}}unified{{else}}split{{end}}">{{ if .IsSplitStyle }}{{.i18n.Tr "repo.diff.show_unified_view"}}{{else}}{{.i18n.Tr "repo.diff.show_split_view"}}{{end}}</a> {{end}} - <a class="ui tiny basic toggle button" data-target="#diff-files">{{.i18n.Tr "repo.diff.show_diff_stats"}}</a> + {{template "repo/diff/options_dropdown" .}} {{if and .PageIsPullFiles $.SignedUserID (not .IsArchived)}} {{template "repo/diff/new_review" .}} {{end}} diff --git a/templates/repo/diff/options_dropdown.tmpl b/templates/repo/diff/options_dropdown.tmpl new file mode 100644 index 0000000000..9fca069f0a --- /dev/null +++ b/templates/repo/diff/options_dropdown.tmpl @@ -0,0 +1,9 @@ +<div class="ui dropdown tiny button"> + {{.i18n.Tr "repo.diff.options_button"}} + <i class="dropdown icon"></i> + <div class="menu"> + <a class="item tiny basic toggle button" data-target="#diff-files">{{.i18n.Tr "repo.diff.show_diff_stats"}}</a> + <a class="item" href="{{$.RepoLink}}/pulls/{{.Issue.Index}}.patch" download="{{.Issue.Index}}.patch">{{.i18n.Tr "repo.diff.download_patch"}}</a> + <a class="item" href="{{$.RepoLink}}/pulls/{{.Issue.Index}}.diff" download="{{.Issue.Index}}.diff">{{.i18n.Tr "repo.diff.download_diff"}}</a> + </div> +</div> |