Skip to content

Commit d38dc1d

Browse files
HesterGHesterG
committed
change for repo
1 parent cf0452b commit d38dc1d

19 files changed

+1723
-1644
lines changed

‎templates/repo/settings/branches.tmpl

+88-84
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,102 @@
11
{{template "base/head" .}}
22
<div role="main" aria-label="{{.Title}}" class="page-content repository settings edit">
33
{{template "repo/header" .}}
4-
{{template "repo/settings/navbar" .}}
54
<div class="ui container">
6-
{{template "base/alert" .}}
7-
{{if .Repository.IsArchived}}
8-
<div class="ui warning message">
9-
{{.locale.Tr "repo.settings.archive.branchsettings_unavailable"}}
10-
</div>
11-
{{else}}
12-
<h4 class="ui top attached header">
13-
{{.locale.Tr "repo.default_branch"}}
14-
</h4>
15-
<div class="ui attached segment">
16-
<p>
17-
{{.locale.Tr "repo.settings.default_branch_desc"}}
18-
</p>
19-
<form class="ui form" action="{{.Link}}" method="post">
20-
{{.CsrfTokenHtml}}
21-
<input type="hidden" name="action" value="default_branch">
22-
{{if not .Repository.IsEmpty}}
23-
<div class="required inline field">
24-
<div class="ui dropdown selection" tabindex="0">
25-
<select name="branch">
26-
<option value="{{.Repository.DefaultBranch}}">{{.Repository.DefaultBranch}}</option>
27-
{{range .Branches}}
28-
<option value="{{.}}">{{.}}</option>
29-
{{end}}
30-
</select>{{svg "octicon-triangle-down" 14 "dropdown icon"}}
31-
<div class="default text">{{.Repository.DefaultBranch}}</div>
32-
<div class="menu">
33-
{{range .Branches}}
34-
<div class="item" data-value="{{.}}">{{.}}</div>
35-
{{end}}
5+
<div class="ui grid">
6+
{{template "repo/settings/navbar" .}}
7+
<div class="twelve wide column content">
8+
{{template "base/alert" .}}
9+
{{if .Repository.IsArchived}}
10+
<div class="ui warning message">
11+
{{.locale.Tr "repo.settings.archive.branchsettings_unavailable"}}
12+
</div>
13+
{{else}}
14+
<h4 class="ui top attached header">
15+
{{.locale.Tr "repo.default_branch"}}
16+
</h4>
17+
<div class="ui attached segment">
18+
<p>
19+
{{.locale.Tr "repo.settings.default_branch_desc"}}
20+
</p>
21+
<form class="ui form" action="{{.Link}}" method="post">
22+
{{.CsrfTokenHtml}}
23+
<input type="hidden" name="action" value="default_branch">
24+
{{if not .Repository.IsEmpty}}
25+
<div class="required inline field">
26+
<div class="ui dropdown selection" tabindex="0">
27+
<select name="branch">
28+
<option value="{{.Repository.DefaultBranch}}">{{.Repository.DefaultBranch}}</option>
29+
{{range .Branches}}
30+
<option value="{{.}}">{{.}}</option>
31+
{{end}}
32+
</select>{{svg "octicon-triangle-down" 14 "dropdown icon"}}
33+
<div class="default text">{{.Repository.DefaultBranch}}</div>
34+
<div class="menu">
35+
{{range .Branches}}
36+
<div class="item" data-value="{{.}}">{{.}}</div>
37+
{{end}}
38+
</div>
39+
</div>
40+
<button class="ui green button">{{$.locale.Tr "repo.settings.branches.update_default_branch"}}</button>
3641
</div>
37-
</div>
38-
<button class="ui green button">{{$.locale.Tr "repo.settings.branches.update_default_branch"}}</button>
42+
{{end}}
43+
</form>
3944
</div>
40-
{{end}}
41-
</form>
42-
</div>
4345

44-
<h4 class="ui top attached header">
45-
{{.locale.Tr "repo.settings.protected_branch"}}
46-
<div class="ui right">
47-
<a class="ui primary tiny button" href="{{$.Repository.Link}}/settings/branches/edit">{{$.locale.Tr "repo.settings.branches.add_new_rule"}}</a>
48-
</div>
49-
</h4>
46+
<h4 class="ui top attached header">
47+
{{.locale.Tr "repo.settings.protected_branch"}}
48+
<div class="ui right">
49+
<a class="ui primary tiny button" href="{{$.Repository.Link}}/settings/branches/edit">{{$.locale.Tr "repo.settings.branches.add_new_rule"}}</a>
50+
</div>
51+
</h4>
5052

51-
<div class="ui attached table segment">
52-
<div class="ui grid padded">
53-
<div class="sixteen wide column">
54-
<table class="ui single line table padded">
55-
<tbody>
56-
{{range .ProtectedBranches}}
57-
<tr>
58-
<td><div class="ui basic primary label">{{.RuleName}}</div></td>
59-
<td class="right aligned">
60-
<a class="rm ui button" href="{{$.Repository.Link}}/settings/branches/edit?rule_name={{.RuleName}}">{{$.locale.Tr "repo.settings.edit_protected_branch"}}</a>
61-
<button class="ui red tiny button delete-button" data-url="{{$.Repository.Link}}/settings/branches/{{.ID}}/delete" data-id="{{.ID}}">
62-
{{$.locale.Tr "repo.settings.protected_branch.delete_rule"}}</button>
63-
</td>
64-
</tr>
65-
{{else}}
66-
<tr class="center aligned"><td>{{.locale.Tr "repo.settings.no_protected_branch"}}</td></tr>
67-
{{end}}
68-
</tbody>
69-
</table>
53+
<div class="ui attached table segment">
54+
<div class="ui grid padded">
55+
<div class="sixteen wide column">
56+
<table class="ui single line table padded">
57+
<tbody>
58+
{{range .ProtectedBranches}}
59+
<tr>
60+
<td><div class="ui basic primary label">{{.RuleName}}</div></td>
61+
<td class="right aligned">
62+
<a class="rm ui button" href="{{$.Repository.Link}}/settings/branches/edit?rule_name={{.RuleName}}">{{$.locale.Tr "repo.settings.edit_protected_branch"}}</a>
63+
<button class="ui red tiny button delete-button" data-url="{{$.Repository.Link}}/settings/branches/{{.ID}}/delete" data-id="{{.ID}}">
64+
{{$.locale.Tr "repo.settings.protected_branch.delete_rule"}}</button>
65+
</td>
66+
</tr>
67+
{{else}}
68+
<tr class="center aligned"><td>{{.locale.Tr "repo.settings.no_protected_branch"}}</td></tr>
69+
{{end}}
70+
</tbody>
71+
</table>
72+
</div>
73+
</div>
7074
</div>
71-
</div>
72-
</div>
7375

74-
{{if $.Repository.CanCreateBranch}}
75-
<h4 class="ui top attached header">
76-
{{.locale.Tr "repo.settings.rename_branch"}}
77-
</h4>
78-
<div class="ui attached segment">
79-
<form class="ui form" action="{{$.Repository.Link}}/settings/rename_branch" method="post">
80-
{{.CsrfTokenHtml}}
81-
<div class="required field">
82-
<label for="from">{{.locale.Tr "repo.settings.rename_branch_from"}}</label>
83-
<input id="from" name="from" required>
84-
</div>
85-
<div class="required field {{if .Err_BranchName}}error{{end}}">
86-
<label for="to">{{.locale.Tr "repo.settings.rename_branch_to"}}</label>
87-
<input id="to" name="to" required>
76+
{{if $.Repository.CanCreateBranch}}
77+
<h4 class="ui top attached header">
78+
{{.locale.Tr "repo.settings.rename_branch"}}
79+
</h4>
80+
<div class="ui attached segment">
81+
<form class="ui form" action="{{$.Repository.Link}}/settings/rename_branch" method="post">
82+
{{.CsrfTokenHtml}}
83+
<div class="required field">
84+
<label for="from">{{.locale.Tr "repo.settings.rename_branch_from"}}</label>
85+
<input id="from" name="from" required>
86+
</div>
87+
<div class="required field {{if .Err_BranchName}}error{{end}}">
88+
<label for="to">{{.locale.Tr "repo.settings.rename_branch_to"}}</label>
89+
<input id="to" name="to" required>
90+
</div>
91+
<div class="field">
92+
<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
93+
</div>
94+
</form>
8895
</div>
89-
<div class="field">
90-
<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
91-
</div>
92-
</form>
93-
</div>
94-
{{end}}
95-
{{end}}
96+
{{end}}
97+
{{end}}
98+
</div>
99+
</div>
96100
</div>
97101
</div>
98102

‎templates/repo/settings/collaboration.tmpl

+97-93
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,118 @@
11
{{template "base/head" .}}
22
<div role="main" aria-label="{{.Title}}" class="page-content repository settings collaboration">
33
{{template "repo/header" .}}
4-
{{template "repo/settings/navbar" .}}
54
<div class="ui container">
6-
{{template "base/alert" .}}
7-
<h4 class="ui top attached header">
8-
{{.locale.Tr "repo.settings.collaboration"}}
9-
</h4>
10-
{{if .Collaborators}}
11-
<div class="ui attached segment collaborator list">
12-
{{range .Collaborators}}
13-
<div class="item ui grid">
14-
<div class="ui five wide column">
15-
<a href="{{.HomeLink}}">
16-
{{avatar $.Context .}}
17-
{{.DisplayName}}
18-
</a>
19-
</div>
20-
<div class="ui eight wide column">
21-
{{svg "octicon-shield-lock"}}
22-
<div class="ui inline dropdown access-mode" data-url="{{$.Link}}/access_mode" data-uid="{{.ID}}" data-last-value="{{printf "%d" .Collaboration.Mode}}">
23-
<div class="text">{{if eq .Collaboration.Mode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .Collaboration.Mode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .Collaboration.Mode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
24-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
25-
<div class="menu">
26-
<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.admin"}}" data-value="3">{{$.locale.Tr "repo.settings.collaboration.admin"}}</div>
27-
<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.write"}}" data-value="2">{{$.locale.Tr "repo.settings.collaboration.write"}}</div>
28-
<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.read"}}" data-value="1">{{$.locale.Tr "repo.settings.collaboration.read"}}</div>
5+
<div class="ui grid">
6+
{{template "repo/settings/navbar" .}}
7+
<div class="twelve wide column content">
8+
{{template "base/alert" .}}
9+
<h4 class="ui top attached header">
10+
{{.locale.Tr "repo.settings.collaboration"}}
11+
</h4>
12+
{{if .Collaborators}}
13+
<div class="ui attached segment collaborator list">
14+
{{range .Collaborators}}
15+
<div class="item ui grid">
16+
<div class="ui five wide column">
17+
<a href="{{.HomeLink}}">
18+
{{avatar $.Context .}}
19+
{{.DisplayName}}
20+
</a>
21+
</div>
22+
<div class="ui eight wide column">
23+
{{svg "octicon-shield-lock"}}
24+
<div class="ui inline dropdown access-mode" data-url="{{$.Link}}/access_mode" data-uid="{{.ID}}" data-last-value="{{printf "%d" .Collaboration.Mode}}">
25+
<div class="text">{{if eq .Collaboration.Mode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .Collaboration.Mode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .Collaboration.Mode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
26+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
27+
<div class="menu">
28+
<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.admin"}}" data-value="3">{{$.locale.Tr "repo.settings.collaboration.admin"}}</div>
29+
<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.write"}}" data-value="2">{{$.locale.Tr "repo.settings.collaboration.write"}}</div>
30+
<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.read"}}" data-value="1">{{$.locale.Tr "repo.settings.collaboration.read"}}</div>
31+
</div>
32+
</div>
33+
</div>
34+
<div class="ui two wide column">
35+
<button class="ui red tiny button inline text-thin delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
36+
{{$.locale.Tr "repo.settings.delete_collaborator"}}
37+
</button>
2938
</div>
3039
</div>
31-
</div>
32-
<div class="ui two wide column">
33-
<button class="ui red tiny button inline text-thin delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
34-
{{$.locale.Tr "repo.settings.delete_collaborator"}}
35-
</button>
36-
</div>
40+
{{end}}
3741
</div>
38-
{{end}}
39-
</div>
40-
{{end}}
41-
<div class="ui bottom attached segment">
42-
<form class="ui form" id="repo-collab-form" action="{{.Link}}" method="post">
43-
{{.CsrfTokenHtml}}
44-
<div class="inline field ui left">
45-
<div id="search-user-box" class="ui search">
46-
<div class="ui input">
47-
<input class="prompt" name="collaborator" placeholder="{{.locale.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off" autofocus required>
42+
{{end}}
43+
<div class="ui bottom attached segment">
44+
<form class="ui form" id="repo-collab-form" action="{{.Link}}" method="post">
45+
{{.CsrfTokenHtml}}
46+
<div class="inline field ui left">
47+
<div id="search-user-box" class="ui search">
48+
<div class="ui input">
49+
<input class="prompt" name="collaborator" placeholder="{{.locale.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off" autofocus required>
50+
</div>
51+
</div>
4852
</div>
49-
</div>
53+
<button class="ui green button">{{.locale.Tr "repo.settings.add_collaborator"}}</button>
54+
</form>
5055
</div>
51-
<button class="ui green button">{{.locale.Tr "repo.settings.add_collaborator"}}</button>
52-
</form>
53-
</div>
5456

55-
{{if .RepoOwnerIsOrganization}}
56-
<h4 class="ui top attached header">
57-
{{$.locale.Tr "repo.settings.teams"}}
58-
</h4>
59-
{{$allowedToChangeTeams := ( or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner))}}
60-
{{if .Teams}}
61-
<div class="ui attached segment collaborator list">
62-
{{range $t, $team := .Teams}}
63-
<div class="item ui grid">
64-
<div class="ui five wide column">
65-
<a href="{{AppSubUrl}}/org/{{$.OrgName|PathEscape}}/teams/{{.LowerName|PathEscape}}">
66-
{{.Name}}
67-
</a>
68-
</div>
69-
<div class="ui eight wide column" data-tooltip-content="{{$.locale.Tr "repo.settings.change_team_permission_tip"}}">
70-
{{svg "octicon-shield-lock"}}
71-
<div class="ui inline dropdown">
72-
<div class="text">{{if eq .AccessMode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .AccessMode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .AccessMode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else if eq .AccessMode 4}}{{$.locale.Tr "repo.settings.collaboration.owner"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
73-
</div>
74-
{{if or (eq .AccessMode 1) (eq .AccessMode 2)}}
75-
{{$first := true}}
76-
<div class="description">
77-
Sections: {{range $u, $unit := $.Units}}{{if and ($.Repo.UnitEnabled $.Context $unit.Type) ($team.UnitEnabled $.Context $unit.Type)}}{{if $first}}{{$first = false}}{{else}}, {{end}}{{$.locale.Tr $unit.NameKey}}{{end}}{{end}} {{if $first}}None{{end}}
57+
{{if .RepoOwnerIsOrganization}}
58+
<h4 class="ui top attached header">
59+
{{$.locale.Tr "repo.settings.teams"}}
60+
</h4>
61+
{{$allowedToChangeTeams := ( or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner))}}
62+
{{if .Teams}}
63+
<div class="ui attached segment collaborator list">
64+
{{range $t, $team := .Teams}}
65+
<div class="item ui grid">
66+
<div class="ui five wide column">
67+
<a href="{{AppSubUrl}}/org/{{$.OrgName|PathEscape}}/teams/{{.LowerName|PathEscape}}">
68+
{{.Name}}
69+
</a>
7870
</div>
79-
{{end}}
80-
</div>
81-
{{if $allowedToChangeTeams}}
82-
<div class="ui two wide column" {{if .IncludesAllRepositories}} data-tooltip-content="{{$.locale.Tr "repo.settings.delete_team_tip"}}"{{end}}>
83-
<button class="ui red tiny button inline text-thin delete-button {{if .IncludesAllRepositories}}disabled{{end}}" data-url="{{$.Link}}/team/delete" data-id="{{.ID}}">
84-
{{$.locale.Tr "repo.settings.delete_collaborator"}}
85-
</button>
71+
<div class="ui eight wide column" data-tooltip-content="{{$.locale.Tr "repo.settings.change_team_permission_tip"}}">
72+
{{svg "octicon-shield-lock"}}
73+
<div class="ui inline dropdown">
74+
<div class="text">{{if eq .AccessMode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .AccessMode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .AccessMode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else if eq .AccessMode 4}}{{$.locale.Tr "repo.settings.collaboration.owner"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
75+
</div>
76+
{{if or (eq .AccessMode 1) (eq .AccessMode 2)}}
77+
{{$first := true}}
78+
<div class="description">
79+
Sections: {{range $u, $unit := $.Units}}{{if and ($.Repo.UnitEnabled $.Context $unit.Type) ($team.UnitEnabled $.Context $unit.Type)}}{{if $first}}{{$first = false}}{{else}}, {{end}}{{$.locale.Tr $unit.NameKey}}{{end}}{{end}} {{if $first}}None{{end}}
80+
</div>
81+
{{end}}
82+
</div>
83+
{{if $allowedToChangeTeams}}
84+
<div class="ui two wide column" {{if .IncludesAllRepositories}} data-tooltip-content="{{$.locale.Tr "repo.settings.delete_team_tip"}}"{{end}}>
85+
<button class="ui red tiny button inline text-thin delete-button {{if .IncludesAllRepositories}}disabled{{end}}" data-url="{{$.Link}}/team/delete" data-id="{{.ID}}">
86+
{{$.locale.Tr "repo.settings.delete_collaborator"}}
87+
</button>
88+
</div>
89+
{{end}}
8690
</div>
8791
{{end}}
8892
</div>
89-
{{end}}
90-
</div>
91-
{{end}}
92-
<div class="ui bottom attached segment">
93-
{{if $allowedToChangeTeams}}
94-
<form class="ui form" id="repo-collab-team-form" action="{{.Link}}/team" method="post">
95-
{{.CsrfTokenHtml}}
96-
<div class="inline field ui left">
97-
<div id="search-team-box" class="ui search" data-org="{{.OrgName}}">
98-
<div class="ui input">
99-
<input class="prompt" name="team" placeholder="{{$.locale.Tr "repo.settings.search_team"}}" autocomplete="off" autofocus required>
93+
{{end}}
94+
<div class="ui bottom attached segment">
95+
{{if $allowedToChangeTeams}}
96+
<form class="ui form" id="repo-collab-team-form" action="{{.Link}}/team" method="post">
97+
{{.CsrfTokenHtml}}
98+
<div class="inline field ui left">
99+
<div id="search-team-box" class="ui search" data-org="{{.OrgName}}">
100+
<div class="ui input">
101+
<input class="prompt" name="team" placeholder="{{$.locale.Tr "repo.settings.search_team"}}" autocomplete="off" autofocus required>
102+
</div>
103+
</div>
100104
</div>
105+
<button class="ui green button">{{$.locale.Tr "repo.settings.add_team"}}</button>
106+
</form>
107+
{{else}}
108+
<div class="item">
109+
{{$.locale.Tr "repo.settings.change_team_access_not_allowed"}}
101110
</div>
102-
</div>
103-
<button class="ui green button">{{$.locale.Tr "repo.settings.add_team"}}</button>
104-
</form>
105-
{{else}}
106-
<div class="item">
107-
{{$.locale.Tr "repo.settings.change_team_access_not_allowed"}}
111+
{{end}}
108112
</div>
109-
{{end}}
113+
{{end}}
114+
</div>
110115
</div>
111-
{{end}}
112116
</div>
113117
</div>
114118

0 commit comments

Comments
 (0)