knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kris...@apache.org
Subject [knox] branch master updated: KNOX-1731 - Gateway Admin UI should not include external js/css
Date Tue, 08 Jan 2019 21:16:25 GMT
This is an automated email from the ASF dual-hosted git repository.

krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git


The following commit(s) were added to refs/heads/master by this push:
     new 20b0a38  KNOX-1731 - Gateway Admin UI should not include external js/css
20b0a38 is described below

commit 20b0a38b6b93d5a5b91085a6c7d6695b5b1ddd79
Author: Kevin Risden <krisden@apache.org>
AuthorDate: Tue Jan 8 15:09:03 2019 -0500

    KNOX-1731 - Gateway Admin UI should not include external js/css
    
    Signed-off-by: Kevin Risden <krisden@apache.org>
---
 gateway-admin-ui/admin-ui/index.html | 17 -----------------
 gateway-admin-ui/angular-cli.json    |  3 +++
 gateway-admin-ui/package-lock.json   |  7 +++----
 gateway-admin-ui/package.json        |  2 +-
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/gateway-admin-ui/admin-ui/index.html b/gateway-admin-ui/admin-ui/index.html
index 0c8549e..7dac51f 100644
--- a/gateway-admin-ui/admin-ui/index.html
+++ b/gateway-admin-ui/admin-ui/index.html
@@ -20,25 +20,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="icon" type="image/x-icon" href="favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <!-- Latest compiled and minified CSS -->
-    <link rel="stylesheet"
-          href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
-          integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
-          crossorigin="anonymous">
-
-    <!-- Optional theme -->
-    <link rel="stylesheet"
-          href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css"
-          integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp"
-          crossorigin="anonymous">
     <!-- Custom styles for this template -->
     <link href="assets/sticky-footer.css" rel="stylesheet">
-
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js"></script>
-    <!-- Latest compiled and minified JavaScript -->
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"
-            integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
-            crossorigin="anonymous"></script>
     <script src="assets/vkbeautify.js"></script>
 </head>
 <body>
diff --git a/gateway-admin-ui/angular-cli.json b/gateway-admin-ui/angular-cli.json
index 9189548..60b37e5 100644
--- a/gateway-admin-ui/angular-cli.json
+++ b/gateway-admin-ui/angular-cli.json
@@ -18,9 +18,12 @@
       "prefix": "app",
       "mobile": false,
       "styles": [
+        "../node_modules/bootstrap/dist/css/bootstrap.min.css",
         "styles.css"
       ],
       "scripts": [
+        "../node_modules/jquery/dist/jquery.min.js",
+        "../node_modules/bootstrap/dist/js/bootstrap.js",
         "../node_modules/ace-builds/src-min/ace.js",
         "../node_modules/ace-builds/src-min/theme-monokai.js"
       ],
diff --git a/gateway-admin-ui/package-lock.json b/gateway-admin-ui/package-lock.json
index 6a14691..b831c73 100644
--- a/gateway-admin-ui/package-lock.json
+++ b/gateway-admin-ui/package-lock.json
@@ -938,10 +938,9 @@
       }
     },
     "bootstrap": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.0.tgz",
-      "integrity": "sha512-F1yTDO9OHKH0xjl03DsOe8Nu1OWBIeAugGMhy3UTIYDdbbIPesQIhCEbj+HEr6wqlwweGAlP8F3OBC6kEuhFuw==",
-      "dev": true
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz",
+      "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E="
     },
     "brace": {
       "version": "0.10.0",
diff --git a/gateway-admin-ui/package.json b/gateway-admin-ui/package.json
index 4147929..cafb942 100644
--- a/gateway-admin-ui/package.json
+++ b/gateway-admin-ui/package.json
@@ -18,6 +18,7 @@
     "@angular/platform-browser": "^5.0.0",
     "@angular/platform-browser-dynamic": "^5.0.0",
     "@angular/router": "^5.0.0",
+    "bootstrap": "3.3.7",
     "core-js": "^2.4.1",
     "jquery": ">=3.0.0",
     "js-yaml": "^3.10.0",
@@ -37,7 +38,6 @@
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
     "codelyzer": "^4.1.0",
-    "bootstrap": "^3.3.7",
     "ts-node": "~3.2.0",
     "tslint": "~5.7.0",
     "typescript": "~2.4.2",


Mime
View raw message