[pve-devel] applied: [PATCH 1/2] api-viewer: use our extjs package instead of the cloudflare cdn

Thomas Lamprecht t.lamprecht at proxmox.com
Sat Aug 17 12:57:21 CEST 2019


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-pmg 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 PMG node hosted docs and on the hosted docs from proxmox.com
at the same time.

Adapted from the Proxmox VE version[0] of this change.

[0]: https://git.proxmox.com/?p=pve-docs.git;a=commitdiff;h=e56030c4d7c3bd0de1ebc109d528fb6b7bef05a3

Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---
 api-viewer/extjs      | 1 +
 api-viewer/index.html | 4 ++--
 debian/control        | 1 +
 debian/pmg-docs.links | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)
 create mode 120000 api-viewer/extjs
 create mode 100644 debian/pmg-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 97ed69e..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-touch/resources/theme-crisp-touch-all.css">
-   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/extjs/6.0.1/ext-all-debug.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/control b/debian/control
index 7ec1794..8d2ccde 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Description: Proxmox Mail Gateway Documentation helpers
 
 Package: pmg-docs
 Section: doc
+Depends: libjs-extjs
 Architecture: all
 Description: Proxmox Mail Gateway Documentation
  This package contains the Proxmox Mail Gateway documentation files.
diff --git a/debian/pmg-docs.links b/debian/pmg-docs.links
new file mode 100644
index 0000000..6964af5
--- /dev/null
+++ b/debian/pmg-docs.links
@@ -0,0 +1 @@
+/usr/share/javascript/extjs /usr/share/pmg-docs/api-viewer/extjs
-- 
2.20.1




More information about the pve-devel mailing list