Skip to content

Commit aa468b5

Browse files
Change style, buttons on same row.
1 parent 00e1960 commit aa468b5

File tree

4 files changed

+29
-19
lines changed

4 files changed

+29
-19
lines changed

options/locale/locale_en-US.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1583,8 +1583,10 @@ teams.write_permission_desc = This team grants <strong>Write</strong> access: me
15831583
teams.admin_permission_desc = This team grants <strong>Admin</strong> access: members can read from, push to and add collaborators to team repositories.
15841584
teams.repositories = Team Repositories
15851585
teams.search_repo_placeholder = Search repository…
1586-
teams.add_team_repository = Add Team Repository
1586+
teams.add_team_repository = Add
15871587
teams.remove_repo = Remove
1588+
teams.add_all_repos = Add All
1589+
teams.remove_all_repos = Remove All
15881590
teams.remove_all_repos_title = Remove all team repositories
15891591
teams.remove_all_repos_desc = This will remove all of the repositories from the team.
15901592
teams.add_all_repos_title = Add all repositories

public/css/index.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -944,8 +944,9 @@ tbody.commit-list{vertical-align:baseline}
944944
.organization.teams .members .item,.organization.teams .repositories .item{padding:10px 20px;line-height:32px}
945945
.organization.teams .members .item:not(:last-child),.organization.teams .repositories .item:not(:last-child){border-bottom:1px solid #ddd}
946946
.organization.teams .members .item .button,.organization.teams .repositories .item .button{padding:9px 10px}
947-
.organization.teams #add-member-form input,.organization.teams #add-repo-form input{margin-left:0}
948-
.organization.teams #add-member-form .ui.button,.organization.teams #add-repo-form .ui.button{margin-left:5px;margin-top:-3px}
947+
.organization.teams #add-member-form input,.organization.teams #add-repo-form input,.organization.teams #repo-multiple-form input{margin-left:0}
948+
.organization.teams #add-member-form .ui.button,.organization.teams #add-repo-form .ui.button,.organization.teams #repo-multiple-form .ui.button{margin-left:5px;margin-top:-3px}
949+
.organization.teams #repo-top-segment{height:60px}
949950
.user:not(.icon){padding-top:15px}
950951
.user.profile .ui.card .username{display:block}
951952
.user.profile .ui.card .extra.content{padding:0}

public/less/_organization.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@
152152
}
153153

154154
#add-repo-form,
155+
#repo-multiple-form,
155156
#add-member-form {
156157
input {
157158
margin-left: 0;
@@ -162,5 +163,9 @@
162163
margin-top: -3px;
163164
}
164165
}
166+
167+
#repo-top-segment {
168+
height: 60px;
169+
}
165170
}
166171
}

templates/org/team/repositories.tmpl

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,26 @@
99
{{template "org/team/navbar" .}}
1010
{{$canAddRemove := and $.IsOrganizationOwner (not $.Team.IncludesAllRepositories)}}
1111
{{if $canAddRemove}}
12-
<div class="ui attached segment">
13-
<form class="ui form" id="add-repo-form" action="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/repo/add" method="post">
14-
{{.CsrfTokenHtml}}
15-
<div class="inline field ui left">
16-
<div id="search-repo-box" data-uid="{{.Org.ID}}" class="ui search">
17-
<div class="ui input">
18-
<input class="prompt" name="repo_name" placeholder="{{.i18n.Tr "org.teams.search_repo_placeholder"}}" autocomplete="off" required>
12+
<div class="ui attached segment" id="repo-top-segment">
13+
<div class="inline ui field left">
14+
<form class="ui form" id="add-repo-form" action="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/repo/add" method="post">
15+
{{.CsrfTokenHtml}}
16+
<div class="inline field ui left">
17+
<div id="search-repo-box" data-uid="{{.Org.ID}}" class="ui search">
18+
<div class="ui input">
19+
<input class="prompt" name="repo_name" placeholder="{{.i18n.Tr "org.teams.search_repo_placeholder"}}" autocomplete="off" required>
20+
</div>
1921
</div>
2022
</div>
21-
</div>
22-
<button class="ui green button">{{.i18n.Tr "org.teams.add_team_repository"}}</button>
23-
</form>
24-
<div class="ui divider"></div>
25-
<form class="ui form" action="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/repositories" method="post">
26-
{{.CsrfTokenHtml}}
27-
<button class="ui green small button add-all-button" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/repo/addall">Add all organization repositories</button>
28-
<button class="ui red small button delete-button" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/repo/removeall">Remove all team repositories</button>
29-
</form>
23+
<button class="ui green button">{{.i18n.Tr "org.teams.add_team_repository"}}</button>
24+
</form>
25+
</div>
26+
<div class="inline ui field right">
27+
<form class="ui form" id="repo-multiple-form" action="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/repositories" method="post">
28+
<button class="ui red button delete-button right" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/repo/removeall">{{.i18n.Tr "org.teams.remove_all_repos"}}</button>
29+
<button class="ui green button add-all-button right" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/repo/addall">{{.i18n.Tr "org.teams.add_all_repos"}}</button>
30+
</form>
31+
</div>
3032
</div>
3133
{{end}}
3234
<div class="ui bottom attached table segment repositories">

0 commit comments

Comments
 (0)