Skip to content

[Branch View] add download button #7604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jul 29, 2019
+32 −9
Merged

[Branch View] add download button #7604

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ab9f7b2
add download-button info message
6543 Jul 24, 2019
d6400c5
add overflow-visible css for table colum class
6543 Jul 24, 2019
f3bc7ae
right colum is always there
6543 Jul 24, 2019
8ca0f37
add download button for default branch
6543 Jul 24, 2019
bba91f0
add download button for all other branchs
6543 Jul 24, 2019
d05055d
resize table colum so two buttons fit in
6543 Jul 24, 2019
526184b
Merge branch 'master' into branch-view-add-download-button
6543 Jul 26, 2019
f98f677
code indent avter rebase
6543 Jul 26, 2019
2f4250b
show commit divergence corect
6543 Jul 26, 2019
b986b94
Merge branch 'master' into branch-view-add-download-button
6543 Jul 26, 2019
95bceca
changes because of merge master into ...
6543 Jul 26, 2019
f39a9a3
Merge remote-tracking branch 'main/master' into branch-view-add-downl…
6543 Jul 27, 2019
3db060c
optimize if statement for protected branches
6543 Jul 27, 2019
684b27a
dont downloat a deleted branch - fix error 404
6543 Jul 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
View file
Original file line number Diff line number Diff line change
@@ -1408,6 +1408,7 @@ branch.restore_success = Branch '%s' has been restored.
branch.restore_failed = Failed to restore branch '%s'.
branch.protected_deletion_failed = Branch '%s' is protected. It cannot be deleted.
branch.restore = Restore Branch '%s'
branch.download = Download Branch '%s'

topic.manage_topics = Manage Topics
topic.done = Done
1 change: 1 addition & 0 deletions public/css/index.css
View file
Original file line number Diff line number Diff line change
@@ -985,6 +985,7 @@ tbody.commit-list{vertical-align:baseline}
.ui.repository.list .item .ui.avatar.image{width:24px;height:24px}
.ui.repository.branches .info{font-size:12px;color:grey;display:flex;white-space:pre}
.ui.repository.branches .info .commit-message{max-width:72em;overflow:hidden;text-overflow:ellipsis}
.ui.repository.branches .overflow-visible{overflow:visible}
.ui.user.list .item{padding-bottom:25px}
.ui.user.list .item:not(:first-child){border-top:1px solid #eee;padding-top:25px}
.ui.user.list .item .ui.avatar.image{width:40px;height:40px}
3 changes: 3 additions & 0 deletions public/less/_explore.less
View file
Original file line number Diff line number Diff line change
@@ -73,6 +73,9 @@
text-overflow: ellipsis;
}
}
.overflow-visible {
overflow: visible;
}
}

.ui.user.list {
36 changes: 27 additions & 9 deletions templates/repo/branch/list.tmpl
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,15 @@
{{end}}
{{end}}
</td>
<td class="right aligned overflow-visible">
<div class="ui basic jump dropdown icon button poping up" data-content="{{$.i18n.Tr "repo.branch.download" ($.DefaultBranch|EscapePound)}}" data-variation="tiny inverted" data-position="top right">
<i class="download icon"></i>
<div class="menu">
<a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.DefaultBranch}}.zip"><i class="octicon octicon-file-zip"></i> ZIP</a>
<a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.DefaultBranch}}.tar.gz"><i class="octicon octicon-file-zip"></i> TAR.GZ</a>
</div>
</div>
</td>
</tr>
</tbody>
</table>
@@ -50,7 +59,7 @@
<p class="info"><i class="octicon octicon-git-commit"></i><a href="{{$.RepoLink}}/commit/{{.Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p>
{{end}}
</td>
<td class="two wide ui">
<td class="three wide ui">
{{if not .IsDeleted}}
<div class="commit-divergence">
<div class="bar-group">
@@ -82,15 +91,24 @@
{{end}}
{{end}}
</td>
{{if and $.IsWriter (not $.IsMirror)}}
<td class="one wide right aligned">
{{if and .IsDeleted (not .IsProtected)}}
<a class="ui basic jump button icon poping up undo-button" href data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID | urlquery}}&name={{.DeletedBranch.Name | urlquery}}" data-content="{{$.i18n.Tr "repo.branch.restore" (.Name | EscapePound)}}" data-variation="tiny inverted" data-position="top right"><i class="octicon octicon-reply text blue"></i></a>
{{else if (not .IsProtected)}}
<a class="ui basic jump button icon poping up delete-branch-button" href data-url="{{$.Link}}/delete?name={{.Name | urlquery}}" data-content="{{$.i18n.Tr "repo.branch.delete" (.Name | EscapePound)}}" data-variation="tiny inverted" data-position="top right" data-name="{{.Name}}"><i class="trash icon text red"></i></a>
<td class="two wide right aligned overflow-visible">
{{if (not .IsDeleted)}}
<div class="ui basic jump dropdown icon button poping up" data-content="{{$.i18n.Tr "repo.branch.download" (.Name|EscapePound)}}" data-variation="tiny inverted" data-position="top right">
<i class="download icon"></i>
<div class="menu">
<a class="item" href="{{$.RepoLink}}/archive/{{EscapePound .Name}}.zip"><i class="octicon octicon-file-zip"></i> ZIP</a>
<a class="item" href="{{$.RepoLink}}/archive/{{EscapePound .Name}}.tar.gz"><i class="octicon octicon-file-zip"></i> TAR.GZ</a>
</div>
</div>
{{end}}
</td>
{{end}}
{{if and $.IsWriter (not $.IsMirror) (not .IsProtected)}}
{{if .IsDeleted}}
<a class="ui basic jump button icon poping up undo-button" href data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID | urlquery}}&name={{.DeletedBranch.Name | urlquery}}" data-content="{{$.i18n.Tr "repo.branch.restore" (.Name | EscapePound)}}" data-variation="tiny inverted" data-position="top right"><i class="octicon octicon-reply text blue"></i></a>
{{else}}
<a class="ui basic jump button icon poping up delete-branch-button" href data-url="{{$.Link}}/delete?name={{.Name | urlquery}}" data-content="{{$.i18n.Tr "repo.branch.delete" (.Name | EscapePound)}}" data-variation="tiny inverted" data-position="top right" data-name="{{.Name}}"><i class="trash icon text red"></i></a>
{{end}}
{{end}}
</td>
</tr>
{{end}}
{{end}}