diff --git a/smash/package-lock.json b/smash/package-lock.json index 9469792b5a908f0dbd9b7a472a07424dd95cca63..763f8cd650e50626064a47e137e9476a6b2c0f2b 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 20b5699ec5351feaa9e1ce1d4ee70f556a68c9d8..0569832cb2770857772b25aea9c66b5a496d5145 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 6e3b2d31d74c635607e870bc238b7796d4c0115b..23fb267671f9d73a89c28afbc95ad47344f3ab74 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 374ddf1ba17e3bfd59fa80d1346b4f58a9f4bfd3..bf43bae1e7ec54947cc0736aebd3d3f41e040dd1 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 c49a0381819dc1b893bbc5376f011cad379dd582..44bb24cc9f6088a68785a5b32692cd7336c8c816 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 284739fcc54c8cfac1f39054b48085dafa3212ce..4aaff5b21de5f352fe01774cf0ebe58d85470568 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 dd763f3fe239784a6e07f4eec5a0d3b97a808bcc..ca200cb9f958f9bf0811c236e1f151f95bca9954 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 0ea6e283bc8fcbb7ba66d1bea31f8ba3ee21990d..cde528cfe533e0f8790ad9c53c5d1ef64d8bbc59 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 4bef194abfb83ec74df029a95b3998a0dab3359c..73d014baa3a956951975c88747991d247561ebdc 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' %}">