[pve-devel] [PATCH manager 5/5] add summary to the ceph warning window

[Fabian Grünbichler]

On Wed, Aug 09, 2017 at 11:42:56AM +0200, Dominik Csapak wrote:
> and format it better
> 
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>  www/manager6/ceph/Status.js | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/www/manager6/ceph/Status.js b/www/manager6/ceph/Status.js
> index 132c5e0a..b0527337 100644
> --- a/www/manager6/ceph/Status.js
> +++ b/www/manager6/ceph/Status.js
> @@ -90,7 +90,10 @@ Ext.define('PVE.node.CephStatus', {
>  						scrollable: true,
>  						padding: '10',
>  						xtype: 'box',
> -						html: record.data.detail
> +						html: [
> +						    '<span>' + record.data.summary + '</span>',
> +						    '<pre>'+ record.data.detail+ '</pre>'

I'd slightly prefer a mono space font instead of pre (to avoid
horizontal scrolling in a dialogue) - but tastes differ, so maybe others
want to chime in?

what definitely needs to be included is HTML encoding the string
returned by Ceph, as Ceph uses <> in example commands to mark paramaters
that need to be replaced, and those are parsed as HTML tags ATM. this
might also apply to other parts of the Ceph GUI.

> +						]
>  					    }]
>  					});
>  					win.show();
> @@ -179,7 +182,7 @@ Ext.define('PVE.node.CephStatus', {
>  	    result.push({
>  		id: key,
>  		summary: checks[key].message,
> -		detail: details.join("<br>\n"),
> +		detail: details.join("\n"),
>  		severity: checks[key].severity
>  	    });
>  	});
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at pve.proxmox.com
> https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel