[pbs-devel] [PATCH proxmox-backup 1/3] docs: add ref for sysadmin host admin section

[pbs-devel] [PATCH proxmox-backup 1/3] docs: add ref for sysadmin host admin section

[Aaron Lauterer]

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
 docs/sysadmin.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/sysadmin.rst b/docs/sysadmin.rst
index 9c564f03..67c8c11e 100644
--- a/docs/sysadmin.rst
+++ b/docs/sysadmin.rst
@@ -1,3 +1,5 @@
+.. _sysadmin_host_administration:
+
 Host System Administration
 ==========================
 
-- 
2.20.1

[pbs-devel] [PATCH proxmox-backup 2/3] ui: onlinehelp update with sysadmin_host_administration

[Aaron Lauterer]

also remove some rst refs that slipped in

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
 www/OnlineHelpInfo.js | 40 ++++------------------------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

diff --git a/www/OnlineHelpInfo.js b/www/OnlineHelpInfo.js
index a9683874..c54912d8 100644
--- a/www/OnlineHelpInfo.js
+++ b/www/OnlineHelpInfo.js
@@ -75,42 +75,6 @@ const proxmoxOnlineHelpInfo = {
     "link": "/docs/pve-integration.html#pve-integration",
     "title": "`Proxmox VE`_ Integration"
   },
-  "rst-primer": {
-    "link": "/docs/reStructuredText-primer.html#rst-primer",
-    "title": "reStructuredText Primer"
-  },
-  "rst-inline-markup": {
-    "link": "/docs/reStructuredText-primer.html#rst-inline-markup",
-    "title": "Inline markup"
-  },
-  "rst-literal-blocks": {
-    "link": "/docs/reStructuredText-primer.html#rst-literal-blocks",
-    "title": "Literal blocks"
-  },
-  "rst-doctest-blocks": {
-    "link": "/docs/reStructuredText-primer.html#rst-doctest-blocks",
-    "title": "Doctest blocks"
-  },
-  "rst-tables": {
-    "link": "/docs/reStructuredText-primer.html#rst-tables",
-    "title": "Tables"
-  },
-  "rst-field-lists": {
-    "link": "/docs/reStructuredText-primer.html#rst-field-lists",
-    "title": "Field Lists"
-  },
-  "rst-roles-alt": {
-    "link": "/docs/reStructuredText-primer.html#rst-roles-alt",
-    "title": "Roles"
-  },
-  "rst-directives": {
-    "link": "/docs/reStructuredText-primer.html#rst-directives",
-    "title": "Directives"
-  },
-  "html-meta": {
-    "link": "/docs/reStructuredText-primer.html#html-meta",
-    "title": "HTML Metadata"
-  },
   "storage-disk-management": {
     "link": "/docs/storage.html#storage-disk-management",
     "title": "Disk Management"
@@ -123,6 +87,10 @@ const proxmoxOnlineHelpInfo = {
     "link": "/docs/storage.html#storage-datastore-create",
     "title": "Creating a Datastore"
   },
+  "sysadmin-host-administration": {
+    "link": "/docs/sysadmin.html#sysadmin-host-administration",
+    "title": "Host System Administration"
+  },
   "user-mgmt": {
     "link": "/docs/user-management.html#user-mgmt",
     "title": "User Management"
-- 
2.20.1

Re: [pbs-devel] [PATCH proxmox-backup 2/3] ui: onlinehelp update with sysadmin_host_administration

[Thomas Lamprecht]

On 10.11.20 13:38, Aaron Lauterer wrote:
> also remove some rst refs that slipped in
> 

why?? this is an autogenerated file which we want to track in git, nothing slipped
in here. Do not remove things manually which then just get re-added on each make
OnlineHelpInfo call, producing a dirty git state..

I dropped the wrong removes, the correct fix for this is to fix the onlineHelp
scanner, which then drops this automatically.

> Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
> ---
>  www/OnlineHelpInfo.js | 40 ++++------------------------------------
>  1 file changed, 4 insertions(+), 36 deletions(-)
> 
> diff --git a/www/OnlineHelpInfo.js b/www/OnlineHelpInfo.js
> index a9683874..c54912d8 100644
> --- a/www/OnlineHelpInfo.js
> +++ b/www/OnlineHelpInfo.js
> @@ -75,42 +75,6 @@ const proxmoxOnlineHelpInfo = {
>      "link": "/docs/pve-integration.html#pve-integration",
>      "title": "`Proxmox VE`_ Integration"
>    },
> -  "rst-primer": {
> -    "link": "/docs/reStructuredText-primer.html#rst-primer",
> -    "title": "reStructuredText Primer"
> -  },
> -  "rst-inline-markup": {
> -    "link": "/docs/reStructuredText-primer.html#rst-inline-markup",
> -    "title": "Inline markup"
> -  },
> -  "rst-literal-blocks": {
> -    "link": "/docs/reStructuredText-primer.html#rst-literal-blocks",
> -    "title": "Literal blocks"
> -  },
> -  "rst-doctest-blocks": {
> -    "link": "/docs/reStructuredText-primer.html#rst-doctest-blocks",
> -    "title": "Doctest blocks"
> -  },
> -  "rst-tables": {
> -    "link": "/docs/reStructuredText-primer.html#rst-tables",
> -    "title": "Tables"
> -  },
> -  "rst-field-lists": {
> -    "link": "/docs/reStructuredText-primer.html#rst-field-lists",
> -    "title": "Field Lists"
> -  },
> -  "rst-roles-alt": {
> -    "link": "/docs/reStructuredText-primer.html#rst-roles-alt",
> -    "title": "Roles"
> -  },
> -  "rst-directives": {
> -    "link": "/docs/reStructuredText-primer.html#rst-directives",
> -    "title": "Directives"
> -  },
> -  "html-meta": {
> -    "link": "/docs/reStructuredText-primer.html#html-meta",
> -    "title": "HTML Metadata"
> -  },
>    "storage-disk-management": {
>      "link": "/docs/storage.html#storage-disk-management",
>      "title": "Disk Management"
> @@ -123,6 +87,10 @@ const proxmoxOnlineHelpInfo = {
>      "link": "/docs/storage.html#storage-datastore-create",
>      "title": "Creating a Datastore"
>    },
> +  "sysadmin-host-administration": {
> +    "link": "/docs/sysadmin.html#sysadmin-host-administration",
> +    "title": "Host System Administration"
> +  },
>    "user-mgmt": {
>      "link": "/docs/user-management.html#user-mgmt",
>      "title": "User Management"
> 

Re: [pbs-devel] [PATCH proxmox-backup 2/3] ui: onlinehelp update with sysadmin_host_administration

[Aaron Lauterer]

This was phrased a bit confusing. This was not removed manually but when I ran a `make OnlineHelpInfo.js` they were removed.
So yeah, no idea why they were added in the first place but there is something going on that I do not fully understand yet but definitely a result of the quick hack to not scan the JS source files for help keys that are actually in use.



On 11/10/20 1:53 PM, Thomas Lamprecht wrote:
> On 10.11.20 13:38, Aaron Lauterer wrote:
>> also remove some rst refs that slipped in
>>
> 
> why?? this is an autogenerated file which we want to track in git, nothing slipped
> in here. Do not remove things manually which then just get re-added on each make
> OnlineHelpInfo call, producing a dirty git state..
> 
> I dropped the wrong removes, the correct fix for this is to fix the onlineHelp
> scanner, which then drops this automatically.
> 
>> Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
>> ---
>>   www/OnlineHelpInfo.js | 40 ++++------------------------------------
>>   1 file changed, 4 insertions(+), 36 deletions(-)
>>
>> diff --git a/www/OnlineHelpInfo.js b/www/OnlineHelpInfo.js
>> index a9683874..c54912d8 100644
>> --- a/www/OnlineHelpInfo.js
>> +++ b/www/OnlineHelpInfo.js
>> @@ -75,42 +75,6 @@ const proxmoxOnlineHelpInfo = {
>>       "link": "/docs/pve-integration.html#pve-integration",
>>       "title": "`Proxmox VE`_ Integration"
>>     },
>> -  "rst-primer": {
>> -    "link": "/docs/reStructuredText-primer.html#rst-primer",
>> -    "title": "reStructuredText Primer"
>> -  },
>> -  "rst-inline-markup": {
>> -    "link": "/docs/reStructuredText-primer.html#rst-inline-markup",
>> -    "title": "Inline markup"
>> -  },
>> -  "rst-literal-blocks": {
>> -    "link": "/docs/reStructuredText-primer.html#rst-literal-blocks",
>> -    "title": "Literal blocks"
>> -  },
>> -  "rst-doctest-blocks": {
>> -    "link": "/docs/reStructuredText-primer.html#rst-doctest-blocks",
>> -    "title": "Doctest blocks"
>> -  },
>> -  "rst-tables": {
>> -    "link": "/docs/reStructuredText-primer.html#rst-tables",
>> -    "title": "Tables"
>> -  },
>> -  "rst-field-lists": {
>> -    "link": "/docs/reStructuredText-primer.html#rst-field-lists",
>> -    "title": "Field Lists"
>> -  },
>> -  "rst-roles-alt": {
>> -    "link": "/docs/reStructuredText-primer.html#rst-roles-alt",
>> -    "title": "Roles"
>> -  },
>> -  "rst-directives": {
>> -    "link": "/docs/reStructuredText-primer.html#rst-directives",
>> -    "title": "Directives"
>> -  },
>> -  "html-meta": {
>> -    "link": "/docs/reStructuredText-primer.html#html-meta",
>> -    "title": "HTML Metadata"
>> -  },
>>     "storage-disk-management": {
>>       "link": "/docs/storage.html#storage-disk-management",
>>       "title": "Disk Management"
>> @@ -123,6 +87,10 @@ const proxmoxOnlineHelpInfo = {
>>       "link": "/docs/storage.html#storage-datastore-create",
>>       "title": "Creating a Datastore"
>>     },
>> +  "sysadmin-host-administration": {
>> +    "link": "/docs/sysadmin.html#sysadmin-host-administration",
>> +    "title": "Host System Administration"
>> +  },
>>     "user-mgmt": {
>>       "link": "/docs/user-management.html#user-mgmt",
>>       "title": "User Management"
>>
> 
> 

Re: [pbs-devel] [PATCH proxmox-backup 2/3] ui: onlinehelp update with sysadmin_host_administration

[Thomas Lamprecht]

On 10.11.20 14:15, Aaron Lauterer wrote:
> This was phrased a bit confusing. This was not removed manually but when I ran a `make OnlineHelpInfo.js` they were removed.
> So yeah, no idea why they were added in the first place but there is something going on that I do not fully understand yet but definitely a result of the quick hack to not scan the JS source files for help keys that are actually in use.
> 

Ok, so rather a misunderstanding on my part when reading the commit message.
In any way, I hope you get now the same online help file generated than I
here.

[pbs-devel] [PATCH proxmox-backup 3/3] ui: add mising panel help buttons

[Aaron Lauterer]

add missing help buttons (question mark, top right) so that we are
consistent and each panel has it.

I chose the IMHO most fitting sections.

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
 www/ServerAdministration.js | 2 ++
 www/Subscription.js         | 1 +
 www/SystemConfiguration.js  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/www/ServerAdministration.js b/www/ServerAdministration.js
index b79d62cd..0d803ac4 100644
--- a/www/ServerAdministration.js
+++ b/www/ServerAdministration.js
@@ -7,6 +7,8 @@ Ext.define('PBS.ServerAdministration', {
     border: true,
     defaults: { border: false },
 
+    tools: [PBS.Utils.get_help_tool("sysadmin-host-administration")],
+
     controller: {
 	xclass: 'Ext.app.ViewController',
 
diff --git a/www/Subscription.js b/www/Subscription.js
index 54b8ae27..b641f2f3 100644
--- a/www/Subscription.js
+++ b/www/Subscription.js
@@ -24,6 +24,7 @@ Ext.define('PBS.Subscription', {
     border: true,
 
     onlineHelp: 'get_help',
+    tools: [PBS.Utils.get_help_tool("get_help")],
 
     viewConfig: {
 	enableTextSelection: true,
diff --git a/www/SystemConfiguration.js b/www/SystemConfiguration.js
index 82d875ee..d82396af 100644
--- a/www/SystemConfiguration.js
+++ b/www/SystemConfiguration.js
@@ -6,6 +6,7 @@ Ext.define('PBS.SystemConfiguration', {
     border: true,
     scrollable: true,
     defaults: { border: false },
+    tools: [PBS.Utils.get_help_tool("sysadmin-network-configuration")],
     items: [
 	{
 	    title: gettext('Network/Time'),
-- 
2.20.1

[pbs-devel] applied: [PATCH proxmox-backup 3/3] ui: add mising panel help buttons

[Thomas Lamprecht]

On 10.11.20 13:38, Aaron Lauterer wrote:
> add missing help buttons (question mark, top right) so that we are
> consistent and each panel has it.
> 
> I chose the IMHO most fitting sections.
> 
> Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
> ---
>  www/ServerAdministration.js | 2 ++
>  www/Subscription.js         | 1 +
>  www/SystemConfiguration.js  | 1 +
>  3 files changed, 4 insertions(+)
> 
>

applied, thanks!

[pbs-devel] applied: [PATCH proxmox-backup 1/3] docs: add ref for sysadmin host admin section

[Thomas Lamprecht]

On 10.11.20 13:38, Aaron Lauterer wrote:
> Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
> ---
>  docs/sysadmin.rst | 2 ++
>  1 file changed, 2 insertions(+)
> 
>

applied, thanks! Squashed 2/3 into this and dropped the manual tinkering with
auto-generated files.