Skip to content
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

manifest related cleanups #21513

Merged
merged 3 commits into from
Jan 13, 2025
Merged

manifest related cleanups #21513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f442556
gitignore: Fix appdata.xml
martinpitt Jan 13, 2025
23a9713
guide: Drop manifest.json
martinpitt Jan 13, 2025
cea56d8
shell: Drop obsolete po globs
martinpitt Jan 13, 2025
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Makefile.in
/src/systemd/tmpfiles.d/cockpit-ws.conf
/src/tls/cockpit-certificate-helper
/src/ws/cockpit-desktop
/src/ws/cockpit.appdata.xml
/src/ws/org.cockpit_project.cockpit.appdata.xml
/src/ws/mock-dbus-tests.[ch]
/test/images/
/tools/compile
Expand Down
11 changes: 6 additions & 5 deletions doc/guide/cockpit-manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@

<refsection id="cockpit-manifest-loading">
<title>Loading Manifests</title>
<para>You can load manifest info by loading the <code>./manifest.json</code> file in
your package. In addition there is a shortcut, by loading the <code>../manifests.json</code>
you can load all the manifests at once.</para>
<para>For a convenient access to all page manifests, include
<code>&lt;script src="../manifests.js"&gt;&lt;/script&gt;</code> into your page to register
the manifests at the <code>cockpit.manifests</code> global variable.</para>

<para>Lastly load the <code>../manifests.js</code> file to register the manifests at
the <code>cockpit.manifests</code> global variable.</para>
<para>You can also load <code>../manifests.json</code> directly in your page, with
<ulink url="https://developer.mozilla.org/en-US/docs/Web/API/Window/fetch"><code>fetch()</code></ulink>.
</para>
</refsection>

</refentry>
3 changes: 0 additions & 3 deletions pkg/shell/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
<link href="../../static/branding.css" rel="stylesheet" />
<script src="../base1/cockpit.js"></script>
<script src="../manifests.js"></script>
<!-- HACK: C bridge loads translations via glob and Python via manifest.js -->
<script src="../*/po.manifest.js"></script>
<script src="../*/po.js"></script>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we beiboot in cockpit client and other situations I suppose there is no way an old bridge server new shell code. So this seems fine.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that was my thought as well. The debs and rpm ensure that cockpit-{bridge,system} have the same version, and Arch doesn't even split the package.

<script src="po.js"></script>
<script src="shell.js"></script>
</head>
Expand Down
Loading