diff --git a/reNgine/settings.py b/reNgine/settings.py index c5fb6239..146e220e 100644 --- a/reNgine/settings.py +++ b/reNgine/settings.py @@ -25,7 +25,8 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'dashboard.apps.DashboardConfig' + 'dashboard.apps.DashboardConfig', + 'targetApp.apps.TargetappConfig', ] MIDDLEWARE = [ diff --git a/reNgine/urls.py b/reNgine/urls.py index b13f84b6..4f238750 100644 --- a/reNgine/urls.py +++ b/reNgine/urls.py @@ -3,5 +3,6 @@ from django.urls import path, include urlpatterns = [ path('admin/', admin.site.urls), - path('', include('dashboard.urls')) + path('', include('dashboard.urls')), + path('target/', include('targetApp.urls')), ] diff --git a/static/.DS_Store b/static/.DS_Store index 63f0081a..2cba95a1 100644 Binary files a/static/.DS_Store and b/static/.DS_Store differ diff --git a/static/css/apps/contacts.css b/static/assets/css/apps/contacts.css similarity index 100% rename from static/css/apps/contacts.css rename to static/assets/css/apps/contacts.css diff --git a/static/css/apps/invoice.css b/static/assets/css/apps/invoice.css similarity index 100% rename from static/css/apps/invoice.css rename to static/assets/css/apps/invoice.css diff --git a/static/css/apps/mailbox.css b/static/assets/css/apps/mailbox.css similarity index 100% rename from static/css/apps/mailbox.css rename to static/assets/css/apps/mailbox.css diff --git a/static/css/apps/mailing-chat.css b/static/assets/css/apps/mailing-chat.css similarity index 100% rename from static/css/apps/mailing-chat.css rename to static/assets/css/apps/mailing-chat.css diff --git a/static/css/apps/notes.css b/static/assets/css/apps/notes.css similarity index 100% rename from static/css/apps/notes.css rename to static/assets/css/apps/notes.css diff --git a/static/css/apps/scrumboard.css b/static/assets/css/apps/scrumboard.css similarity index 100% rename from static/css/apps/scrumboard.css rename to static/assets/css/apps/scrumboard.css diff --git a/static/css/apps/todolist.css b/static/assets/css/apps/todolist.css similarity index 100% rename from static/css/apps/todolist.css rename to static/assets/css/apps/todolist.css diff --git a/static/css/authentication/form-1.css b/static/assets/css/authentication/form-1.css similarity index 100% rename from static/css/authentication/form-1.css rename to static/assets/css/authentication/form-1.css diff --git a/static/css/authentication/form-2.css b/static/assets/css/authentication/form-2.css similarity index 100% rename from static/css/authentication/form-2.css rename to static/assets/css/authentication/form-2.css diff --git a/static/css/components/cards/card.css b/static/assets/css/components/cards/card.css similarity index 100% rename from static/css/components/cards/card.css rename to static/assets/css/components/cards/card.css diff --git a/static/css/components/custom-carousel.css b/static/assets/css/components/custom-carousel.css similarity index 100% rename from static/css/components/custom-carousel.css rename to static/assets/css/components/custom-carousel.css diff --git a/static/css/components/custom-countdown.css b/static/assets/css/components/custom-countdown.css similarity index 100% rename from static/css/components/custom-countdown.css rename to static/assets/css/components/custom-countdown.css diff --git a/static/css/components/custom-counter.css b/static/assets/css/components/custom-counter.css similarity index 100% rename from static/css/components/custom-counter.css rename to static/assets/css/components/custom-counter.css diff --git a/static/css/components/custom-list-group.css b/static/assets/css/components/custom-list-group.css similarity index 100% rename from static/css/components/custom-list-group.css rename to static/assets/css/components/custom-list-group.css diff --git a/static/css/components/custom-media_object.css b/static/assets/css/components/custom-media_object.css similarity index 100% rename from static/css/components/custom-media_object.css rename to static/assets/css/components/custom-media_object.css diff --git a/static/css/components/custom-modal.css b/static/assets/css/components/custom-modal.css similarity index 100% rename from static/css/components/custom-modal.css rename to static/assets/css/components/custom-modal.css diff --git a/static/css/components/custom-sweetalert.css b/static/assets/css/components/custom-sweetalert.css similarity index 100% rename from static/css/components/custom-sweetalert.css rename to static/assets/css/components/custom-sweetalert.css diff --git a/static/css/components/tabs-accordian/custom-accordions.css b/static/assets/css/components/tabs-accordian/custom-accordions.css similarity index 100% rename from static/css/components/tabs-accordian/custom-accordions.css rename to static/assets/css/components/tabs-accordian/custom-accordions.css diff --git a/static/css/components/tabs-accordian/custom-tabs.css b/static/assets/css/components/tabs-accordian/custom-tabs.css similarity index 100% rename from static/css/components/tabs-accordian/custom-tabs.css rename to static/assets/css/components/tabs-accordian/custom-tabs.css diff --git a/static/css/components/timeline/custom-timeline.css b/static/assets/css/components/timeline/custom-timeline.css similarity index 100% rename from static/css/components/timeline/custom-timeline.css rename to static/assets/css/components/timeline/custom-timeline.css diff --git a/static/css/dashboard/dash_1.css b/static/assets/css/dashboard/dash_1.css similarity index 100% rename from static/css/dashboard/dash_1.css rename to static/assets/css/dashboard/dash_1.css diff --git a/static/css/dashboard/dash_2.css b/static/assets/css/dashboard/dash_2.css similarity index 100% rename from static/css/dashboard/dash_2.css rename to static/assets/css/dashboard/dash_2.css diff --git a/static/css/elements/alert.css b/static/assets/css/elements/alert.css similarity index 100% rename from static/css/elements/alert.css rename to static/assets/css/elements/alert.css diff --git a/static/css/elements/avatar.css b/static/assets/css/elements/avatar.css similarity index 100% rename from static/css/elements/avatar.css rename to static/assets/css/elements/avatar.css diff --git a/static/css/elements/breadcrumb.css b/static/assets/css/elements/breadcrumb.css similarity index 100% rename from static/css/elements/breadcrumb.css rename to static/assets/css/elements/breadcrumb.css diff --git a/static/css/elements/color_library.css b/static/assets/css/elements/color_library.css similarity index 100% rename from static/css/elements/color_library.css rename to static/assets/css/elements/color_library.css diff --git a/static/css/elements/custom-pagination.css b/static/assets/css/elements/custom-pagination.css similarity index 100% rename from static/css/elements/custom-pagination.css rename to static/assets/css/elements/custom-pagination.css diff --git a/static/css/elements/custom-tree_view.css b/static/assets/css/elements/custom-tree_view.css similarity index 100% rename from static/css/elements/custom-tree_view.css rename to static/assets/css/elements/custom-tree_view.css diff --git a/static/css/elements/custom-typography.css b/static/assets/css/elements/custom-typography.css similarity index 100% rename from static/css/elements/custom-typography.css rename to static/assets/css/elements/custom-typography.css diff --git a/static/css/elements/infobox.css b/static/assets/css/elements/infobox.css similarity index 100% rename from static/css/elements/infobox.css rename to static/assets/css/elements/infobox.css diff --git a/static/css/elements/miscellaneous.css b/static/assets/css/elements/miscellaneous.css similarity index 100% rename from static/css/elements/miscellaneous.css rename to static/assets/css/elements/miscellaneous.css diff --git a/static/css/elements/popover.css b/static/assets/css/elements/popover.css similarity index 100% rename from static/css/elements/popover.css rename to static/assets/css/elements/popover.css diff --git a/static/css/elements/search.css b/static/assets/css/elements/search.css similarity index 100% rename from static/css/elements/search.css rename to static/assets/css/elements/search.css diff --git a/static/css/elements/tooltip.css b/static/assets/css/elements/tooltip.css similarity index 100% rename from static/css/elements/tooltip.css rename to static/assets/css/elements/tooltip.css diff --git a/static/css/forms/bootstrap-form.css b/static/assets/css/forms/bootstrap-form.css similarity index 100% rename from static/css/forms/bootstrap-form.css rename to static/assets/css/forms/bootstrap-form.css diff --git a/static/css/forms/custom-clipboard.css b/static/assets/css/forms/custom-clipboard.css similarity index 100% rename from static/css/forms/custom-clipboard.css rename to static/assets/css/forms/custom-clipboard.css diff --git a/static/css/forms/switches.css b/static/assets/css/forms/switches.css similarity index 100% rename from static/css/forms/switches.css rename to static/assets/css/forms/switches.css diff --git a/static/css/forms/theme-checkbox-radio.css b/static/assets/css/forms/theme-checkbox-radio.css similarity index 100% rename from static/css/forms/theme-checkbox-radio.css rename to static/assets/css/forms/theme-checkbox-radio.css diff --git a/static/css/loader.css b/static/assets/css/loader.css similarity index 100% rename from static/css/loader.css rename to static/assets/css/loader.css diff --git a/static/css/main.css b/static/assets/css/main.css similarity index 100% rename from static/css/main.css rename to static/assets/css/main.css diff --git a/static/css/pages/coming-soon/style.css b/static/assets/css/pages/coming-soon/style.css similarity index 100% rename from static/css/pages/coming-soon/style.css rename to static/assets/css/pages/coming-soon/style.css diff --git a/static/css/pages/contact_us.css b/static/assets/css/pages/contact_us.css similarity index 100% rename from static/css/pages/contact_us.css rename to static/assets/css/pages/contact_us.css diff --git a/static/css/pages/error/style-400.css b/static/assets/css/pages/error/style-400.css similarity index 100% rename from static/css/pages/error/style-400.css rename to static/assets/css/pages/error/style-400.css diff --git a/static/css/pages/error/style-500.css b/static/assets/css/pages/error/style-500.css similarity index 100% rename from static/css/pages/error/style-500.css rename to static/assets/css/pages/error/style-500.css diff --git a/static/css/pages/error/style-503.css b/static/assets/css/pages/error/style-503.css similarity index 100% rename from static/css/pages/error/style-503.css rename to static/assets/css/pages/error/style-503.css diff --git a/static/css/pages/error/style-maintanence.css b/static/assets/css/pages/error/style-maintanence.css similarity index 100% rename from static/css/pages/error/style-maintanence.css rename to static/assets/css/pages/error/style-maintanence.css diff --git a/static/css/pages/faq/faq.css b/static/assets/css/pages/faq/faq.css similarity index 100% rename from static/css/pages/faq/faq.css rename to static/assets/css/pages/faq/faq.css diff --git a/static/css/pages/faq/faq2.css b/static/assets/css/pages/faq/faq2.css similarity index 100% rename from static/css/pages/faq/faq2.css rename to static/assets/css/pages/faq/faq2.css diff --git a/static/css/pages/helpdesk.css b/static/assets/css/pages/helpdesk.css similarity index 100% rename from static/css/pages/helpdesk.css rename to static/assets/css/pages/helpdesk.css diff --git a/static/css/pages/privacy/privacy.css b/static/assets/css/pages/privacy/privacy.css similarity index 100% rename from static/css/pages/privacy/privacy.css rename to static/assets/css/pages/privacy/privacy.css diff --git a/static/assets/css/plugins.css b/static/assets/css/plugins.css new file mode 100644 index 00000000..b74a2646 --- /dev/null +++ b/static/assets/css/plugins.css @@ -0,0 +1,4 @@ +@import url('main.css'); +@import url('../../plugins/perfect-scrollbar/perfect-scrollbar.css'); +@import url('structure.css'); +@import '../../plugins/highlight/styles/monokai-sublime.css'; diff --git a/static/css/scrollspyNav.css b/static/assets/css/scrollspyNav.css similarity index 100% rename from static/css/scrollspyNav.css rename to static/assets/css/scrollspyNav.css diff --git a/static/css/structure.css b/static/assets/css/structure.css similarity index 99% rename from static/css/structure.css rename to static/assets/css/structure.css index f2ebe57f..0d39bd94 100644 --- a/static/css/structure.css +++ b/static/assets/css/structure.css @@ -193,7 +193,7 @@ code { max-width: 58.333333%; margin-left: 80px; } -/* +/* ===================== Navigation Bar ===================== @@ -551,7 +551,7 @@ code { color: #1b55e2; fill: rgba(0, 23, 55, 0.08); } -/* +/* =============== Sidebar =============== @@ -675,7 +675,7 @@ code { .page-header { display: block; } } -/* +/* =============== Sidebar =============== @@ -951,7 +951,7 @@ code { #sidebar ul.menu-categories .ps__rail-y { right: -4px !important; } -/* +/* ====================== Footer-wrapper ====================== @@ -985,7 +985,7 @@ code { height: 15px; vertical-align: text-top; } -/* +/* ====================== MEDIA QUERIES ====================== diff --git a/static/css/tables/table-basic.css b/static/assets/css/tables/table-basic.css similarity index 100% rename from static/css/tables/table-basic.css rename to static/assets/css/tables/table-basic.css diff --git a/static/css/users/account-setting.css b/static/assets/css/users/account-setting.css similarity index 100% rename from static/css/users/account-setting.css rename to static/assets/css/users/account-setting.css diff --git a/static/css/users/user-profile.css b/static/assets/css/users/user-profile.css similarity index 100% rename from static/css/users/user-profile.css rename to static/assets/css/users/user-profile.css diff --git a/static/css/widgets/modules-widgets.css b/static/assets/css/widgets/modules-widgets.css similarity index 100% rename from static/css/widgets/modules-widgets.css rename to static/assets/css/widgets/modules-widgets.css diff --git a/static/js/app.js b/static/assets/js/app.js similarity index 100% rename from static/js/app.js rename to static/assets/js/app.js diff --git a/static/js/apps/contact.js b/static/assets/js/apps/contact.js similarity index 100% rename from static/js/apps/contact.js rename to static/assets/js/apps/contact.js diff --git a/static/js/apps/custom-mailbox.js b/static/assets/js/apps/custom-mailbox.js similarity index 100% rename from static/js/apps/custom-mailbox.js rename to static/assets/js/apps/custom-mailbox.js diff --git a/static/js/apps/invoice.js b/static/assets/js/apps/invoice.js similarity index 100% rename from static/js/apps/invoice.js rename to static/assets/js/apps/invoice.js diff --git a/static/js/apps/mailbox-chat.js b/static/assets/js/apps/mailbox-chat.js similarity index 100% rename from static/js/apps/mailbox-chat.js rename to static/assets/js/apps/mailbox-chat.js diff --git a/static/js/apps/notes.js b/static/assets/js/apps/notes.js similarity index 100% rename from static/js/apps/notes.js rename to static/assets/js/apps/notes.js diff --git a/static/js/apps/scrumboard.js b/static/assets/js/apps/scrumboard.js similarity index 100% rename from static/js/apps/scrumboard.js rename to static/assets/js/apps/scrumboard.js diff --git a/static/js/apps/todoList.js b/static/assets/js/apps/todoList.js similarity index 100% rename from static/js/apps/todoList.js rename to static/assets/js/apps/todoList.js diff --git a/static/js/authentication/form-1.js b/static/assets/js/authentication/form-1.js similarity index 100% rename from static/js/authentication/form-1.js rename to static/assets/js/authentication/form-1.js diff --git a/static/js/authentication/form-2.js b/static/assets/js/authentication/form-2.js similarity index 100% rename from static/js/authentication/form-2.js rename to static/assets/js/authentication/form-2.js diff --git a/static/js/clipboard/clipboard.min.js b/static/assets/js/clipboard/clipboard.min.js similarity index 100% rename from static/js/clipboard/clipboard.min.js rename to static/assets/js/clipboard/clipboard.min.js diff --git a/static/js/components/custom-carousel.js b/static/assets/js/components/custom-carousel.js similarity index 100% rename from static/js/components/custom-carousel.js rename to static/assets/js/components/custom-carousel.js diff --git a/static/js/components/custom-countdown.js b/static/assets/js/components/custom-countdown.js similarity index 100% rename from static/js/components/custom-countdown.js rename to static/assets/js/components/custom-countdown.js diff --git a/static/js/components/custom-counter.js b/static/assets/js/components/custom-counter.js similarity index 100% rename from static/js/components/custom-counter.js rename to static/assets/js/components/custom-counter.js diff --git a/static/js/components/notification/custom-snackbar.js b/static/assets/js/components/notification/custom-snackbar.js similarity index 100% rename from static/js/components/notification/custom-snackbar.js rename to static/assets/js/components/notification/custom-snackbar.js diff --git a/static/js/components/session-timeout/bootstrap-session-timeout.js b/static/assets/js/components/session-timeout/bootstrap-session-timeout.js similarity index 100% rename from static/js/components/session-timeout/bootstrap-session-timeout.js rename to static/assets/js/components/session-timeout/bootstrap-session-timeout.js diff --git a/static/js/components/session-timeout/custom-bootstrap_session_timeout.js b/static/assets/js/components/session-timeout/custom-bootstrap_session_timeout.js similarity index 100% rename from static/js/components/session-timeout/custom-bootstrap_session_timeout.js rename to static/assets/js/components/session-timeout/custom-bootstrap_session_timeout.js diff --git a/static/js/components/ui-accordions.js b/static/assets/js/components/ui-accordions.js similarity index 100% rename from static/js/components/ui-accordions.js rename to static/assets/js/components/ui-accordions.js diff --git a/static/assets/js/custom.js b/static/assets/js/custom.js new file mode 100644 index 00000000..a8418def --- /dev/null +++ b/static/assets/js/custom.js @@ -0,0 +1,134 @@ +/* +========================================= +| | +| Scroll To Top | +| | +========================================= +*/ +$('.scrollTop').click(function() { + $("html, body").animate({scrollTop: 0}); +}); + + +$('.navbar .dropdown.notification-dropdown > .dropdown-menu, .navbar .dropdown.message-dropdown > .dropdown-menu ').click(function(e) { + e.stopPropagation(); +}); + +/* +========================================= +| | +| Multi-Check checkbox | +| | +========================================= +*/ + +function checkall(clickchk, relChkbox) { + + var checker = $('#' + clickchk); + var multichk = $('.' + relChkbox); + + + checker.click(function () { + multichk.prop('checked', $(this).prop('checked')); + }); +} + + +/* +========================================= +| | +| MultiCheck | +| | +========================================= +*/ + +/* + This MultiCheck Function is recommanded for datatable +*/ + +function multiCheck(tb_var) { + tb_var.on("change", ".chk-parent", function() { + var e=$(this).closest("table").find("td:first-child .child-chk"), a=$(this).is(":checked"); + $(e).each(function() { + a?($(this).prop("checked", !0), $(this).closest("tr").addClass("active")): ($(this).prop("checked", !1), $(this).closest("tr").removeClass("active")) + }) + }), + tb_var.on("change", "tbody tr .new-control", function() { + $(this).parents("tr").toggleClass("active") + }) +} + +/* +========================================= +| | +| MultiCheck | +| | +========================================= +*/ + +function checkall(clickchk, relChkbox) { + + var checker = $('#' + clickchk); + var multichk = $('.' + relChkbox); + + + checker.click(function () { + multichk.prop('checked', $(this).prop('checked')); + }); +} + +/* +========================================= +| | +| Tooltips | +| | +========================================= +*/ + +$('.bs-tooltip').tooltip(); + +/* +========================================= +| | +| Popovers | +| | +========================================= +*/ + +$('.bs-popover').popover(); + + +/* +================================================ +| | +| Rounded Tooltip | +| | +================================================ +*/ + +$('.t-dot').tooltip({ + template: '' +}) + + +/* +================================================ +| IE VERSION Dector | +================================================ +*/ + +function GetIEVersion() { + var sAgent = window.navigator.userAgent; + var Idx = sAgent.indexOf("MSIE"); + + // If IE, return version number. + if (Idx > 0) + return parseInt(sAgent.substring(Idx+ 5, sAgent.indexOf(".", Idx))); + + // If IE 11 then look for Updated user agent string. + else if (!!navigator.userAgent.match(/Trident\/7\./)) + return 11; + + else + return 0; //It is not IE +} diff --git a/static/js/dashboard/dash_1.js b/static/assets/js/dashboard/dash_1.js similarity index 100% rename from static/js/dashboard/dash_1.js rename to static/assets/js/dashboard/dash_1.js diff --git a/static/js/dashboard/dash_2.js b/static/assets/js/dashboard/dash_2.js similarity index 100% rename from static/js/dashboard/dash_2.js rename to static/assets/js/dashboard/dash_2.js diff --git a/static/js/elements/custom-search.js b/static/assets/js/elements/custom-search.js similarity index 100% rename from static/js/elements/custom-search.js rename to static/assets/js/elements/custom-search.js diff --git a/static/js/elements/popovers.js b/static/assets/js/elements/popovers.js similarity index 100% rename from static/js/elements/popovers.js rename to static/assets/js/elements/popovers.js diff --git a/static/js/elements/tooltip.js b/static/assets/js/elements/tooltip.js similarity index 100% rename from static/js/elements/tooltip.js rename to static/assets/js/elements/tooltip.js diff --git a/static/js/forms/bootstrap_validation/bs_validation_script.js b/static/assets/js/forms/bootstrap_validation/bs_validation_script.js similarity index 100% rename from static/js/forms/bootstrap_validation/bs_validation_script.js rename to static/assets/js/forms/bootstrap_validation/bs_validation_script.js diff --git a/static/js/forms/custom-clipboard.js b/static/assets/js/forms/custom-clipboard.js similarity index 100% rename from static/js/forms/custom-clipboard.js rename to static/assets/js/forms/custom-clipboard.js diff --git a/static/js/ie11fix/fn.fix-padStart.js b/static/assets/js/ie11fix/fn.fix-padStart.js similarity index 100% rename from static/js/ie11fix/fn.fix-padStart.js rename to static/assets/js/ie11fix/fn.fix-padStart.js diff --git a/static/js/libs/jquery-3.1.1.min.js b/static/assets/js/libs/jquery-3.1.1.min.js similarity index 100% rename from static/js/libs/jquery-3.1.1.min.js rename to static/assets/js/libs/jquery-3.1.1.min.js diff --git a/static/js/libs/jquery-ui.js b/static/assets/js/libs/jquery-ui.js similarity index 100% rename from static/js/libs/jquery-ui.js rename to static/assets/js/libs/jquery-ui.js diff --git a/static/js/loader.js b/static/assets/js/loader.js similarity index 100% rename from static/js/loader.js rename to static/assets/js/loader.js diff --git a/static/js/pages/coming-soon/coming-soon.js b/static/assets/js/pages/coming-soon/coming-soon.js similarity index 100% rename from static/js/pages/coming-soon/coming-soon.js rename to static/assets/js/pages/coming-soon/coming-soon.js diff --git a/static/js/pages/faq/faq.js b/static/assets/js/pages/faq/faq.js similarity index 100% rename from static/js/pages/faq/faq.js rename to static/assets/js/pages/faq/faq.js diff --git a/static/js/pages/faq/faq2.js b/static/assets/js/pages/faq/faq2.js similarity index 100% rename from static/js/pages/faq/faq2.js rename to static/assets/js/pages/faq/faq2.js diff --git a/static/js/pages/helpdesk.js b/static/assets/js/pages/helpdesk.js similarity index 100% rename from static/js/pages/helpdesk.js rename to static/assets/js/pages/helpdesk.js diff --git a/static/js/scrollspyNav.js b/static/assets/js/scrollspyNav.js similarity index 100% rename from static/js/scrollspyNav.js rename to static/assets/js/scrollspyNav.js diff --git a/static/js/users/account-settings.js b/static/assets/js/users/account-settings.js similarity index 100% rename from static/js/users/account-settings.js rename to static/assets/js/users/account-settings.js diff --git a/static/js/widgets/modules-widgets.js b/static/assets/js/widgets/modules-widgets.js similarity index 100% rename from static/js/widgets/modules-widgets.js rename to static/assets/js/widgets/modules-widgets.js diff --git a/static/css/.DS_Store b/static/css/.DS_Store deleted file mode 100644 index db1370f6..00000000 Binary files a/static/css/.DS_Store and /dev/null differ diff --git a/static/css/plugins.css b/static/css/plugins.css deleted file mode 100644 index c4e891c2..00000000 --- a/static/css/plugins.css +++ /dev/null @@ -1,12 +0,0 @@ -@import url('main.css'); -@import url('../plugins/perfect-scrollbar/perfect-scrollbar.css'); -@import url('structure.css'); -/* - Importing highlight.js CSS code - - Just for demo purpose only - - @Note:- monokai-sublime.css stylesheet is for highliting the code; - -*/ -@import '../plugins/highlight/styles/monokai-sublime.css'; diff --git a/static/js/.DS_Store b/static/js/.DS_Store deleted file mode 100644 index 2b34b398..00000000 Binary files a/static/js/.DS_Store and /dev/null differ diff --git a/static/js/custom.js b/static/js/custom.js index f9540342..a8418def 100644 --- a/static/js/custom.js +++ b/static/js/custom.js @@ -4,7 +4,7 @@ | Scroll To Top | | | ========================================= -*/ +*/ $('.scrollTop').click(function() { $("html, body").animate({scrollTop: 0}); }); @@ -30,7 +30,7 @@ function checkall(clickchk, relChkbox) { checker.click(function () { multichk.prop('checked', $(this).prop('checked')); - }); + }); } @@ -74,7 +74,7 @@ function checkall(clickchk, relChkbox) { checker.click(function () { multichk.prop('checked', $(this).prop('checked')); - }); + }); } /* @@ -122,13 +122,13 @@ function GetIEVersion() { var Idx = sAgent.indexOf("MSIE"); // If IE, return version number. - if (Idx > 0) + if (Idx > 0) return parseInt(sAgent.substring(Idx+ 5, sAgent.indexOf(".", Idx))); // If IE 11 then look for Updated user agent string. - else if (!!navigator.userAgent.match(/Trident\/7\./)) + else if (!!navigator.userAgent.match(/Trident\/7\./)) return 11; else return 0; //It is not IE -} \ No newline at end of file +} diff --git a/targetApp/urls.py b/targetApp/urls.py new file mode 100644 index 00000000..cf664e4e --- /dev/null +++ b/targetApp/urls.py @@ -0,0 +1,9 @@ +from django.contrib import admin +from django.urls import path, include +from . import views + + +urlpatterns = [ + path('', views.index, name='targetIndex'), + path('add/', views.addTarget, name='addTarget'), +] diff --git a/targetApp/views.py b/targetApp/views.py index 91ea44a2..22ad1c92 100644 --- a/targetApp/views.py +++ b/targetApp/views.py @@ -1,3 +1,9 @@ from django.shortcuts import render +from django.http import HttpResponse -# Create your views here. +def index(request): + # TODO bring default target page + return render(request, 'target/index.html') + +def addTarget(request): + return render(request, 'target/add.html') diff --git a/templates/base/_items/sidebar.html b/templates/base/_items/sidebar.html index c3ebb2c2..bcbc689d 100644 --- a/templates/base/_items/sidebar.html +++ b/templates/base/_items/sidebar.html @@ -26,7 +26,7 @@ diff --git a/templates/base/base.html b/templates/base/base.html index 1b9fed2e..127ce1ff 100644 --- a/templates/base/base.html +++ b/templates/base/base.html @@ -6,17 +6,16 @@ {% block title %} {% endblock title %} - - - + + - - + + + + + {% block custom_js_css_link %} + {% endblock custom_js_css_link %}
@@ -64,16 +63,19 @@
- + - + - + + {% block page_level_script %} + + {% endblock page_level_script%}