From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: Re: [pbs-devel] [PATCH proxmox-backup] docs: add onlineHelp to some panels
Date: Tue, 22 Sep 2020 15:33:18 +0200 [thread overview]
Message-ID: <8fa77bbb-f39e-d4a9-b099-071822ba5d1e@proxmox.com> (raw)
In-Reply-To: <20200921112549.469308-1-o.bektas@proxmox.com>
LGTM
Reviewed-By: Dominik Csapak <d.csapak@proxmox.com>
Tested-By: Dominik Csapak <d.csapak@proxmox.com>
On 9/21/20 1:25 PM, Oguz Bektas wrote:
> name sections according to the title or content and add
> the respective onlineHelp to the following panels:
> - datastore
> - user management
> - ACL
> - backup remote
>
> Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
> ---
> docs/administration-guide.rst | 8 ++++++--
> www/OnlineHelpInfo.js | 16 ++++++++++++++++
> www/window/ACLEdit.js | 2 ++
> www/window/DataStoreEdit.js | 3 +++
> www/window/RemoteEdit.js | 2 ++
> www/window/UserEdit.js | 2 ++
> 6 files changed, 31 insertions(+), 2 deletions(-)
>
> diff --git a/docs/administration-guide.rst b/docs/administration-guide.rst
> index fed9bbe9..f7cd6ddf 100644
> --- a/docs/administration-guide.rst
> +++ b/docs/administration-guide.rst
> @@ -127,7 +127,7 @@ Backup Server Management
> The command line tool to configure and manage the backup server is called
> :command:`proxmox-backup-manager`.
>
> -
> +.. _datastore_intro:
>
> :term:`DataStore`
> ~~~~~~~~~~~~~~~~~
> @@ -364,7 +364,7 @@ directories will store the chunked data after a backup operation has been execut
> 276489 drwxr-xr-x 3 backup backup 4.0K Jul 8 12:35 ..
> 276490 drwxr-x--- 1 backup backup 1.1M Jul 8 12:35 .
>
> -
> +.. _user_mgmt:
>
> User Management
> ~~~~~~~~~~~~~~~
> @@ -448,6 +448,8 @@ Or completely remove the user with:
> # proxmox-backup-manager user remove john@pbs
>
>
> +.. _user_acl:
> +
> Access Control
> ~~~~~~~~~~~~~~
>
> @@ -631,6 +633,8 @@ You can also configure DNS settings, from the **DNS** section
> of **Configuration** or by using the ``dns`` subcommand of
> ``proxmox-backup-manager``.
>
> +.. _backup_remote:
> +
> :term:`Remote`
> ~~~~~~~~~~~~~~
>
> diff --git a/www/OnlineHelpInfo.js b/www/OnlineHelpInfo.js
> index 0b81b218..ff56553e 100644
> --- a/www/OnlineHelpInfo.js
> +++ b/www/OnlineHelpInfo.js
> @@ -3,6 +3,22 @@ const proxmoxOnlineHelpInfo = {
> "link": "/docs/index.html",
> "title": "Proxmox Backup Server Documentation Index"
> },
> + "datastore-intro": {
> + "link": "/docs/administration-guide.html#datastore-intro",
> + "title": ":term:`DataStore`"
> + },
> + "user-mgmt": {
> + "link": "/docs/administration-guide.html#user-mgmt",
> + "title": "User Management"
> + },
> + "user-acl": {
> + "link": "/docs/administration-guide.html#user-acl",
> + "title": "Access Control"
> + },
> + "backup-remote": {
> + "link": "/docs/administration-guide.html#backup-remote",
> + "title": ":term:`Remote`"
> + },
> "syncjobs": {
> "link": "/docs/administration-guide.html#syncjobs",
> "title": "Sync Jobs"
> diff --git a/www/window/ACLEdit.js b/www/window/ACLEdit.js
> index 17879a3c..e33f1f36 100644
> --- a/www/window/ACLEdit.js
> +++ b/www/window/ACLEdit.js
> @@ -3,6 +3,8 @@ Ext.define('PBS.window.ACLEdit', {
> alias: 'widget.pbsACLAdd',
> mixins: ['Proxmox.Mixin.CBind'],
>
> + onlineHelp: 'user_acl',
> +
> url: '/access/acl',
> method: 'PUT',
> isAdd: true,
> diff --git a/www/window/DataStoreEdit.js b/www/window/DataStoreEdit.js
> index 926a8a19..f565cee5 100644
> --- a/www/window/DataStoreEdit.js
> +++ b/www/window/DataStoreEdit.js
> @@ -3,6 +3,9 @@ Ext.define('PBS.DataStoreEdit', {
> alias: 'widget.pbsDataStoreEdit',
> mixins: ['Proxmox.Mixin.CBind'],
>
> +
> + onlineHelp: 'datastore_intro',
> +
> subject: gettext('Datastore'),
> isAdd: true,
>
> diff --git a/www/window/RemoteEdit.js b/www/window/RemoteEdit.js
> index ea4dc538..b7645af8 100644
> --- a/www/window/RemoteEdit.js
> +++ b/www/window/RemoteEdit.js
> @@ -3,6 +3,8 @@ Ext.define('PBS.window.RemoteEdit', {
> alias: 'widget.pbsRemoteEdit',
> mixins: ['Proxmox.Mixin.CBind'],
>
> + onlineHelp: 'backup_remote',
> +
> userid: undefined,
>
> isAdd: true,
> diff --git a/www/window/UserEdit.js b/www/window/UserEdit.js
> index d1da9f4b..d39a85d2 100644
> --- a/www/window/UserEdit.js
> +++ b/www/window/UserEdit.js
> @@ -3,6 +3,8 @@ Ext.define('PBS.window.UserEdit', {
> alias: 'widget.pbsUserEdit',
> mixins: ['Proxmox.Mixin.CBind'],
>
> + onlineHelp: 'user_mgmt',
> +
> userid: undefined,
>
> isAdd: true,
>
next prev parent reply other threads:[~2020-09-22 13:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-21 11:25 Oguz Bektas
2020-09-22 13:33 ` Dominik Csapak [this message]
2020-09-22 17:49 ` [pbs-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8fa77bbb-f39e-d4a9-b099-071822ba5d1e@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal