From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 05BF663A30 for ; Mon, 5 Oct 2020 17:01:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EECD51C079 for ; Mon, 5 Oct 2020 17:01:31 +0200 (CEST) Received: from gaia.proxmox.com (212-186-127-178.static.upcbusiness.at [212.186.127.178]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 1970C1C071 for ; Mon, 5 Oct 2020 17:01:31 +0200 (CEST) Received: from gaia.proxmox.com (localhost.localdomain [127.0.0.1]) by gaia.proxmox.com (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTP id 095F1Uor2206536; Mon, 5 Oct 2020 17:01:30 +0200 Received: (from oguz@localhost) by gaia.proxmox.com (8.15.2/8.15.2/Submit) id 095F1UH32206535; Mon, 5 Oct 2020 17:01:30 +0200 From: Oguz Bektas To: pbs-devel@lists.proxmox.com Date: Mon, 5 Oct 2020 17:01:29 +0200 Message-Id: <20201005150129.2206440-1-o.bektas@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.676 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.398 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pbs-devel] [PATCH proxmox-backup] gui: add onlineHelp for 'Prune Options' X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Oct 2020 15:01:32 -0000 also renamed the 'pruning' ref to 'backup-pruning' for clarity. Signed-off-by: Oguz Bektas --- docs/backup-client.rst | 2 +- docs/storage.rst | 4 ++-- www/OnlineHelpInfo.js | 30 +++++++++++++++--------------- www/window/DataStoreEdit.js | 10 +++++++--- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/docs/backup-client.rst b/docs/backup-client.rst index afa56fd8..eac7a353 100644 --- a/docs/backup-client.rst +++ b/docs/backup-client.rst @@ -533,7 +533,7 @@ To remove the ticket, issue a logout: # proxmox-backup-client logout -.. _pruning: +.. _backup-pruning: Pruning and Removing Backups ---------------------------- diff --git a/docs/storage.rst b/docs/storage.rst index 3a4875c6..3eb505a7 100644 --- a/docs/storage.rst +++ b/docs/storage.rst @@ -116,7 +116,7 @@ configured. The datastore is identified by a simple *name* and points to a directory on the filesystem. Each datastore also has associated retention settings of how many backup snapshots for each interval of ``hourly``, ``daily``, ``weekly``, ``monthly``, ``yearly`` as well as a time-independent -number of backups to keep in that store. :ref:`Pruning ` and +number of backups to keep in that store. :ref:`backup-pruning` and :ref:`garbage collection ` can also be configured to run periodically based on a configured schedule (see :ref:`calendar-events`) per datastore. @@ -136,7 +136,7 @@ the menu tree and clicking **Create**. Here: * *GC Schedule* refers to the time and intervals at which garbage collection runs * *Prune Schedule* refers to the frequency at which pruning takes place -* *Prune Options* set the amount of backups which you would like to keep (see :ref:`Pruning `). +* *Prune Options* set the amount of backups which you would like to keep (see :ref:`backup-pruning`). Alternatively you can create a new datastore from the command line. The following command creates a new datastore called ``store1`` on :file:`/backup/disk1/store1` diff --git a/www/OnlineHelpInfo.js b/www/OnlineHelpInfo.js index ff56553e..235c5831 100644 --- a/www/OnlineHelpInfo.js +++ b/www/OnlineHelpInfo.js @@ -3,28 +3,28 @@ const proxmoxOnlineHelpInfo = { "link": "/docs/index.html", "title": "Proxmox Backup Server Documentation Index" }, + "backup-pruning": { + "link": "/docs/backup-client.html#backup-pruning", + "title": "Pruning and Removing Backups" + }, + "chapter-zfs": { + "link": "/docs/sysadmin.html#chapter-zfs", + "title": "ZFS on Linux" + }, + "syncjobs": { + "link": "/docs/managing-remotes.html#syncjobs", + "title": "Sync Jobs" + }, "datastore-intro": { - "link": "/docs/administration-guide.html#datastore-intro", + "link": "/docs/storage.html#datastore-intro", "title": ":term:`DataStore`" }, "user-mgmt": { - "link": "/docs/administration-guide.html#user-mgmt", + "link": "/docs/user-management.html#user-mgmt", "title": "User Management" }, "user-acl": { - "link": "/docs/administration-guide.html#user-acl", + "link": "/docs/user-management.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" - }, - "chapter-zfs": { - "link": "/docs/sysadmin.html#chapter-zfs", - "title": "ZFS on Linux" } }; diff --git a/www/window/DataStoreEdit.js b/www/window/DataStoreEdit.js index f565cee5..c2a9527a 100644 --- a/www/window/DataStoreEdit.js +++ b/www/window/DataStoreEdit.js @@ -3,9 +3,6 @@ Ext.define('PBS.DataStoreEdit', { alias: 'widget.pbsDataStoreEdit', mixins: ['Proxmox.Mixin.CBind'], - - onlineHelp: 'datastore_intro', - subject: gettext('Datastore'), isAdd: true, @@ -30,10 +27,16 @@ Ext.define('PBS.DataStoreEdit', { items: { xtype: 'tabpanel', bodyPadding: 10, + listeners: { + tabchange: function(tb, newCard) { + Ext.GlobalEvents.fireEvent('proxmoxShowHelp', newCard.onlineHelp); + } + }, items: [ { title: gettext('General'), xtype: 'inputpanel', + onlineHelp: 'datastore_intro', column1: [ { xtype: 'pmxDisplayEditField', @@ -95,6 +98,7 @@ Ext.define('PBS.DataStoreEdit', { { title: gettext('Prune Options'), xtype: 'inputpanel', + onlineHelp: 'backup_pruning', column1: [ { xtype: 'proxmoxintegerfield', -- 2.20.1