[pve-devel] applied: [PATCH docs v2 3/3] api-viewer: use our extjs package

Thu Jul 26 14:12:38 CEST 2018

applied

> On July 25, 2018 at 11:21 AM Thomas Lamprecht <t.lamprecht at proxmox.com> wrote:
> 
> 
> The loading of an external hosted ExtJS is from a time where we did
> not have a extra ExtJS package as it still was in the pve-manager
> one, which was not desired to be installed on a non-pve machine.
> Add a dependency on libjs-extjs and a link from api-viewer/extjs to
> the installation directory of the ExtJS package, this allows to reuse
> ExtJS on PVE node hosted docs and on the hosted docs from proxmox.com
> at the same time.
> 
> Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
> ---
> 
> changes v1 -> v2:
> * add libjs-extjs as installation not build dependency
> 
>  api-viewer/extjs        | 1 +
>  api-viewer/index.html   | 4 ++--
>  debian/pve-docs.control | 1 +
>  debian/pve-docs.links   | 1 +
>  4 files changed, 5 insertions(+), 2 deletions(-)
>  create mode 120000 api-viewer/extjs
>  create mode 100644 debian/pve-docs.links
> 
> diff --git a/api-viewer/extjs b/api-viewer/extjs
> new file mode 120000
> index 0000000..b71ec6e
> --- /dev/null
> +++ b/api-viewer/extjs
> @@ -0,0 +1 @@
> +/usr/share/javascript/extjs
> \ No newline at end of file
> diff --git a/api-viewer/index.html b/api-viewer/index.html
> index 168b29d..8528420 100644
> --- a/api-viewer/index.html
> +++ b/api-viewer/index.html
> @@ -5,8 +5,8 @@
>      <meta name="viewport" content="width=device-width, initial-scale=1,
> maximum-scale=1, user-scalable=no">
>      <title>Proxmox VE API Documentation</title>
>  
> -    <link rel="stylesheet" type="text/css"
> href="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.0.1/classic/theme-crisp/resources/theme-crisp.css">
> -    <script type="text/javascript"
> src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.0.1/ext-all.js"></script>
> +    <link rel="stylesheet" type="text/css"
> href="extjs/theme-crisp/resources/theme-crisp-all.css">
> +    <script type="text/javascript" src="extjs/ext-all.js"></script>
>      <script type="text/javascript" src="apidoc.js"></script>
>  </head>
>  <body></body>
> diff --git a/debian/pve-docs.control b/debian/pve-docs.control
> index 31a8c6e..3a30f4e 100644
> --- a/debian/pve-docs.control
> +++ b/debian/pve-docs.control
> @@ -1,5 +1,6 @@
>  Package: pve-docs
>  Section: doc
> +Depends: libjs-extjs
>  Architecture: all
>  Description: Proxmox VE Documentation
>   This package contains the Proxmox VE Documentation files.
> diff --git a/debian/pve-docs.links b/debian/pve-docs.links
> new file mode 100644
> index 0000000..78185f7
> --- /dev/null
> +++ b/debian/pve-docs.links
> @@ -0,0 +1 @@
> +/usr/share/javascript/extjs /usr/share/pve-docs/api-viewer/extjs
> -- 
> 2.18.0
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at pve.proxmox.com
> https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel