From 52825ae71da9b4c76604b66e148c0fd6d116868a Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 3 Dec 2020 12:58:58 +0100
Subject: [PATCH] admin-lte moved to npm dependency
---
smash/package-lock.json | 5 +++++
smash/package.json | 1 +
smash/smash/settings.py | 1 +
smash/web/templates/_base.html | 6 +++---
smash/web/templates/errors/400.html | 4 ++--
smash/web/templates/errors/403.html | 4 ++--
smash/web/templates/errors/404.html | 4 ++--
smash/web/templates/errors/500.html | 4 ++--
smash/web/templates/login.html | 4 ++--
9 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/smash/package-lock.json b/smash/package-lock.json
index 9469792b..763f8cd6 100644
--- a/smash/package-lock.json
+++ b/smash/package-lock.json
@@ -24,6 +24,11 @@
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
},
+ "admin-lte": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/admin-lte/-/admin-lte-2.3.7.tgz",
+ "integrity": "sha1-kSNpSWMdXaAJnz8p4QOBTutJMyY="
+ },
"amdefine": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
diff --git a/smash/package.json b/smash/package.json
index 20b5699e..0569832c 100644
--- a/smash/package.json
+++ b/smash/package.json
@@ -9,6 +9,7 @@
"author": "",
"license": "ISC",
"dependencies": {
+ "admin-lte": "^2.3.7",
"awesomplete": "^1.1.5",
"bootstrap": "^3.3.6",
"datatables.net-bs": "^1.10.22",
diff --git a/smash/smash/settings.py b/smash/smash/settings.py
index 6e3b2d31..23fb2676 100644
--- a/smash/smash/settings.py
+++ b/smash/smash/settings.py
@@ -119,6 +119,7 @@ STATICFILES_FINDERS = [
]
NPM_FILE_PATTERNS = {
+ 'admin-lte': ['dist/*', 'LICENSE'],
'awesomplete': ['awesomplete.css', 'awesomplete.css.map', 'awesomplete.min.js', 'awesomplete.min.js.map'],
'bootstrap': ['dist/*', 'LICENSE'],
'datatables.net': ['js/*', 'License.txt'],
diff --git a/smash/web/templates/_base.html b/smash/web/templates/_base.html
index 374ddf1b..bf43bae1 100644
--- a/smash/web/templates/_base.html
+++ b/smash/web/templates/_base.html
@@ -18,9 +18,9 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
<!-- Theme style -->
- <link rel="stylesheet" href="{% static 'AdminLTE/css/AdminLTE.min.css' %}">
+ <link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}">
- <link rel="stylesheet" href="{% static 'AdminLTE/css/skins/skin-green.min.css' %}">
+ <link rel="stylesheet" href="{% static 'admin-lte/dist/css/skins/skin-green.min.css' %}">
<link rel="stylesheet" href="{% static 'css/smash.css' %}">
@@ -363,7 +363,7 @@ desired effect
<!-- Bootstrap 3.3.6 -->
<script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script>
<!-- AdminLTE Template Helpers (for example- left side bar) -->
- <script src="{% static 'AdminLTE/js/app.min.js' %}"></script>
+ <script src="{% static 'admin-lte/dist/js/app.min.js' %}"></script>
<!-- Smash js -->
<script src="{% static 'js/smash.js' %}"></script>
<script src="{% static 'js/custom_modernizr.min.js' %}"></script>
diff --git a/smash/web/templates/errors/400.html b/smash/web/templates/errors/400.html
index c49a0381..44bb24cc 100644
--- a/smash/web/templates/errors/400.html
+++ b/smash/web/templates/errors/400.html
@@ -18,9 +18,9 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
<!-- Theme style -->
- <link rel="stylesheet" href="{% static 'AdminLTE/css/AdminLTE.min.css' %}">
+ <link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}">
- <link rel="stylesheet" href="{% static 'AdminLTE/css/skins/skin-green.min.css' %}">
+ <link rel="stylesheet" href="{% static 'admin-lte/dist/css/skins/skin-green.min.css' %}">
<!-- iCheck -->
<link rel="stylesheet" href="{% static 'icheck/skins/square/blue.css' %}">
diff --git a/smash/web/templates/errors/403.html b/smash/web/templates/errors/403.html
index 284739fc..4aaff5b2 100644
--- a/smash/web/templates/errors/403.html
+++ b/smash/web/templates/errors/403.html
@@ -18,9 +18,9 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
<!-- Theme style -->
- <link rel="stylesheet" href="{% static 'AdminLTE/css/AdminLTE.min.css' %}">
+ <link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}">
- <link rel="stylesheet" href="{% static 'AdminLTE/css/skins/skin-green.min.css' %}">
+ <link rel="stylesheet" href="{% static 'admin-lte/dist/css/skins/skin-green.min.css' %}">
<!-- iCheck -->
<link rel="stylesheet" href="{% static 'icheck/skins/square/blue.css' %}">
diff --git a/smash/web/templates/errors/404.html b/smash/web/templates/errors/404.html
index dd763f3f..ca200cb9 100644
--- a/smash/web/templates/errors/404.html
+++ b/smash/web/templates/errors/404.html
@@ -18,9 +18,9 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
<!-- Theme style -->
- <link rel="stylesheet" href="{% static 'AdminLTE/css/AdminLTE.min.css' %}">
+ <link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}">
- <link rel="stylesheet" href="{% static 'AdminLTE/css/skins/skin-green.min.css' %}">
+ <link rel="stylesheet" href="{% static 'admin-lte/dist/css/skins/skin-green.min.css' %}">
<!-- iCheck -->
<link rel="stylesheet" href="{% static 'icheck/skins/square/blue.css' %}">
diff --git a/smash/web/templates/errors/500.html b/smash/web/templates/errors/500.html
index 0ea6e283..cde528cf 100644
--- a/smash/web/templates/errors/500.html
+++ b/smash/web/templates/errors/500.html
@@ -18,9 +18,9 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
<!-- Theme style -->
- <link rel="stylesheet" href="{% static 'AdminLTE/css/AdminLTE.min.css' %}">
+ <link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}">
- <link rel="stylesheet" href="{% static 'AdminLTE/css/skins/skin-green.min.css' %}">
+ <link rel="stylesheet" href="{% static 'admin-lte/dist/css/skins/skin-green.min.css' %}">
<!-- iCheck -->
<link rel="stylesheet" href="{% static 'icheck/skins/square/blue.css' %}">
diff --git a/smash/web/templates/login.html b/smash/web/templates/login.html
index 4bef194a..73d014ba 100644
--- a/smash/web/templates/login.html
+++ b/smash/web/templates/login.html
@@ -21,9 +21,9 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
<!-- Theme style -->
- <link rel="stylesheet" href="{% static 'AdminLTE/css/AdminLTE.min.css' %}">
+ <link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}">
- <link rel="stylesheet" href="{% static 'AdminLTE/css/skins/skin-green.min.css' %}">
+ <link rel="stylesheet" href="{% static 'admin-lte/dist/css/skins/skin-green.min.css' %}">
<!-- iCheck -->
<link rel="stylesheet" href="{% static 'icheck/skins/square/blue.css' %}">
--
GitLab