Skip to content

Commit 6a9c777

Browse files
committed
fix
1 parent c5ede35 commit 6a9c777

File tree

5 files changed

+13
-25
lines changed

5 files changed

+13
-25
lines changed

templates/admin/auth/edit.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
</div>
134134
<div class="field">
135135
<label>{{.locale.Tr "admin.auths.map_group_to_team"}}</label>
136-
<input name="group_team_map" value="{{$cfg.GroupTeamMap}}" placeholder='e.g. {"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>
136+
<textarea name="group_team_map" rows="5" placeholder='e.g. {"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>{{$cfg.GroupTeamMap}}</textarea>
137137
</div>
138138
<div class="ui checkbox">
139139
<label>{{.locale.Tr "admin.auths.map_group_to_team_removal"}}</label>
@@ -360,7 +360,7 @@
360360
</div>
361361
<div class="field">
362362
<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team"}}</label>
363-
<input name="oauth2_group_team_map" value="{{$cfg.GroupTeamMap}}" placeholder='e.g. {"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>
363+
<textarea name="oauth2_group_team_map" rows="5" placeholder='e.g. {"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>{{$cfg.GroupTeamMap}}</textarea>
364364
</div>
365365
<div class="ui checkbox">
366366
<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team_removal"}}</label>

templates/admin/auth/source/ldap.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
</div>
107107
<div class="field">
108108
<label>{{.locale.Tr "admin.auths.map_group_to_team"}}</label>
109-
<input name="group_team_map" value="{{.group_team_map}}" placeholder='e.g. {"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>
109+
<textarea name="group_team_map" rows="5" placeholder='e.g. {"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>{{.group_team_map}}</textarea>
110110
</div>
111111
<div class="ui checkbox">
112112
<label>{{.locale.Tr "admin.auths.map_group_to_team_removal"}}</label>

templates/admin/auth/source/oauth.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
</div>
101101
<div class="field">
102102
<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team"}}</label>
103-
<input name="oauth2_group_team_map" value="{{.oauth2_group_team_map}}" placeholder='e.g. {"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>
103+
<textarea name="oauth2_group_team_map" rows="5" placeholder='e.g. {"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>{{.oauth2_group_team_map}}</textarea>
104104
</div>
105105
<div class="ui checkbox">
106106
<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team_removal"}}</label>

templates/user/settings/security/accountlinks.tmpl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
</div>
2626
{{if .AccountLinks}}
2727
{{range $loginSource, $provider := .AccountLinks}}
28-
<div class="item">
29-
<div class="right floated content">
30-
<button class="ui red tiny button delete-button" data-modal-id="delete-account-link" data-url="{{AppSubUrl}}/user/settings/security/account_link" data-id="{{$loginSource.ID}}">
31-
{{$.locale.Tr "settings.delete_key"}}
32-
</button>
33-
</div>
34-
<div class="content">
35-
<strong>{{$provider}}</strong>
36-
{{if $loginSource.IsActive}}<span class="text red">{{$.locale.Tr "repo.settings.active"}}</span>{{end}}
28+
<div class="item gt-df gt-ac">
29+
<div class="gt-f1">
30+
<span data-tooltip-content="{{$provider}}">
31+
{{$loginSource.Name}}
32+
{{if $loginSource.IsActive}}<span class="text primary">{{$.locale.Tr "repo.settings.active"}}</span>{{end}}
33+
</span>
3734
</div>
35+
<button class="ui red tiny button delete-button" data-modal-id="delete-account-link" data-url="{{AppSubUrl}}/user/settings/security/account_link" data-id="{{$loginSource.ID}}">
36+
{{$.locale.Tr "settings.delete_key"}}
37+
</button>
3838
</div>
3939
{{end}}
4040
{{end}}

web_src/css/base.css

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -952,18 +952,6 @@ img.ui.avatar,
952952
.following.bar #navbar {
953953
width: 100vw;
954954
min-height: 52px;
955-
padding: 0 16px;
956-
}
957-
958-
@media (max-width: 767px) {
959-
.following.bar #navbar {
960-
padding-left: 4px;
961-
padding-right: 0;
962-
}
963-
}
964-
965-
.following.bar #navbar .brand {
966-
margin: 0;
967955
}
968956

969957
.following.bar #navbar .dropdown .avatar {

0 commit comments

Comments
 (0)