diff --git a/smash/package-lock.json b/smash/package-lock.json index ac07a32bb46daf04d430624f256883abdaa2f7c3..1f4675df2fa5c0716e4c39734955241d4e8e90e7 100644 --- a/smash/package-lock.json +++ b/smash/package-lock.json @@ -106,6 +106,11 @@ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz", "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=" }, + "bootstrap": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.6.tgz", + "integrity": "sha1-jej3SdyKdD8qxbUQ2Yg3Hj2qZYk=" + }, "brfs": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/brfs/-/brfs-2.0.2.tgz", diff --git a/smash/package.json b/smash/package.json index bc1c23e164816700e0c694be57e0e44a6bf3ac6d..9c106f53a84f8dba7b854349ca8de13710b284d4 100644 --- a/smash/package.json +++ b/smash/package.json @@ -10,6 +10,7 @@ "license": "ISC", "dependencies": { "awesomplete": "^1.1.5", + "bootstrap": "^3.3.6", "datatables.net-bs": "^1.10.22", "datatables.net-buttons": "^1.6.5", "datatables.net-buttons-bs": "^1.6.5", diff --git a/smash/smash/settings.py b/smash/smash/settings.py index 51d3d3c32bac8797ac77303a6fab770d77116a1c..ad755ee456ca96f360c6330c0a6f0217c453d0c2 100644 --- a/smash/smash/settings.py +++ b/smash/smash/settings.py @@ -120,6 +120,7 @@ STATICFILES_FINDERS = [ NPM_FILE_PATTERNS = { 'awesomplete': ['awesomplete.css', 'awesomplete.css.map', 'awesomplete.min.js', 'awesomplete.min.js.map'], + 'bootstrap': ['dist/*','LICENSE'], 'datatables.net': ['js/*', 'License.txt'], 'datatables.net-bs': ['css/*', 'js/*', 'License.txt'], 'datatables.net-buttons': ['js/*', 'License.txt'], diff --git a/smash/web/templates/_base.html b/smash/web/templates/_base.html index e9b4284076728b53b1b0138a2bd50a7cfae7dceb..3cc5c62dbb1d4cc6cabb288c3a82d7bb80646ccf 100644 --- a/smash/web/templates/_base.html +++ b/smash/web/templates/_base.html @@ -8,7 +8,7 @@ {% block styles %} <!-- Bootstrap 3.3.6 --> - <link rel="stylesheet" href="{% static 'AdminLTE/css/bootstrap.min.css' %}"> + <link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}"> <!-- Font Awesome --> <link rel="stylesheet" @@ -361,7 +361,7 @@ desired effect <script src="{% static 'jquery/dist/jquery.min.js' %}"></script> <script src="{% static 'jquery-ui-dist/jquery-ui.min.js' %}"></script> <!-- Bootstrap 3.3.6 --> - <script src="{% static 'AdminLTE/js/bootstrap.min.js' %}"></script> + <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> <!-- Smash js --> diff --git a/smash/web/templates/errors/400.html b/smash/web/templates/errors/400.html index d3125d01a229c05a15ba0d79895e67cd7e2cbfa1..702e1c5cecab153454833666b8addcdbb4d5b70c 100644 --- a/smash/web/templates/errors/400.html +++ b/smash/web/templates/errors/400.html @@ -8,7 +8,7 @@ <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport"> {% block styles %} <!-- Bootstrap 3.3.6 --> - <link rel="stylesheet" href="{% static 'AdminLTE/css/bootstrap.min.css' %}"> + <link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}"> <!-- Font Awesome --> <link rel="stylesheet" @@ -65,7 +65,7 @@ <!-- jQuery 2.2.3 --> <script src="{% static 'jquery/dist/jquery.min.js' %}"></script> <!-- Bootstrap 3.3.6 --> - <script src="{% static 'AdminLTE/js/bootstrap.min.js' %}"></script> + <script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script> <!-- iCheck --> <script src="{% static 'AdminLTE/plugins/iCheck/icheck.min.js' %}"></script> diff --git a/smash/web/templates/errors/403.html b/smash/web/templates/errors/403.html index 79bf544b297e85014be133b35450854d28af601b..a703a08ad55356f06c922d35c3481e7098383be4 100644 --- a/smash/web/templates/errors/403.html +++ b/smash/web/templates/errors/403.html @@ -8,7 +8,7 @@ <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport"> {% block styles %} <!-- Bootstrap 3.3.6 --> - <link rel="stylesheet" href="{% static 'AdminLTE/css/bootstrap.min.css' %}"> + <link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}"> <!-- Font Awesome --> <link rel="stylesheet" @@ -65,7 +65,7 @@ <!-- jQuery 2.2.3 --> <script src="{% static 'jquery/dist/jquery.min.js' %}"></script> <!-- Bootstrap 3.3.6 --> - <script src="{% static 'AdminLTE/js/bootstrap.min.js' %}"></script> + <script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script> <!-- iCheck --> <script src="{% static 'AdminLTE/plugins/iCheck/icheck.min.js' %}"></script> diff --git a/smash/web/templates/errors/404.html b/smash/web/templates/errors/404.html index ab4c4bc2f776ceb1b258ed5beebb71afbf48114d..11a864382efa23201ef7f9108c7c93cafa3930aa 100644 --- a/smash/web/templates/errors/404.html +++ b/smash/web/templates/errors/404.html @@ -8,7 +8,7 @@ <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport"> {% block styles %} <!-- Bootstrap 3.3.6 --> - <link rel="stylesheet" href="{% static 'AdminLTE/css/bootstrap.min.css' %}"> + <link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}"> <!-- Font Awesome --> <link rel="stylesheet" @@ -65,7 +65,7 @@ <!-- jQuery 2.2.3 --> <script src="{% static 'jquery/dist/jquery.min.js' %}"></script> <!-- Bootstrap 3.3.6 --> - <script src="{% static 'AdminLTE/js/bootstrap.min.js' %}"></script> + <script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script> <!-- iCheck --> <script src="{% static 'AdminLTE/plugins/iCheck/icheck.min.js' %}"></script> diff --git a/smash/web/templates/errors/500.html b/smash/web/templates/errors/500.html index e1c61a784775707ec054c65834edc876b3e6c1b1..7b2b513c261fef6d1dc0567ee12efa218774e701 100644 --- a/smash/web/templates/errors/500.html +++ b/smash/web/templates/errors/500.html @@ -8,7 +8,7 @@ <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport"> {% block styles %} <!-- Bootstrap 3.3.6 --> - <link rel="stylesheet" href="{% static 'AdminLTE/css/bootstrap.min.css' %}"> + <link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}"> <!-- Font Awesome --> <link rel="stylesheet" @@ -65,7 +65,7 @@ <!-- jQuery 2.2.3 --> <script src="{% static 'jquery/dist/jquery.min.js' %}"></script> <!-- Bootstrap 3.3.6 --> - <script src="{% static 'AdminLTE/js/bootstrap.min.js' %}"></script> + <script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script> <!-- iCheck --> <script src="{% static 'AdminLTE/plugins/iCheck/icheck.min.js' %}"></script> diff --git a/smash/web/templates/login.html b/smash/web/templates/login.html index ac615ddf47a4827dd759f11fe6e3ed1403bc4c11..1bbc14685132ccefe00d8cf6201769d2b4348a36 100644 --- a/smash/web/templates/login.html +++ b/smash/web/templates/login.html @@ -11,7 +11,7 @@ <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport"> {% block styles %} <!-- Bootstrap 3.3.6 --> - <link rel="stylesheet" href="{% static 'AdminLTE/css/bootstrap.min.css' %}"> + <link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}"> <!-- Font Awesome --> <link rel="stylesheet" @@ -124,7 +124,7 @@ <!-- jQuery 2.2.3 --> <script src="{% static 'jquery/dist/jquery.min.js' %}"></script> <!-- Bootstrap 3.3.6 --> - <script src="{% static 'AdminLTE/js/bootstrap.min.js' %}"></script> + <script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script> <!-- iCheck --> <script src="{% static 'AdminLTE/plugins/iCheck/icheck.min.js' %}"></script>