Skip to content

Settings: Showed the settings context above organization settings #113

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
whereareiam merged 1 commit into from
Oct 23, 2026
Merged

Settings: Showed the settings context above organization settings #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/build-output.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,12 @@ describe("Forgejo 15 native integration", () => {
expect(forks).toContain("No one has forked this repository yet");
});

it("heads organization settings with the settings context, as personal settings", () => {
const layout = fs.readFileSync(path.join(ROOT_DIR, "templates", "org", "settings", "layout_head.tmpl"), "utf-8");
expect(layout).not.toContain('template "org/header"');
expect(layout).toContain('template "components/common/settings/context"');
});

it("matches GitHub's repository About, visibility, and code-search details", () => {
const headerStyle = fs.readFileSync(path.join(ROOT_DIR, "styles", "templates", "repo", "header.ts"), "utf-8");
const headerTemplate = fs.readFileSync(path.join(ROOT_DIR, "templates", "repo", "home_header.tmpl"), "utf-8");
Expand Down
16 changes: 0 additions & 16 deletions styles/pages/organization.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,22 +304,6 @@
}
}

.page-content.organization.settings .ui.container.org-identity {
min-height: 48px;
margin-bottom: 24px;
padding-bottom: 0;
border: 0;
}

.page-content.organization.settings .ui.container.org-identity > img.org-avatar {
width: 48px;
height: 48px;
}

.page-content.organization.settings .ui.container.org-identity .org-title h1 {
font-size: 20px;
}

.organization .list-header {
margin-bottom: 16px;
}
Expand Down
5 changes: 4 additions & 1 deletion templates/org/settings/layout_head.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{{template "base/head" .ctxData}}
<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
{{template "org/header" .ctxData}}
{{/* GitHub heads organization settings with the settings context, not the organization's profile header. */}}
<div class="ui container theme-settings-context-container">
{{template "components/common/settings/context" dict "Avatar" (ctx.AvatarUtils.Avatar .ctxData.Org 48) "Title" (.ctxData.Org.DisplayName) "Login" .ctxData.Org.Name "Subtitle" (ctx.Locale.Tr "org.settings.options") "Link" .ctxData.Org.HomeLink "LinkIcon" "octicon-organization" "LinkLabel" (ctx.Locale.Tr "your_profile")}}
</div>
<div class="ui container flex-container theme-settings">
{{template "org/settings/navbar" .ctxData}}
<div class="flex-container-main">
Expand Down
Loading