diff --git a/requirements.txt b/requirements.txt index cadf381fc5f69e983f49178d7fe172f60ecdf0fe..67337655771a0be6d06957c79e3894c41ef32d1e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,6 +14,7 @@ django-common-helpers==0.9.2 django-cron==0.5.1 django-excel==0.0.10 django-formtools==2.2 +django-npm==1.0.0 django-otp==1.0.2 django-phonenumber-field==5.0.0 django-stronghold==0.4.0 @@ -60,4 +61,4 @@ whitenoise==5.2.0 xlrd==1.2.0 xlwt==1.3.0 parameterized==0.7.4 -setuptools==50.3.2 \ No newline at end of file +setuptools==50.3.2 diff --git a/smash/smash/settings.py b/smash/smash/settings.py index bcc183d47c9a5ad5abe73de810782b498f4e413a..dac4ff04958ae4b5d11e048e398b886be92895de 100644 --- a/smash/smash/settings.py +++ b/smash/smash/settings.py @@ -179,3 +179,5 @@ if not SERVE_STATIC: if FORCE_2FA: MIDDLEWARE.append('smash.middleware.force_2fa_middleware.Force2FAMiddleware') + +NPM_STATIC_FILES_PREFIX = 'npm' diff --git a/smash/web/templates/_base.html b/smash/web/templates/_base.html index 772e5d307c38f3d04bb4ff4fb936e0960b1dcd2c..300e209ac60774406d2bf7b8b0d19378b40379c0 100644 --- a/smash/web/templates/_base.html +++ b/smash/web/templates/_base.html @@ -8,22 +8,22 @@ {% block styles %} <!-- Bootstrap 3.3.6 --> - <link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/bootstrap/dist/css/bootstrap.min.css' %}"> <!-- Font Awesome --> - <link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}"> + <link rel="stylesheet" href="{% static 'npm/font-awesome/css/font-awesome.min.css'%}"> <!-- Ionicons --> - <link rel="stylesheet" href="{% static 'ionicons/css/ionicons.min.css'%}"> + <link rel="stylesheet" href="{% static 'npm/ionicons/css/ionicons.min.css'%}"> <!-- Theme style --> - <link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/admin-lte/dist/css/AdminLTE.min.css' %}"> - <link rel="stylesheet" href="{% static 'admin-lte/dist/css/skins/skin-green.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/admin-lte/dist/css/skins/skin-green.min.css' %}"> <link rel="stylesheet" href="{% static 'css/smash.css' %}"> - <link rel="stylesheet" href="{% static 'jquery-ui-dist/jquery-ui.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/jquery-ui-dist/jquery-ui.min.css' %}"> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> @@ -359,16 +359,16 @@ desired effect {% block scripts %} <!-- jQuery 2.2.3 --> - <script src="{% static 'jquery/dist/jquery.min.js' %}"></script> - <script src="{% static 'jquery-ui-dist/jquery-ui.min.js' %}"></script> + <script src="{% static 'npm/jquery/dist/jquery.min.js' %}"></script> + <script src="{% static 'npm/jquery-ui-dist/jquery-ui.min.js' %}"></script> <!-- Bootstrap 3.3.6 --> - <script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script> + <script src="{% static 'npm/bootstrap/dist/js/bootstrap.min.js' %}"></script> <!-- AdminLTE Template Helpers (for example- left side bar) --> - <script src="{% static 'admin-lte/dist/js/app.min.js' %}"></script> + <script src="{% static 'npm/admin-lte/dist/js/app.min.js' %}"></script> <!-- Smash js --> <script src="{% static 'js/smash.js' %}"></script> - <script src="{% static 'moment/min/moment.min.js' %}"></script> - <script src="{% static 'moment-range/dist/moment-range.js' %}"></script> + <script src="{% static 'npm/moment/min/moment.min.js' %}"></script> + <script src="{% static 'npm/moment-range/dist/moment-range.js' %}"></script> <script type="text/javascript"> window['moment-range'].extendMoment(moment); </script> diff --git a/smash/web/templates/appointment_types/add_edit.html b/smash/web/templates/appointment_types/add_edit.html index c0bfb10c4d8d05f466f4a70cf08cf6a25689676a..9c7f713297d7315737eea471de413c2c98523784 100644 --- a/smash/web/templates/appointment_types/add_edit.html +++ b/smash/web/templates/appointment_types/add_edit.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% endblock styles %} @@ -72,6 +72,6 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% endblock scripts %} \ No newline at end of file diff --git a/smash/web/templates/appointment_types/confirm_delete.html b/smash/web/templates/appointment_types/confirm_delete.html index 5a7cc8f9d70a24812f9d38224ce837bf5a725adf..14462c6f4db8688061277cdd846d6d486897755c 100644 --- a/smash/web/templates/appointment_types/confirm_delete.html +++ b/smash/web/templates/appointment_types/confirm_delete.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% endblock styles %} @@ -55,7 +55,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% endblock scripts %} diff --git a/smash/web/templates/appointment_types/index.html b/smash/web/templates/appointment_types/index.html index b1d5403260745ee43012966425faa7395085587f..dd7da8dbf937b1e07df6029b8d64ab8d87c2a0f2 100644 --- a/smash/web/templates/appointment_types/index.html +++ b/smash/web/templates/appointment_types/index.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> <style type="text/css"> .no_leave{ height: 100%; @@ -101,8 +101,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> $(function () { $('#table').DataTable({ diff --git a/smash/web/templates/appointments/add.html b/smash/web/templates/appointments/add.html index 2669c32fed38afe11234f496b9fb57505ce38f43..ef0cba858f3554df0e2b8c17004fb40b1444eaae 100644 --- a/smash/web/templates/appointments/add.html +++ b/smash/web/templates/appointments/add.html @@ -6,13 +6,13 @@ {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> <!-- fullCalendar 2.2.5--> - <link rel="stylesheet" href="{% static 'fullcalendar/dist/fullcalendar.min.css' %}"> - <link rel="stylesheet" href="{% static 'fullcalendar/dist/fullcalendar.print.css' %}" media="print"> + <link rel="stylesheet" href="{% static 'npm/fullcalendar/dist/fullcalendar.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/fullcalendar/dist/fullcalendar.print.css' %}" media="print"> <link rel="stylesheet" href="{% static 'css/fullcalendar_custom.print.css' %}" media="print" /> - <link rel="stylesheet" href="{% static 'fullcalendar-scheduler/dist/scheduler.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/fullcalendar-scheduler/dist/scheduler.min.css' %}"> <link rel="stylesheet" href="{% static 'css/daily_planning.css' %}"> {% include "includes/datetimepicker.css.html" %} @@ -132,13 +132,13 @@ New appointment for visit from {{visit_start}} to {{visit_end}} {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> - <script src="{% static 'moment/min/moment.min.js' %}"></script> - <script src="{% static 'moment-range/dist/moment-range.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/moment/min/moment.min.js' %}"></script> + <script src="{% static 'npm/moment-range/dist/moment-range.js' %}"></script> <script src="{% static 'js/appointment.js' %}"></script> - <script src="{% static 'fullcalendar/dist/fullcalendar.min.js' %}"></script> - <script src="{% static 'fullcalendar-scheduler/dist/scheduler.min.js' %}"></script> + <script src="{% static 'npm/fullcalendar/dist/fullcalendar.min.js' %}"></script> + <script src="{% static 'npm/fullcalendar-scheduler/dist/scheduler.min.js' %}"></script> <script> $(function () { $('#table').DataTable({ diff --git a/smash/web/templates/appointments/confirm_delete.html b/smash/web/templates/appointments/confirm_delete.html index 9786e079f84a36f8f7bbd12b47ae2fd462f569ba..fbbc2eb34fb632e363c08cd30b22df903585b7bd 100644 --- a/smash/web/templates/appointments/confirm_delete.html +++ b/smash/web/templates/appointments/confirm_delete.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% endblock styles %} @@ -55,7 +55,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% endblock scripts %} diff --git a/smash/web/templates/appointments/details.html b/smash/web/templates/appointments/details.html index 500dec2ce50bc29fc060c5cc78f98cdab5a84157..3a17f7844e03752ab29a3593b7d52d51dc52d2ac 100644 --- a/smash/web/templates/appointments/details.html +++ b/smash/web/templates/appointments/details.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% include "includes/datetimepicker.css.html" %} {% endblock styles %} @@ -72,8 +72,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> $(function () { $('#table').DataTable({ diff --git a/smash/web/templates/appointments/edit.html b/smash/web/templates/appointments/edit.html index 10158851c01735056fcdf64098b46aef456d83f7..12fe861dc802ff510cd272edbd6cfa9db83c5b4e 100644 --- a/smash/web/templates/appointments/edit.html +++ b/smash/web/templates/appointments/edit.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% include "includes/datetimepicker.css.html" %} <link rel="stylesheet" href="{% static 'css/appointment.css' %}"> @@ -151,8 +151,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script src="{% static 'js/appointment.js' %}"></script> <script> $(function () { diff --git a/smash/web/templates/appointments/index.html b/smash/web/templates/appointments/index.html index 515b8c07180591a2b87d26d7e3d95fb985a7a9af..00d02560abe885d845f98205250a3d218a970452 100644 --- a/smash/web/templates/appointments/index.html +++ b/smash/web/templates/appointments/index.html @@ -4,11 +4,11 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> <!-- fullCalendar 2.2.5--> - <link rel="stylesheet" href="{% static 'fullcalendar/dist/fullcalendar.min.css' %}"> - <link rel="stylesheet" href="{% static 'fullcalendar/dist/fullcalendar.print.css' %}" media="print"> + <link rel="stylesheet" href="{% static 'npm/fullcalendar/dist/fullcalendar.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/fullcalendar/dist/fullcalendar.print.css' %}" media="print"> {% endblock styles %} {% block ui_active_tab %}'appointments'{% endblock ui_active_tab %} @@ -67,9 +67,9 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> - <script src="{% static 'fullcalendar/dist/fullcalendar.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/fullcalendar/dist/fullcalendar.min.js' %}"></script> <script src="{% static 'js/appointment.js' %}"></script> <script> diff --git a/smash/web/templates/appointments/list.html b/smash/web/templates/appointments/list.html index d9725c160f4fbe8fb6b6f9a604aeed898573e511..5130b17aa6337c9cafb7b7ed89f96ce60db10603 100644 --- a/smash/web/templates/appointments/list.html +++ b/smash/web/templates/appointments/list.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% endblock styles %} @@ -31,8 +31,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script src="{% static 'js/appointment.js' %}"></script> <script> diff --git a/smash/web/templates/configuration/index.html b/smash/web/templates/configuration/index.html index d1b9b18e2251e36879ee7d5d2b2b76638f07a139..7a970853578f832db93e75d4c8d42d1b5989d192 100644 --- a/smash/web/templates/configuration/index.html +++ b/smash/web/templates/configuration/index.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% endblock styles %} @@ -45,9 +45,9 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> - <script src="{% static 'moment/min/moment.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/moment/min/moment.min.js' %}"></script> <script> function update(id) { diff --git a/smash/web/templates/contact_attempt/add.html b/smash/web/templates/contact_attempt/add.html index 11bff1f1fba7aa230eaca48f5df18beaac2e6bdc..b250ab846c2e03fb1fd1df5f5f4a0ec7bffd524e 100644 --- a/smash/web/templates/contact_attempt/add.html +++ b/smash/web/templates/contact_attempt/add.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% include "includes/datepicker.css.html" %} {% endblock styles %} @@ -75,7 +75,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% include "includes/datetimepicker.js.html" %} {% endblock scripts %} diff --git a/smash/web/templates/contact_attempt/edit.html b/smash/web/templates/contact_attempt/edit.html index 9b564275ee74bf07da59073f816565265bdb96d1..1569923e7237cfc3e3f378c69b65599b2c528598 100644 --- a/smash/web/templates/contact_attempt/edit.html +++ b/smash/web/templates/contact_attempt/edit.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% include "includes/datepicker.css.html" %} {% endblock styles %} @@ -75,7 +75,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% include "includes/datetimepicker.js.html" %} {% endblock scripts %} diff --git a/smash/web/templates/custom_study_subject_field/add_edit.html b/smash/web/templates/custom_study_subject_field/add_edit.html index acb90ce6c0ae5a5ea8e1ea00c51ef50743cf49c4..fdf4634c8bb5597d9b596584b9c939ff624b8df4 100644 --- a/smash/web/templates/custom_study_subject_field/add_edit.html +++ b/smash/web/templates/custom_study_subject_field/add_edit.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% include "includes/datepicker.css.html" %} {% endblock styles %} @@ -76,7 +76,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% include "includes/datetimepicker.js.html" %} diff --git a/smash/web/templates/daily_planning.html b/smash/web/templates/daily_planning.html index 020d64428f81de0a1aaed33cc8ba1bcd767c1fbf..a39f83fd67cefebfdce812b489debb415cc6dee3 100644 --- a/smash/web/templates/daily_planning.html +++ b/smash/web/templates/daily_planning.html @@ -4,19 +4,19 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <script src="{% static 'jquery/dist/jquery.min.js' %}"></script> - <script src="{% static 'jquery-ui-dist/jquery-ui.min.js' %}"></script> - <link rel="stylesheet" href="{% static 'jquery-ui-dist/jquery-ui.min.css' %}"> - <link rel="stylesheet" href="{% static 'jquery-ui-dist/jquery-ui.theme.min.css' %}"> - <link rel="stylesheet" href="{% static 'jquery-ui-dist/jquery-ui.structure.min.css' %}"> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <script src="{% static 'npm/jquery/dist/jquery.min.js' %}"></script> + <script src="{% static 'npm/jquery-ui-dist/jquery-ui.min.js' %}"></script> + <link rel="stylesheet" href="{% static 'npm/jquery-ui-dist/jquery-ui.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/jquery-ui-dist/jquery-ui.theme.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/jquery-ui-dist/jquery-ui.structure.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> <!-- fullCalendar 2.2.5--> - <link rel="stylesheet" href="{% static 'fullcalendar/dist/fullcalendar.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/fullcalendar/dist/fullcalendar.min.css' %}"> <link rel="stylesheet" href="{% static 'css/fullcalendar_custom.print.css' %}" media="print" /> - <link rel="stylesheet" href="{% static 'fullcalendar-scheduler/dist/scheduler.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/fullcalendar-scheduler/dist/scheduler.min.css' %}"> <link rel="stylesheet" href="{% static 'css/daily_planning.css' %}"> <style type="text/css"> .role_label{ @@ -120,8 +120,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'fullcalendar/dist/fullcalendar.min.js' %}"></script> - <script src="{% static 'fullcalendar-scheduler/dist/scheduler.min.js' %}"></script> + <script src="{% static 'npm/fullcalendar/dist/fullcalendar.min.js' %}"></script> + <script src="{% static 'npm/fullcalendar-scheduler/dist/scheduler.min.js' %}"></script> <script> var resources_url = '{% url 'web.api.workers.daily_planning' %}'; var events_url = '{% url 'web.api.events_persist' %}'; @@ -137,8 +137,8 @@ </script> {% include "includes/datepicker.js.html" %} <script src="{% static 'js/daily_planning.js' %}"></script> - <script src="{% static 'jspdf/dist/jspdf.min.js' %}"></script> - <script src="{% static 'html2canvas/dist/html2canvas.min.js' %}"></script> + <script src="{% static 'npm/jspdf/dist/jspdf.min.js' %}"></script> + <script src="{% static 'npm/html2canvas/dist/html2canvas.min.js' %}"></script> {% endblock scripts %} diff --git a/smash/web/templates/doctors/add.html b/smash/web/templates/doctors/add.html index 73d52fc83da5c79d6bd11ee9229aa89f0753dcb3..a14d030bfa6ddb8cea2d103962f3fe0514dd13dc 100644 --- a/smash/web/templates/doctors/add.html +++ b/smash/web/templates/doctors/add.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> <style type="text/css"> .hidden_form_field{ display: none; @@ -73,7 +73,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> <script> // If ever to debug and thinking why it doesn't work => look if there is 'null' in data from API $.get("{% url 'web.api.specializations' %}", function (data) { diff --git a/smash/web/templates/doctors/add_holiday.html b/smash/web/templates/doctors/add_holiday.html index ebbb29f2013152e97723999b9d0cc16bf66789b4..63f441eb289a8baa9f3d12be9ed38d0bfae64ceb 100644 --- a/smash/web/templates/doctors/add_holiday.html +++ b/smash/web/templates/doctors/add_holiday.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} {% include "includes/datetimepicker.css.html" %} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> <style type="text/css"> .doctor_name { border-bottom: black 1px solid; diff --git a/smash/web/templates/doctors/change_password.html b/smash/web/templates/doctors/change_password.html index b5e7db709d0b9f403692b8a7d754fa3403b48b23..9859e915cf629580b52cd7bf7892e2f29b487d19 100644 --- a/smash/web/templates/doctors/change_password.html +++ b/smash/web/templates/doctors/change_password.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> <style type="text/css"> .hidden_form_field{ display: none; diff --git a/smash/web/templates/doctors/edit.html b/smash/web/templates/doctors/edit.html index 386b2960ed19ae26ca6e60928e5c48ee5d8c58a1..430d8a5732761679ea578b30945c00ffbf992101 100644 --- a/smash/web/templates/doctors/edit.html +++ b/smash/web/templates/doctors/edit.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> <style type="text/css"> .hidden_form_field{ display: none; @@ -174,8 +174,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> $(function () { $('#table').DataTable({ diff --git a/smash/web/templates/doctors/index.html b/smash/web/templates/doctors/index.html index 0b19b33a25032ae26facaed0533bce45e96606a1..5e20a8918630bfe30a0e52093017270abae25724 100644 --- a/smash/web/templates/doctors/index.html +++ b/smash/web/templates/doctors/index.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> <style type="text/css"> .no_leave{ height: 100%; @@ -132,8 +132,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> $(function () { $('#table').DataTable({ diff --git a/smash/web/templates/equipment_and_rooms/equipment/index.html b/smash/web/templates/equipment_and_rooms/equipment/index.html index c8f34dd85c5251c383581a5d054f27625fc0f54b..0c16dee168d454c73afea47d8479ccff2d643011 100644 --- a/smash/web/templates/equipment_and_rooms/equipment/index.html +++ b/smash/web/templates/equipment_and_rooms/equipment/index.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% endblock styles %} {% block ui_active_tab %}'equipment_items'{% endblock ui_active_tab %} @@ -74,8 +74,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> $(function () { diff --git a/smash/web/templates/equipment_and_rooms/flying_teams/add.html b/smash/web/templates/equipment_and_rooms/flying_teams/add.html index b73681c378cc790a81a8232998eb5d27bd63dc0f..09cc3d42c5d251526831ca8c0f8ded2d81d4ac7e 100644 --- a/smash/web/templates/equipment_and_rooms/flying_teams/add.html +++ b/smash/web/templates/equipment_and_rooms/flying_teams/add.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% endblock styles %} {% block ui_active_tab %}'equipment_and_rooms'{% endblock ui_active_tab %} diff --git a/smash/web/templates/equipment_and_rooms/flying_teams/edit.html b/smash/web/templates/equipment_and_rooms/flying_teams/edit.html index 54b7f69b9d319b764d0c4cadcf7e0df1f6cc85cf..5d1e3ea664a13327e1634dfeaed2dc9778370526 100644 --- a/smash/web/templates/equipment_and_rooms/flying_teams/edit.html +++ b/smash/web/templates/equipment_and_rooms/flying_teams/edit.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% endblock styles %} {% block ui_active_tab %}'equipment_and_rooms'{% endblock ui_active_tab %} diff --git a/smash/web/templates/equipment_and_rooms/flying_teams/index.html b/smash/web/templates/equipment_and_rooms/flying_teams/index.html index fe186674b41a0660ed108c62a379c6ef1c2e8528..cf5130e2a37fa5c303159dadd3ec3a3f962e2eb9 100644 --- a/smash/web/templates/equipment_and_rooms/flying_teams/index.html +++ b/smash/web/templates/equipment_and_rooms/flying_teams/index.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% endblock styles %} {% block ui_active_tab %}'flying_teams'{% endblock ui_active_tab %} @@ -54,8 +54,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> $(function () { diff --git a/smash/web/templates/equipment_and_rooms/rooms/index.html b/smash/web/templates/equipment_and_rooms/rooms/index.html index 0b7dad8fa0127bf94dc98282f0d721bd6736939b..de768710414cf3d42c32490e5b58856704be0605 100644 --- a/smash/web/templates/equipment_and_rooms/rooms/index.html +++ b/smash/web/templates/equipment_and_rooms/rooms/index.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% endblock styles %} {% block ui_active_tab %}'rooms'{% endblock ui_active_tab %} @@ -63,8 +63,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> $(function () { diff --git a/smash/web/templates/errors/400.html b/smash/web/templates/errors/400.html index 0774e5d309df3f544c9568fd99a00166ab88ea12..81842dc76f2025f80f0b54bb147becb9230eb2d6 100644 --- a/smash/web/templates/errors/400.html +++ b/smash/web/templates/errors/400.html @@ -8,21 +8,21 @@ <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 'bootstrap/dist/css/bootstrap.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/bootstrap/dist/css/bootstrap.min.css' %}"> <!-- Font Awesome --> - <link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}"> + <link rel="stylesheet" href="{% static 'npm/font-awesome/css/font-awesome.min.css'%}"> <!-- Ionicons --> - <link rel="stylesheet" href="{% static 'ionicons/css/ionicons.min.css'%}"> + <link rel="stylesheet" href="{% static 'npm/ionicons/css/ionicons.min.css'%}"> <!-- Theme style --> - <link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/admin-lte/dist/css/AdminLTE.min.css' %}"> - <link rel="stylesheet" href="{% static 'admin-lte/dist/css/skins/skin-green.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/admin-lte/dist/css/skins/skin-green.min.css' %}"> <!-- iCheck --> - <link rel="stylesheet" href="{% static 'icheck/skins/square/blue.css' %}"> + <link rel="stylesheet" href="{% static 'npm/icheck/skins/square/blue.css' %}"> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> @@ -62,12 +62,12 @@ {% block scripts %} <!-- jQuery 2.2.3 --> - <script src="{% static 'jquery/dist/jquery.min.js' %}"></script> + <script src="{% static 'npm/jquery/dist/jquery.min.js' %}"></script> <!-- Bootstrap 3.3.6 --> - <script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script> + <script src="{% static 'npm/bootstrap/dist/js/bootstrap.min.js' %}"></script> <!-- iCheck --> - <script src="{% static 'icheck/icheck.min.js' %}"></script> + <script src="{% static 'npm/icheck/icheck.min.js' %}"></script> <script> $(document).ready(function () { $('input').iCheck({ diff --git a/smash/web/templates/errors/403.html b/smash/web/templates/errors/403.html index ac6729fd3d40efeaf4e710ca07f3976ab2d80d94..312cb2921fe3006f08395c3d0a66f6f85f30924f 100644 --- a/smash/web/templates/errors/403.html +++ b/smash/web/templates/errors/403.html @@ -8,21 +8,21 @@ <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 'bootstrap/dist/css/bootstrap.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/bootstrap/dist/css/bootstrap.min.css' %}"> <!-- Font Awesome --> - <link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}"> + <link rel="stylesheet" href="{% static 'npm/font-awesome/css/font-awesome.min.css'%}"> <!-- Ionicons --> - <link rel="stylesheet" href="{% static 'ionicons/css/ionicons.min.css'%}"> + <link rel="stylesheet" href="{% static 'npm/ionicons/css/ionicons.min.css'%}"> <!-- Theme style --> - <link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/admin-lte/dist/css/AdminLTE.min.css' %}"> - <link rel="stylesheet" href="{% static 'admin-lte/dist/css/skins/skin-green.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/admin-lte/dist/css/skins/skin-green.min.css' %}"> <!-- iCheck --> - <link rel="stylesheet" href="{% static 'icheck/skins/square/blue.css' %}"> + <link rel="stylesheet" href="{% static 'npm/icheck/skins/square/blue.css' %}"> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> @@ -62,12 +62,12 @@ {% block scripts %} <!-- jQuery 2.2.3 --> - <script src="{% static 'jquery/dist/jquery.min.js' %}"></script> + <script src="{% static 'npm/jquery/dist/jquery.min.js' %}"></script> <!-- Bootstrap 3.3.6 --> - <script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script> + <script src="{% static 'npm/bootstrap/dist/js/bootstrap.min.js' %}"></script> <!-- iCheck --> - <script src="{% static 'icheck/icheck.min.js' %}"></script> + <script src="{% static 'npm/icheck/icheck.min.js' %}"></script> <script> $(document).ready(function () { $('input').iCheck({ diff --git a/smash/web/templates/errors/404.html b/smash/web/templates/errors/404.html index d9a932018b331102a8a6c9b7d024abff3823d241..cdca5e5f299ab48d5bbeaff2884db256e0da3e24 100644 --- a/smash/web/templates/errors/404.html +++ b/smash/web/templates/errors/404.html @@ -8,21 +8,21 @@ <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 'bootstrap/dist/css/bootstrap.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/bootstrap/dist/css/bootstrap.min.css' %}"> <!-- Font Awesome --> - <link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}"> + <link rel="stylesheet" href="{% static 'npm/font-awesome/css/font-awesome.min.css'%}"> <!-- Ionicons --> - <link rel="stylesheet" href="{% static 'ionicons/css/ionicons.min.css'%}"> + <link rel="stylesheet" href="{% static 'npm/ionicons/css/ionicons.min.css'%}"> <!-- Theme style --> - <link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/admin-lte/dist/css/AdminLTE.min.css' %}"> - <link rel="stylesheet" href="{% static 'admin-lte/dist/css/skins/skin-green.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/admin-lte/dist/css/skins/skin-green.min.css' %}"> <!-- iCheck --> - <link rel="stylesheet" href="{% static 'icheck/skins/square/blue.css' %}"> + <link rel="stylesheet" href="{% static 'npm/icheck/skins/square/blue.css' %}"> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> @@ -62,12 +62,12 @@ {% block scripts %} <!-- jQuery 2.2.3 --> - <script src="{% static 'jquery/dist/jquery.min.js' %}"></script> + <script src="{% static 'npm/jquery/dist/jquery.min.js' %}"></script> <!-- Bootstrap 3.3.6 --> - <script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script> + <script src="{% static 'npm/bootstrap/dist/js/bootstrap.min.js' %}"></script> <!-- iCheck --> - <script src="{% static 'icheck/icheck.min.js' %}"></script> + <script src="{% static 'npm/icheck/icheck.min.js' %}"></script> <script> $(document).ready(function () { $('input').iCheck({ diff --git a/smash/web/templates/errors/500.html b/smash/web/templates/errors/500.html index a493753ae34282c0a4bfc2c71d6dd0c5aee8a28e..dfaf9656efbfda6c44afaf47f612b3890331e97e 100644 --- a/smash/web/templates/errors/500.html +++ b/smash/web/templates/errors/500.html @@ -8,21 +8,21 @@ <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 'bootstrap/dist/css/bootstrap.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/bootstrap/dist/css/bootstrap.min.css' %}"> <!-- Font Awesome --> - <link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}"> + <link rel="stylesheet" href="{% static 'npm/font-awesome/css/font-awesome.min.css'%}"> <!-- Ionicons --> - <link rel="stylesheet" href="{% static 'ionicons/css/ionicons.min.css'%}"> + <link rel="stylesheet" href="{% static 'npm/ionicons/css/ionicons.min.css'%}"> <!-- Theme style --> - <link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/admin-lte/dist/css/AdminLTE.min.css' %}"> - <link rel="stylesheet" href="{% static 'admin-lte/dist/css/skins/skin-green.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/admin-lte/dist/css/skins/skin-green.min.css' %}"> <!-- iCheck --> - <link rel="stylesheet" href="{% static 'icheck/skins/square/blue.css' %}"> + <link rel="stylesheet" href="{% static 'npm/icheck/skins/square/blue.css' %}"> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> @@ -62,12 +62,12 @@ {% block scripts %} <!-- jQuery 2.2.3 --> - <script src="{% static 'jquery/dist/jquery.min.js' %}"></script> + <script src="{% static 'npm/jquery/dist/jquery.min.js' %}"></script> <!-- Bootstrap 3.3.6 --> - <script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script> + <script src="{% static 'npm/bootstrap/dist/js/bootstrap.min.js' %}"></script> <!-- iCheck --> - <script src="{% static 'icheck/icheck.min.js' %}"></script> + <script src="{% static 'npm/icheck/icheck.min.js' %}"></script> <script> $(document).ready(function () { $('input').iCheck({ diff --git a/smash/web/templates/export/index.html b/smash/web/templates/export/index.html index 0a6ba4e637d550b2d6cb4115a17a6a6d2e79d0b3..b5167042ca300519297d9f472c5f168b5be63b76 100644 --- a/smash/web/templates/export/index.html +++ b/smash/web/templates/export/index.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} <link rel="stylesheet" href="{% static 'css/export.css' %}"> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> <style type="text/css"> ul.list_of_fields{ columns: 3; @@ -124,8 +124,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> window.onload = function() { diff --git a/smash/web/templates/includes/datepicker.css.html b/smash/web/templates/includes/datepicker.css.html index 7bfd82c1558b39237eebab8934e10ee81d3ffa03..025d7acbb3bbe46350ce42faf410caf689945501 100644 --- a/smash/web/templates/includes/datepicker.css.html +++ b/smash/web/templates/includes/datepicker.css.html @@ -1,3 +1,3 @@ {% load static %} <!-- Bootstrap datepicker --> -<link rel="stylesheet" href="{% static 'bootstrap-datepicker/dist/css/bootstrap-datepicker3.min.css' %}"> +<link rel="stylesheet" href="{% static 'npm/bootstrap-datepicker/dist/css/bootstrap-datepicker3.min.css' %}"> diff --git a/smash/web/templates/includes/datepicker.js.html b/smash/web/templates/includes/datepicker.js.html index 3ddc9e12ff2bbb9581608ddf87e237ec10e30d2d..ee196b0e4cfa2798f29c44ce0ab939e058cfc106 100644 --- a/smash/web/templates/includes/datepicker.js.html +++ b/smash/web/templates/includes/datepicker.js.html @@ -1,5 +1,5 @@ {% load static %} -<script src="{% static 'bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js' %}"></script> +<script src="{% static 'npm/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js' %}"></script> <script> $(document).ready(function () { $(".datepicker").datepicker(); diff --git a/smash/web/templates/includes/datetimepicker.css.html b/smash/web/templates/includes/datetimepicker.css.html index bb17559b2c49d90852bdc222a9a5c13c4abceb44..1034b778bf8046c341edd4a1fe0f55a31b42d90b 100644 --- a/smash/web/templates/includes/datetimepicker.css.html +++ b/smash/web/templates/includes/datetimepicker.css.html @@ -1,4 +1,4 @@ {% load static %} <!-- Bootstrap datepicker --> <link rel="stylesheet" - href="{% static 'eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css' %}"> + href="{% static 'npm/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css' %}"> diff --git a/smash/web/templates/includes/datetimepicker.js.html b/smash/web/templates/includes/datetimepicker.js.html index a63bc437a6df42ad233381570ccd1a82f05f4725..d79382d13ec65d588c934bac54a10b776d5ad751 100644 --- a/smash/web/templates/includes/datetimepicker.js.html +++ b/smash/web/templates/includes/datetimepicker.js.html @@ -1,6 +1,6 @@ {% load static %} -<script src="{% static 'moment/min/moment.min.js' %}"></script> -<script src="{% static 'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js' %}"></script> +<script src="{% static 'npm/moment/min/moment.min.js' %}"></script> +<script src="{% static 'npm/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js' %}"></script> <script> $(document).ready(function () { $(".datetimepicker").datetimepicker({ diff --git a/smash/web/templates/languages/add_edit.html b/smash/web/templates/languages/add_edit.html index 9b5f2fef290bc20ef7b81998fa583bc07f0b0906..626a3b4d98c5cdbe1d6cd0a5b55376b371fd5cf4 100644 --- a/smash/web/templates/languages/add_edit.html +++ b/smash/web/templates/languages/add_edit.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% endblock styles %} @@ -72,6 +72,6 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% endblock scripts %} \ No newline at end of file diff --git a/smash/web/templates/languages/confirm_delete.html b/smash/web/templates/languages/confirm_delete.html index 9b57ea303feed9ee82dbdf7f5e4daefdc22eab11..d2dd23633e7acf047ac9a99ac4624dd77c9f2a2b 100644 --- a/smash/web/templates/languages/confirm_delete.html +++ b/smash/web/templates/languages/confirm_delete.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% endblock styles %} @@ -55,7 +55,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% endblock scripts %} diff --git a/smash/web/templates/languages/list.html b/smash/web/templates/languages/list.html index 0088350eb81ca336f48699a7254ff9fb6d6a45e2..cd6715f7f90d786fea422cd0f9e3ae6e8a11795f 100644 --- a/smash/web/templates/languages/list.html +++ b/smash/web/templates/languages/list.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% endblock styles %} {% block ui_active_tab %}'languages'{% endblock ui_active_tab %} @@ -58,8 +58,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> $(function () { diff --git a/smash/web/templates/login.html b/smash/web/templates/login.html index 575c85dbf01491d8865b8c20d21a4e1fb950b838..7197404104e72d0511a98db45385d292943f257e 100644 --- a/smash/web/templates/login.html +++ b/smash/web/templates/login.html @@ -11,21 +11,21 @@ <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 'bootstrap/dist/css/bootstrap.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/bootstrap/dist/css/bootstrap.min.css' %}"> <!-- Font Awesome --> - <link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css'%}"> + <link rel="stylesheet" href="{% static 'npm/font-awesome/css/font-awesome.min.css'%}"> <!-- Ionicons --> - <link rel="stylesheet" href="{% static 'ionicons/css/ionicons.min.css'%}"> + <link rel="stylesheet" href="{% static 'npm/ionicons/css/ionicons.min.css'%}"> <!-- Theme style --> - <link rel="stylesheet" href="{% static 'admin-lte/dist/css/AdminLTE.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/admin-lte/dist/css/AdminLTE.min.css' %}"> - <link rel="stylesheet" href="{% static 'admin-lte/dist/css/skins/skin-green.min.css' %}"> + <link rel="stylesheet" href="{% static 'npm/admin-lte/dist/css/skins/skin-green.min.css' %}"> <!-- iCheck --> - <link rel="stylesheet" href="{% static 'icheck/skins/square/blue.css' %}"> + <link rel="stylesheet" href="{% static 'npm/icheck/skins/square/blue.css' %}"> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> @@ -121,12 +121,12 @@ {% block scripts %} <!-- jQuery 2.2.3 --> - <script src="{% static 'jquery/dist/jquery.min.js' %}"></script> + <script src="{% static 'npm/jquery/dist/jquery.min.js' %}"></script> <!-- Bootstrap 3.3.6 --> - <script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script> + <script src="{% static 'npm/bootstrap/dist/js/bootstrap.min.js' %}"></script> <!-- iCheck --> - <script src="{% static 'icheck/icheck.min.js' %}"></script> + <script src="{% static 'npm/icheck/icheck.min.js' %}"></script> <script> $(document).ready(function () { $('input').iCheck({ diff --git a/smash/web/templates/mail_templates/add_edit.html b/smash/web/templates/mail_templates/add_edit.html index 609271a1cd81883c2d33adb620810a92ead7f74f..3e245aec96cd3f19f90aee4728ac4fbec4cb6d6c 100644 --- a/smash/web/templates/mail_templates/add_edit.html +++ b/smash/web/templates/mail_templates/add_edit.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> <style type="text/css"> .help_text{ margin-left: 5px; @@ -78,7 +78,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> <script type="text/javascript"> function should_be_checked(){ diff --git a/smash/web/templates/mail_templates/confirm_delete.html b/smash/web/templates/mail_templates/confirm_delete.html index 194e94a5551d68944f3e2e68ca53666849ccfd6d..a791abaa683baf9857570ec5c0637b4738558fc4 100644 --- a/smash/web/templates/mail_templates/confirm_delete.html +++ b/smash/web/templates/mail_templates/confirm_delete.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% endblock styles %} @@ -55,7 +55,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% endblock scripts %} diff --git a/smash/web/templates/mail_templates/list.html b/smash/web/templates/mail_templates/list.html index 9cbddda35f9253392774cdf94dc0004137c15a68..44d5d5636e67841ae2fec154b9c0beaab15687f4 100644 --- a/smash/web/templates/mail_templates/list.html +++ b/smash/web/templates/mail_templates/list.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% endblock styles %} {% block ui_active_tab %}'mail_templates'{% endblock ui_active_tab %} @@ -97,8 +97,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> $(function () { diff --git a/smash/web/templates/privacy_notice/add_edit.html b/smash/web/templates/privacy_notice/add_edit.html index 1adb6ead5536e6b719cb99df5cc9ef81d5e0361f..cbe846fde3f8a76026a1a0543b235ced2c44c6f9 100644 --- a/smash/web/templates/privacy_notice/add_edit.html +++ b/smash/web/templates/privacy_notice/add_edit.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> <style type="text/css"> .help_text{ margin-left: 5px; @@ -78,6 +78,6 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% endblock scripts %} \ No newline at end of file diff --git a/smash/web/templates/privacy_notice/confirm_delete.html b/smash/web/templates/privacy_notice/confirm_delete.html index 5d8cf0d6c113a8b78668d309ee2d87c043438475..27e3e36f248e3abf7e9ee446da6b7ecca65cda95 100644 --- a/smash/web/templates/privacy_notice/confirm_delete.html +++ b/smash/web/templates/privacy_notice/confirm_delete.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% endblock styles %} @@ -55,7 +55,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% endblock scripts %} diff --git a/smash/web/templates/privacy_notice/list.html b/smash/web/templates/privacy_notice/list.html index 2c95958846a6dded63d8711cd4d4fb76195db64e..14bd536b48aeb1fd30b905197d29fc259432ef6f 100644 --- a/smash/web/templates/privacy_notice/list.html +++ b/smash/web/templates/privacy_notice/list.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% endblock styles %} {% block ui_active_tab %}'privacy_notices'{% endblock ui_active_tab %} @@ -74,8 +74,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> $(function () { diff --git a/smash/web/templates/provenance/list.html b/smash/web/templates/provenance/list.html index 4269e2eb4d3102501bf825fc114cec854c49aa5d..ed54212f494f1855b6c551c389aa92ceae9e3cfb 100644 --- a/smash/web/templates/provenance/list.html +++ b/smash/web/templates/provenance/list.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% endblock styles %} {% block ui_active_tab %}'provenance'{% endblock ui_active_tab %} @@ -43,8 +43,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> $(function () { diff --git a/smash/web/templates/redcap/inconsistent_subjects.html b/smash/web/templates/redcap/inconsistent_subjects.html index f15b8b04f07ab22816aff46d53cb9d3f9d659bfa..8321f6ca4ba077261198a3f908c4ef3b02d5e5fd 100644 --- a/smash/web/templates/redcap/inconsistent_subjects.html +++ b/smash/web/templates/redcap/inconsistent_subjects.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% endblock styles %} {% block ui_active_tab %}'subjects'{% endblock ui_active_tab %} @@ -54,8 +54,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> $(function () { $('#table').DataTable({ diff --git a/smash/web/templates/redcap/missing_subjects.html b/smash/web/templates/redcap/missing_subjects.html index 39e1a97e57f04a7f187bfe876716ec2015b7bf29..acb336b24b4c964182b5df13578843e92526cf2f 100644 --- a/smash/web/templates/redcap/missing_subjects.html +++ b/smash/web/templates/redcap/missing_subjects.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> <link rel="stylesheet" href="{% static 'css/redcap.css' %}"> {% endblock styles %} @@ -64,8 +64,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script src="{% static 'js/redcap.js' %}"></script> <script> $(function () { diff --git a/smash/web/templates/study/edit.html b/smash/web/templates/study/edit.html index 84e5bdd93fd3ee0fdfe678122b7ec02fc63d0ad8..4968cad482add209e0d40a769944ccb582864c35 100644 --- a/smash/web/templates/study/edit.html +++ b/smash/web/templates/study/edit.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% include "includes/datepicker.css.html" %} {% include "includes/datetimepicker.css.html" %} <style type="text/css"> @@ -282,8 +282,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> {% include "includes/datepicker.js.html" %} {% include "includes/datetimepicker.js.html" %} diff --git a/smash/web/templates/study_subject_list/edit.html b/smash/web/templates/study_subject_list/edit.html index a44df7052b0578a19d73182c722ba34af04c04c9..c1a860c847a8f75119c2daa9eb3bda292d96882b 100644 --- a/smash/web/templates/study_subject_list/edit.html +++ b/smash/web/templates/study_subject_list/edit.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% include "includes/datepicker.css.html" %} {% include "includes/datetimepicker.css.html" %} <style type="text/css"> @@ -154,8 +154,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> {% include "includes/datepicker.js.html" %} {% include "includes/datetimepicker.js.html" %} diff --git a/smash/web/templates/subject_import_data/edit.html b/smash/web/templates/subject_import_data/edit.html index 62f9fbecba73da03f223ae94f4cfcbd47d90689f..52225c671c7dd8052c97b378d205c214c7657b16 100644 --- a/smash/web/templates/subject_import_data/edit.html +++ b/smash/web/templates/subject_import_data/edit.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% include "includes/datepicker.css.html" %} {% endblock styles %} @@ -75,7 +75,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% include "includes/datetimepicker.js.html" %} {% endblock scripts %} diff --git a/smash/web/templates/subjects/add.html b/smash/web/templates/subjects/add.html index f4d47e0ebee5d2af80eafa1d8e90bfc57cd13bcb..07b9fdb9ac098f67e5804dd4e45fd0930783be85 100644 --- a/smash/web/templates/subjects/add.html +++ b/smash/web/templates/subjects/add.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% include "includes/datepicker.css.html" %} {% include "includes/datetimepicker.css.html" %} @@ -99,7 +99,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> <script> $(document).ready(function () { diff --git a/smash/web/templates/subjects/confirm_delete.html b/smash/web/templates/subjects/confirm_delete.html index a4548f6f4eb665c837023d617bfe70388a699060..25e0d583591c6148d846bde8b98be03c935ebf6a 100644 --- a/smash/web/templates/subjects/confirm_delete.html +++ b/smash/web/templates/subjects/confirm_delete.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> <style> table, th, td { border: 1px solid black; @@ -82,7 +82,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% endblock scripts %} diff --git a/smash/web/templates/subjects/confirm_delete_study_subject.html b/smash/web/templates/subjects/confirm_delete_study_subject.html index 618f278b9cf22c86cd9d782baead8e445b062001..1a2f54e14f1b1459591814677f83bebd0de4666b 100644 --- a/smash/web/templates/subjects/confirm_delete_study_subject.html +++ b/smash/web/templates/subjects/confirm_delete_study_subject.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> <style> table, th, td { border: 1px solid black; @@ -82,7 +82,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% endblock scripts %} diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html index 3d0e531f7562f657c60f8d179a053ebb6031fee5..f1142cb1eefdc53d8bb18b158f5c75067c9b7324 100644 --- a/smash/web/templates/subjects/edit.html +++ b/smash/web/templates/subjects/edit.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% include "includes/datepicker.css.html" %} {% include "includes/datetimepicker.css.html" %} @@ -200,8 +200,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> var confirmed = false; $(document).ready(function () { diff --git a/smash/web/templates/subjects/index.html b/smash/web/templates/subjects/index.html index a6336285758e241ea55462dde7b408f7c3b20019..907510d1034499e49f10f0990709a72dc83d3a7d 100644 --- a/smash/web/templates/subjects/index.html +++ b/smash/web/templates/subjects/index.html @@ -3,9 +3,9 @@ {% block styles %} {{ block.super }} - <script src="{% static 'moment/min/moment.min.js' %}"></script> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> - <link rel="stylesheet" href="{% static 'datatables.net-buttons-bs/css/buttons.bootstrap.css' %}"> + <script src="{% static 'npm/moment/min/moment.min.js' %}"></script> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-buttons-bs/css/buttons.bootstrap.css' %}"> <style type="text/css"> .box-body { overflow-x: scroll; @@ -87,15 +87,15 @@ {% block scripts %} {{ block.super }} - <script type="text/javascript" src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script type="text/javascript" src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> - <script type="text/javascript" src="{% static 'datatables.net-buttons/js/dataTables.buttons.min.js' %}"></script> - <script type="text/javascript" src="{% static 'datatables.net-buttons-bs/js/buttons.bootstrap.min.js' %}"></script> - <script type="text/javascript" src="{% static 'datatables.net-buttons/js/buttons.colVis.min.js' %}"></script> - <script type="text/javascript" src="{% static 'datatables.net-buttons/js/buttons.html5.min.js' %}"></script> - <script type="text/javascript" src="{% static 'jszip/dist/jszip.min.js' %}"></script> - <script type="text/javascript" src="{% static 'pdfmake/build/pdfmake.min.js' %}"></script> - <script type="text/javascript" src="{% static 'pdfmake/build/vfs_fonts.js' %}"></script> + <script type="text/javascript" src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script type="text/javascript" src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script type="text/javascript" src="{% static 'npm/datatables.net-buttons/js/dataTables.buttons.min.js' %}"></script> + <script type="text/javascript" src="{% static 'npm/datatables.net-buttons-bs/js/buttons.bootstrap.min.js' %}"></script> + <script type="text/javascript" src="{% static 'npm/datatables.net-buttons/js/buttons.colVis.min.js' %}"></script> + <script type="text/javascript" src="{% static 'npm/datatables.net-buttons/js/buttons.html5.min.js' %}"></script> + <script type="text/javascript" src="{% static 'npm/jszip/dist/jszip.min.js' %}"></script> + <script type="text/javascript" src="{% static 'npm/pdfmake/build/pdfmake.min.js' %}"></script> + <script type="text/javascript" src="{% static 'npm/pdfmake/build/vfs_fonts.js' %}"></script> <script type="text/javascript" src="{% static 'js/subject.js' %}"></script> <script> diff --git a/smash/web/templates/subjects/visit_details.html b/smash/web/templates/subjects/visit_details.html index 93630ee68c46bac24d692340d2d725bdbade0803..291e2da87006e3d61833b90d7c6699758104df0e 100644 --- a/smash/web/templates/subjects/visit_details.html +++ b/smash/web/templates/subjects/visit_details.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% endblock styles %} {% block ui_active_tab %}'subjects'{% endblock ui_active_tab %} @@ -146,7 +146,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> {% endblock scripts %} diff --git a/smash/web/templates/visit_import_data/edit.html b/smash/web/templates/visit_import_data/edit.html index 88657aa848cbc183a3fb5a1573a859044cf7fa67..015f88071d11ea4dc0fd95139fdf863ede2360b0 100644 --- a/smash/web/templates/visit_import_data/edit.html +++ b/smash/web/templates/visit_import_data/edit.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% include "includes/datepicker.css.html" %} {% endblock styles %} @@ -75,7 +75,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% include "includes/datetimepicker.js.html" %} {% endblock scripts %} diff --git a/smash/web/templates/visits/details.html b/smash/web/templates/visits/details.html index da219795ac775a5dd6c389812dc4136446bb642b..027c822de313c192d28351ef22ca0abf897c7943 100644 --- a/smash/web/templates/visits/details.html +++ b/smash/web/templates/visits/details.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> <style> .tooltip-inner { @@ -258,8 +258,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script src="{% static 'js/visit.js' %}"></script> <script> var default_visit_duration_in_months = parseInt("{{default_visit_duration}}"); diff --git a/smash/web/templates/visits/index.html b/smash/web/templates/visits/index.html index dc3ec1a8a9894bf971bdc4df145a6525940aa06e..64b897f076b689453ec9c057a0b1841b09a2f31a 100644 --- a/smash/web/templates/visits/index.html +++ b/smash/web/templates/visits/index.html @@ -5,7 +5,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% endblock styles %} @@ -32,8 +32,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script src="{% static 'js/visit.js' %}"></script> <script> diff --git a/smash/web/templates/voucher_partner_sessions/add_edit.html b/smash/web/templates/voucher_partner_sessions/add_edit.html index 4fd67f89347a1f300b576246687e238c689b1be7..8e2d40b283a8d45d219502ecfd6cf0227807b7a6 100644 --- a/smash/web/templates/voucher_partner_sessions/add_edit.html +++ b/smash/web/templates/voucher_partner_sessions/add_edit.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% include "includes/datepicker.css.html" %} {% include "includes/datetimepicker.css.html" %} @@ -74,7 +74,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% include "includes/datepicker.js.html" %} {% include "includes/datetimepicker.js.html" %} diff --git a/smash/web/templates/voucher_type_prices/add_edit.html b/smash/web/templates/voucher_type_prices/add_edit.html index 83305ef7c2411d771c587a1279f590e3eb4e9c8f..c7db83fe8a334b582408b75e41bae62db6e89e3c 100644 --- a/smash/web/templates/voucher_type_prices/add_edit.html +++ b/smash/web/templates/voucher_type_prices/add_edit.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% include "includes/datepicker.css.html" %} {% include "includes/datetimepicker.css.html" %} @@ -75,7 +75,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% include "includes/datepicker.js.html" %} {% include "includes/datetimepicker.js.html" %} diff --git a/smash/web/templates/voucher_types/add_edit.html b/smash/web/templates/voucher_types/add_edit.html index cb337d761f6df0b0cc28d91c2948f49655aa4ffd..0f601e44d10828f1a9ff27eebaec5eaef0acef71 100644 --- a/smash/web/templates/voucher_types/add_edit.html +++ b/smash/web/templates/voucher_types/add_edit.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> {% endblock styles %} @@ -109,6 +109,6 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> {% endblock scripts %} \ No newline at end of file diff --git a/smash/web/templates/voucher_types/list.html b/smash/web/templates/voucher_types/list.html index ef4258650ab5f84b59989b2d3119b80b5f94bb7c..e1e7acb997797f84ce0652b0c8ddeee4aa613351 100644 --- a/smash/web/templates/voucher_types/list.html +++ b/smash/web/templates/voucher_types/list.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% endblock styles %} {% block ui_active_tab %}'voucher_types'{% endblock ui_active_tab %} @@ -51,8 +51,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script> $(function () { diff --git a/smash/web/templates/vouchers/add_edit.html b/smash/web/templates/vouchers/add_edit.html index 905aef4f2a5c01fed517a9276018ca621561504d..92a51ae1fe2e15f924d59bf40827814a009d34d5 100644 --- a/smash/web/templates/vouchers/add_edit.html +++ b/smash/web/templates/vouchers/add_edit.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} - <link rel="stylesheet" href="{% static 'awesomplete/awesomplete.css' %}"/> + <link rel="stylesheet" href="{% static 'npm/awesomplete/awesomplete.css' %}"/> <style type="text/css"> .ui-datepicker-header { @@ -124,7 +124,7 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'awesomplete/awesomplete.min.js' %}"></script> + <script src="{% static 'npm/awesomplete/awesomplete.min.js' %}"></script> <script type="text/javascript"> $(".datepicker").datepicker({ dateFormat: 'yy-mm-dd' }); </script> diff --git a/smash/web/templates/vouchers/list.html b/smash/web/templates/vouchers/list.html index 9b40914dcad04fc90eeb235526130c8523c1cf40..24d17330ba658d7a3b14adae0ae98f0f41816864 100644 --- a/smash/web/templates/vouchers/list.html +++ b/smash/web/templates/vouchers/list.html @@ -4,7 +4,7 @@ {% block styles %} {{ block.super }} <!-- DataTables --> - <link rel="stylesheet" href="{% static 'datatables.net-bs/css/dataTables.bootstrap.css' %}"> + <link rel="stylesheet" href="{% static 'npm/datatables.net-bs/css/dataTables.bootstrap.css' %}"> {% endblock styles %} {% block ui_active_tab %}'vouchers'{% endblock ui_active_tab %} @@ -29,8 +29,8 @@ {% block scripts %} {{ block.super }} - <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script> - <script src="{% static 'datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> + <script src="{% static 'npm/datatables.net/js/jquery.dataTables.min.js' %}"></script> + <script src="{% static 'npm/datatables.net-bs/js/dataTables.bootstrap.min.js' %}"></script> <script src="{% static 'js/appointment.js' %}"></script> <script>