Skip to content

Commit 0dcd145

Browse files
committed
fix
1 parent 4e7465a commit 0dcd145

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

options/locale/locale_en-US.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,8 +1015,8 @@ new_repo_helper = A repository contains all project files, including revision hi
10151015
owner = Owner
10161016
owner_helper = Some organizations may not show up in the dropdown due to a maximum repository count limit.
10171017
repo_name = Repository Name
1018-
repo_name_profile_public_hint= .profile is a special repository that you can use to add README.md to your public organization profile, visible to anyone. Make sure it’s public and initialize it with a README in the profile directory to get started.
1019-
repo_name_profile_private_hint = .profile-private is a special repository that you can use to add a README.md to your organization member profile, visible only to organization members. Make sure it’s private and initialize it with a README in the profile directory to get started.
1018+
repo_name_profile_public_hint= .profile is a special repository that you can use to add README.md and Wiki to your public organization profile, visible to anyone. Make sure it’s public and initialize it with a README in the profile directory to get started.
1019+
repo_name_profile_private_hint = .profile-private is a special repository that you can use to add a README.md and Wiki to your organization member profile, visible only to organization members. Make sure it’s private and initialize it with a README in the profile directory to get started.
10201020
repo_name_helper = Good repository names use short, memorable and unique keywords. A repository named '.profile' or '.profile-private' could be used to add a README.md for the user/organization profile.
10211021
repo_size = Repository Size
10221022
template = Template
@@ -2865,8 +2865,8 @@ teams.invite.by = Invited by %s
28652865
teams.invite.description = Please click the button below to join the team.
28662866
28672867
view_as_role = View as: %s
2868-
view_as_public_hint = You are viewing the README a public user.
2869-
view_as_member_hint = You are viewing the README a member of this organization.
2868+
view_as_public_hint = You are viewing the README/Wiki as a public user.
2869+
view_as_member_hint = You are viewing the README/Wiki as a member of this organization.
28702870
28712871
[admin]
28722872
maintenance = Maintenance

routers/web/org/home.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@ func prepareOrgProfileReadme(ctx *context.Context, prepareResult *shared_user.Pr
179179
return false
180180
}
181181

182+
ctx.Data["HasOrgProfileWiki"] = profileRepo.HasWiki()
183+
ctx.Data["OrgProfileRepo"] = profileRepo
184+
182185
readmeBytes, err := readmeBlob.GetBlobContent(setting.UI.MaxDisplayFileSize)
183186
if err != nil {
184187
log.Error("failed to GetBlobContent for profile %q (view as %q) readme: %v", profileRepo.FullName(), viewAs, err)

templates/org/home.tmpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
{{if .ShowMemberAndTeamTab}}
1717
<div class="ui five wide column">
1818
{{if .CanCreateOrgRepo}}
19-
<div class="flex-text-block tw-flex-wrap tw-justify-end tw-mb-4">
19+
<div class="center aligned tw-mb-4">
2020
<a class="ui primary button" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{ctx.Locale.Tr "new_repo"}}</a>
2121
{{if not .DisableNewPullMirrors}}
2222
<a class="ui primary button" href="{{AppSubUrl}}/repo/migrate?org={{.Org.ID}}&mirror=1">{{ctx.Locale.Tr "new_migrate"}}</a>
2323
{{end}}
2424
</div>
25+
<div class="divider"></div>
2526
{{end}}
2627

2728
{{if and .ShowMemberAndTeamTab .ShowOrgProfileReadmeSelector}}
@@ -55,7 +56,7 @@
5556
{{$isMember := .IsOrganizationMember}}
5657
{{range .Members}}
5758
{{if or $isMember (call $.IsPublicMember .ID)}}
58-
<a href="{{.HomeLink}}" data-tooltip-content="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}">{{ctx.AvatarUtils.Avatar . 24}}</a>
59+
<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}">{{ctx.AvatarUtils.Avatar . 48}}</a>
5960
{{end}}
6061
{{end}}
6162
</div>

templates/org/menu.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{{end}}
2121
</a>
2222
{{end}}
23-
{{if .HasProfileWiki}}
23+
{{if .HasOrgProfileWiki}}
2424
<a class="item" href="{{$.OrgProfileRepo.Link}}/wiki">
2525
{{svg "octicon-book"}} {{ctx.Locale.Tr "repo.wiki"}}
2626
</a>

0 commit comments

Comments
 (0)