From c5bfcd57fb29486d52b93412ac221ba51661e855 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 3 Dec 2020 14:11:50 +0100
Subject: [PATCH] ionicons moved to npm dependency
---
smash/package-lock.json | 5 +++++
smash/package.json | 1 +
smash/smash/settings.py | 1 +
smash/web/templates/_base.html | 2 +-
smash/web/templates/errors/400.html | 2 +-
smash/web/templates/errors/403.html | 2 +-
smash/web/templates/errors/404.html | 2 +-
smash/web/templates/errors/500.html | 2 +-
smash/web/templates/login.html | 2 +-
9 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/smash/package-lock.json b/smash/package-lock.json
index 8c987b3a..28b1e784 100644
--- a/smash/package-lock.json
+++ b/smash/package-lock.json
@@ -627,6 +627,11 @@
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
},
+ "ionicons": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-2.0.1.tgz",
+ "integrity": "sha1-yjmBEyk+qHAkT1OPCqu9S1sgmj4="
+ },
"is-arguments": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
diff --git a/smash/package.json b/smash/package.json
index e3977ac8..d0f1b7f9 100644
--- a/smash/package.json
+++ b/smash/package.json
@@ -22,6 +22,7 @@
"fullcalendar-scheduler": "^1.6.2",
"html2canvas": "^0.5.0-beta3",
"icheck": "^1.0.2",
+ "ionicons": "^2.0.1",
"jquery": "^2.2.4",
"jquery-ui-dist": "^1.12.1",
"jspdf": "^1.3.2",
diff --git a/smash/smash/settings.py b/smash/smash/settings.py
index 1ae581e5..bcc183d4 100644
--- a/smash/smash/settings.py
+++ b/smash/smash/settings.py
@@ -133,6 +133,7 @@ NPM_FILE_PATTERNS = {
'fullcalendar-scheduler': ['dist/*', 'LICENSE.md'],
'html2canvas': ['dist/*', 'LICENSE'],
'icheck': ['skins/*', 'icheck*'],
+ 'ionicons': ['css/*', 'fonts/*', 'less/*', 'png/*', 'scss/*', 'LICENSE'],
'jquery': ['dist/*'],
'jquery-ui-dist': ['jquery-ui*', 'LICENSE.txt'],
'jspdf': ['dist/*'],
diff --git a/smash/web/templates/_base.html b/smash/web/templates/_base.html
index 83cb1207..772e5d30 100644
--- a/smash/web/templates/_base.html
+++ b/smash/web/templates/_base.html
@@ -14,7 +14,7 @@
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}">
<!-- Ionicons -->
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
+ <link rel="stylesheet" href="{% static 'ionicons/css/ionicons.min.css'%}">
<!-- Theme style -->
<link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}">
diff --git a/smash/web/templates/errors/400.html b/smash/web/templates/errors/400.html
index b66a17b4..0774e5d3 100644
--- a/smash/web/templates/errors/400.html
+++ b/smash/web/templates/errors/400.html
@@ -14,7 +14,7 @@
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}">
<!-- Ionicons -->
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
+ <link rel="stylesheet" href="{% static 'ionicons/css/ionicons.min.css'%}">
<!-- Theme style -->
<link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}">
diff --git a/smash/web/templates/errors/403.html b/smash/web/templates/errors/403.html
index aff09e48..ac6729fd 100644
--- a/smash/web/templates/errors/403.html
+++ b/smash/web/templates/errors/403.html
@@ -14,7 +14,7 @@
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}">
<!-- Ionicons -->
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
+ <link rel="stylesheet" href="{% static 'ionicons/css/ionicons.min.css'%}">
<!-- Theme style -->
<link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}">
diff --git a/smash/web/templates/errors/404.html b/smash/web/templates/errors/404.html
index 1f6549ee..d9a93201 100644
--- a/smash/web/templates/errors/404.html
+++ b/smash/web/templates/errors/404.html
@@ -14,7 +14,7 @@
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}">
<!-- Ionicons -->
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
+ <link rel="stylesheet" href="{% static 'ionicons/css/ionicons.min.css'%}">
<!-- Theme style -->
<link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}">
diff --git a/smash/web/templates/errors/500.html b/smash/web/templates/errors/500.html
index d9ed90f5..a493753a 100644
--- a/smash/web/templates/errors/500.html
+++ b/smash/web/templates/errors/500.html
@@ -14,7 +14,7 @@
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}">
<!-- Ionicons -->
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
+ <link rel="stylesheet" href="{% static 'ionicons/css/ionicons.min.css'%}">
<!-- Theme style -->
<link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}">
diff --git a/smash/web/templates/login.html b/smash/web/templates/login.html
index ee042ac7..575c85db 100644
--- a/smash/web/templates/login.html
+++ b/smash/web/templates/login.html
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}">
<!-- Ionicons -->
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
+ <link rel="stylesheet" href="{% static 'ionicons/css/ionicons.min.css'%}">
<!-- Theme style -->
<link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}">
--
GitLab