Skip to content

Commit 937c8dd

Browse files
authored
Merge pull request #457 from HLeithner/feature/restructure-menu
Introduce new About section and restructure the menu
2 parents 634e724 + 3dc8731 commit 937c8dd

File tree

24 files changed

+667
-417
lines changed

24 files changed

+667
-417
lines changed

README.md

Lines changed: 4 additions & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -4,193 +4,9 @@ This repository should hold all Joomla! documentation needed to develop extensio
44

55
The Documentation can be found at [https://manual.joomla.org](https://manual.joomla.org)
66

7-
## Contributing to the Joomla Manual
7+
## Contributing
88

9-
This manual is built using [Docusaurus 3](https://docusaurus.io/), a modern static website generator. If you want to contribute to it then this page will help you get started.
9+
This manual is self documenting, you can find the documentation at
10+
[manual.joomla.org/about](https://manual.joomla.org/about/).
1011

11-
Updates to the documentation is managed via this repository, so you should initially fork it into your own GitHub account.
12-
Then you can make changes to the documentation files and submit a pull request to the Joomla manual.
13-
Ensure that you continue to sync your fork branches with the Joomla manual `main` branch.
14-
15-
The documentation uses the [Markdown](https://www.markdownguide.org/) syntax, with additional features which Docusaurus provides.
16-
17-
To make documentation changes you'll probably find it easiest to use one of two options:
18-
1. Install Docusaurus on your own machine, and make changes there
19-
2. Use [github dev](https://github.com/github/dev) to make the changes on the GitHub server.
20-
21-
### Install Docusaurus Locally
22-
23-
To install Docusaurus on your own machine you should initialise a local git repository and clone the manual from the forked copy in your githut repository into this git instance.
24-
25-
Then change directory to your local git repository and do:
26-
27-
```
28-
$ npm install
29-
```
30-
31-
Once Docusaurus is installed:
32-
33-
```
34-
$ npm run start
35-
```
36-
37-
This command starts a local development server and opens up a browser window. Most changes are reflected live without having to restart the server.
38-
39-
```
40-
$ npm run build
41-
```
42-
43-
This command generates static content into the `build` directory and can be served using any static contents hosting service.
44-
45-
### Use github dev
46-
47-
To use github dev go to your repository and press the "." (dot) key, as described within the [github.dev guide](https://docs.github.com/en/codespaces/the-githubdev-web-based-editor). You can then:
48-
- create a new git branch for your changes
49-
- create new files and folders, modify and delete existing files, upload files
50-
- preview files (right-click on the file tab) - this will show interpreted markdown, but will not interpret Docusaurus additions
51-
- commit and push changes
52-
- return to GitHub repository (by clicking on GitHub in bottom left, or by replacing github.dev by github.com in the URL)
53-
54-
### Preview for pull request
55-
56-
Once you raise a pull request on the [Joomla manual](https://github.com/joomla/Manual) a test build is run to identify any problems with your documentation.
57-
If you find a check has failed then click on the Details of the check which failed, and you can check the console logs to find the problem.
58-
59-
When the build succeeds you will be able to see the result of your documentation changes by navigating to a URL like `http://pr-240.manual.joomlacode.org/docs/`, where you replace 240 with the number of your pull request.
60-
This link will be added to the "checks" section in the pull request as "preview".
61-
62-
### Versions
63-
64-
The Joomla Manual contains documentation for multiple versions of the Joomla software.
65-
66-
The mapping between the versions of the manual in GitHub and the live manual is:
67-
68-
| GitHub manual (development) | Live Docusaurus manual |
69-
| -------------------------------- |------------------------------------------------------|
70-
| /docs | "upcoming" release (shown as /docs/next in the URL) |
71-
| /versioned_docs/version-m.n | version m.n (under "Current releases") |
72-
73-
If your documentation changes relate to multiple versions of Joomla then you should duplicate these changes into multiple versions of Joomla manual. These versions which are updated are currently agreed to be:
74-
- the version m.n of the latest full Joomla release ("latest" release)
75-
- the version m.n+1 of the next Joomla release ("upcoming" release)
76-
- the last version (m-1.last) of the Joomla previous major version
77-
78-
Other versions may be present within /versioned_docs but are not updated with the changes, even if the documentation is true for those Joomla versions.
79-
80-
To minimise changes it's recommended that you initially just make changes within the /docs area, and then raise the pull request.
81-
This allows team members to review the documentation, and for you to fix any issues without having to replicate changes to multiple versions.
82-
Then when the review process is complete the changes can be replicated to the other versions prior to merging.
83-
84-
Once the pull request is merged you can delete the branch on your own repository, and sync your `main` branch with the updated Joomla manual `main`.
85-
86-
### Common Build Problems
87-
88-
If you use angle brackets or curly brackets in text then always enclose these in backticks, like `<h1>` or `{['a':1, 'b':2]}`.
89-
90-
Don't use colons (:) in titles.
91-
92-
Don't use `<br>` to force a new line (eg in table text); use `<br/>` instead.
93-
94-
Don't use subdirectory names which match somewhat the parent directory name. For example, avoid `./install-update/install/`, as this can cause docusaurus to report broken links.
95-
96-
### Docusaurus Additions
97-
98-
You won't see the effect of these when you preview the Markdown text, but you will see them by previewing the Pull Request.
99-
100-
[Front Matter](https://docusaurus.io/docs/markdown-features#front-matter) should be used for titles and position in the left-hand sidebar:
101-
102-
```
103-
---
104-
title: Best Practices
105-
sidebar-position: 2
106-
---
107-
```
108-
109-
[Code blocks](https://docusaurus.io/docs/markdown-features/code-blocks) are enclosed in 3 backticks, and can have a [title](https://docusaurus.io/docs/markdown-features/code-blocks#code-title)
110-
111-
```php title="hello.php"
112-
public static function hello()
113-
{
114-
echo "Hello!";
115-
}
116-
```
117-
118-
Line numbering and highlighting of individual lines are also supported.
119-
120-
To aid readability of the markdown please leave a blank line before and after code blocks.
121-
122-
[Admonitions](https://docusaurus.io/docs/markdown-features/admonitions)
123-
We don't use blank lines around content, and we add 2 spaces before the text messages.
124-
125-
```
126-
:::note[Developer Note]
127-
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
128-
:::
129-
130-
:::note[Joomla Issue]
131-
For issues that affect the documentation - please link to the issue on the Joomla Issue Tracker
132-
:::
133-
134-
:::tip
135-
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
136-
:::
137-
138-
:::info
139-
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
140-
:::
141-
142-
:::warning
143-
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
144-
:::
145-
146-
:::danger
147-
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
148-
:::
149-
```
150-
151-
Please use the following placeholder for unfinished sections of a document.
152-
153-
```
154-
:::note[TODO]
155-
This section is missing, please use the **Edit this Page** link at the bottom of this page to add this section.
156-
:::
157-
```
158-
159-
If the page is not completed yet and bigger parts are missing use
160-
161-
```
162-
:::caution[TODO]
163-
This page is unfinished, please use the **Edit this Page** link at the bottom of this page to help make it more useful.
164-
:::
165-
```
166-
167-
### Diagrams
168-
169-
Where possible, use [Mermaid](https://mermaid.live) for creating diagrams for inclusion in the documentation. Where Mermaid doesn't provide what you need, then please include the saved diagram from your drawing tool in addition to the image file.
170-
171-
Images, code zip files, etc should be held in a folder `_assets` at the point in the documentation where they're used.
172-
173-
### Other Recommendations
174-
175-
#### Header Levels - just one H1
176-
177-
To align with a11y requirements for accessibility, please don't have more than one header level 1:
178-
179-
```
180-
# Just One H1
181-
```
182-
183-
#### API Docs Links
184-
185-
If you link to the Joomla API docs then the URL of the API depends on the version of the manual documentation. For example, for Joomla 4.4 documentation the User API is at [https://api.joomla.org/cms-4/classes/Joomla-CMS-User-User.html](https://api.joomla.org/cms-4/classes/Joomla-CMS-User-User.html), but for Joomla 5.x documentation it is [https://api.joomla.org/cms-5/classes/Joomla-CMS-User-User.html](https://api.joomla.org/cms-5/classes/Joomla-CMS-User-User.html).
186-
187-
This is similar for Framework classes, eg [https://api.joomla.org/framework-3/classes/Joomla-Registry-Registry.html](https://api.joomla.org/framework-3/classes/Joomla-Registry-Registry.html), which is also dependent upon the documentation version.
188-
189-
As this creates a maintainability issue a plugin has been developed which automatically selects the appropriate API docs version, and you should use this plugin by specifying API docs links like the following examples:
190-
191-
```
192-
cms-api://classes/Joomla-CMS-User-User.html
193-
framework-api://classes/Joomla-Registry-Registry.html
194-
```
195-
196-
The plugin will replace `cms-api://` or `framework-api://` with the correct URL section.
12+
The markdown files for the this documentation are in the `about` folder.

about/contributing.md

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
---
2+
sidebar_position: 3
3+
---
4+
5+
Contributing
6+
============
7+
8+
How to contribute to the Joomla! documentation. First it's important to understand how to write documentation,
9+
which is handeled in the [Writing documentation](./writing.md) page.
10+
11+
## Install Docusaurus Locally
12+
13+
To install Docusaurus on your own machine you should initialise a local git repository and clone the manual from the
14+
forked copy in your GitHub repository into this git instance.
15+
16+
Then change directory to your local git repository and do:
17+
18+
```bash
19+
npm install
20+
```
21+
22+
Once Docusaurus is installed:
23+
24+
```bash
25+
npm run start
26+
```
27+
28+
This command starts a local development server and opens up a browser window.
29+
Most changes are reflected live without having to restart the server.
30+
31+
```bash
32+
npm run build
33+
```
34+
35+
This command generates static content into the `build` directory and can be served using any static contents hosting service.
36+
37+
## Use GitHub dev
38+
39+
To use GitHub dev go to your repository and press the "." (dot) key, as described within the
40+
[github.dev guide](https://docs.github.com/en/codespaces/the-githubdev-web-based-editor). You can then:
41+
42+
- create a new git branch for your changes
43+
- create new files and folders, modify and delete existing files, upload files
44+
- preview files (right-click on the file tab) - this will show interpreted markdown, but will not interpret Docusaurus additions
45+
- commit and push changes
46+
- return to GitHub repository (by clicking on GitHub in bottom left, or by replacing github.dev by github.com in the URL)
47+
48+
## Pull Requests
49+
50+
Once you raise a pull request on the [Joomla manual](https://github.com/joomla/Manual) a test build is run to identify
51+
any problems with your documentation. If you find a check has failed then click on the Details of the check which failed,
52+
and you can check the console logs to find the problem.
53+
54+
When the build succeeds you will be able to see the result of your documentation changes by navigating to a
55+
URL like `https://branchname.manual-bku.pages.dev/`, where you replace branchname with the branch of your pull request.
56+
This link will be added to the "checks" section in the pull request as "preview".

about/features/admonition.md

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
import BrowserWindow from '@site/src/components/BrowserWindow';
2+
3+
# Admonition
4+
5+
[Admonitions](https://docusaurus.io/docs/next/markdown-features/admonitions)
6+
We don't use blank lines around content, and we add 2 spaces before the text messages.
7+
8+
```
9+
:::note[Developer Note]
10+
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
11+
:::
12+
13+
:::note[Joomla Issue]
14+
For issues that affect the documentation - please link to the issue on the Joomla Issue Tracker
15+
:::
16+
17+
:::tip
18+
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
19+
:::
20+
21+
:::info
22+
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
23+
:::
24+
25+
:::warning
26+
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
27+
:::
28+
29+
:::danger
30+
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
31+
:::
32+
```
33+
34+
```mdx-code-block
35+
<BrowserWindow url="https://manual.joomla.org">
36+
37+
:::note[Developer Note]
38+
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
39+
:::
40+
41+
:::note[Joomla Issue]
42+
For issues that affect the documentation - please link to the issue on the Joomla Issue Tracker
43+
:::
44+
45+
:::tip
46+
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
47+
:::
48+
49+
:::info
50+
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
51+
:::
52+
53+
:::warning
54+
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
55+
:::
56+
57+
:::danger
58+
Some **content** with _Markdown_ `syntax`. Check [this `api`](#).
59+
:::
60+
61+
</BrowserWindow>
62+
```

about/features/asset.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Asset
2+
3+
Images, code zip files, etc should be held in a folder `_assets` at the point in the documentation where they're used.

about/features/browser.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
import BrowserWindow from '@site/src/components/BrowserWindow';
2+
import IframeWindow from '@site/src/components/BrowserWindow/IframeWindow';
3+
4+
# Browser
5+
6+
## BrowserWindow
7+
8+
The `BrowserWindow` component is used to display a browser window with a URL.
9+
Default url is https://www.joomla.org, a manual feature should be shown use the https://manual.joomla.org url.
10+
11+
```md
12+
---
13+
title: Example metadata
14+
---
15+
16+
import BrowserWindow from '@site/src/components/BrowserWindow';
17+
18+
​```mdx-code-block
19+
<BrowserWindow url="https://manual.joomla.org">
20+
Example Text, this could be markdown.
21+
</BrowserWindow>
22+
​```
23+
```
24+
25+
Example:
26+
27+
```mdx-code-block
28+
<BrowserWindow url="https://manual.joomla.org">
29+
Example Text, this could be markdown.
30+
</BrowserWindow>
31+
```
32+
33+
34+
## IframeWindow
35+
36+
The `IframeWindow` component is used to display a browser window with an iframe.
37+
38+
```md
39+
---
40+
title: Example metadata
41+
---
42+
43+
import BrowserWindow from '@site/src/components/BrowserWindow/IframeWindow';
44+
45+
​```mdx-code-block
46+
<IframeWindow url="https://manual.joomla.org">
47+
​```
48+
```
49+
50+
Example:
51+
52+
```mdx-code-block
53+
<IframeWindow url="https://manual.joomla.org">
54+
</IframeWindow>
55+
```

about/features/code.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Code Blocks
2+
3+
[Code blocks](https://docusaurus.io/docs/next/markdown-features/code-blocks) are enclosed in 3 backticks, and can have a title:
4+
5+
```php title="hello.php"
6+
public static function hello()
7+
{
8+
echo "Hello!";
9+
}
10+
```
11+
12+
Line numbering and highlighting of individual lines are also supported.
13+
14+
To aid readability of the markdown please leave a blank line before and after code blocks.

about/features/diagram.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Diagram
2+
3+
Where possible, use [Mermaid](https://mermaid.live) for creating diagrams for inclusion in the documentation.
4+
Where Mermaid doesn't provide what you need, then please include the saved diagram from your drawing tool
5+
in addition to the image file.

0 commit comments

Comments
 (0)