{{title|default:'Reset your password'}}
{% block main %}{% endblock %} diff --git a/creme/creme_core/templates/creme_core/base.html b/creme/creme_core/templates/creme_core/base.html index 594769ffae..1c49d10f60 100644 --- a/creme/creme_core/templates/creme_core/base.html +++ b/creme/creme_core/templates/creme_core/base.html @@ -1,4 +1,4 @@ -{% load media %}{% load include_creme_media url_join from creme_core_tags %} +{% load static %}{% load url_join from creme_core_tags %} @@ -9,10 +9,13 @@ {% block page_title %}{% endblock %}{{SOFTWARE_LABEL}} - {% include_creme_media 'main.css' %} + {% with theme_stylesheet=THEME_NAME|add:'.css' %} + + {% endwith %} {% include 'creme_core/frags/js_header.html' %} - + {# {% block extrahead %}{% endblock %} #} {% endblock %} diff --git a/creme/creme_core/templates/creme_core/frags/js_header.html b/creme/creme_core/templates/creme_core/frags/js_header.html index 122142542a..dc12d0c173 100644 --- a/creme/creme_core/templates/creme_core/frags/js_header.html +++ b/creme/creme_core/templates/creme_core/frags/js_header.html @@ -1,7 +1,10 @@ -{% load media %} -{% include_media 'l10n.js' language=LANGUAGE_CODE %} -{% include_media 'lib.js' %} -{% include_media 'main.js' %} +{% load static %} + +{% with language_catalog=LANGUAGE_CODE|add:'.js' %} + +{% endwith %} + + {# TODO : Remove this feature once JQuery is completely upgraded #} {% if JQUERY_MIGRATE_MUTE %} diff --git a/creme/creme_core/templates/creme_core/test_js.html b/creme/creme_core/templates/creme_core/test_js.html index 11754bbac2..e4a34269bb 100644 --- a/creme/creme_core/templates/creme_core/test_js.html +++ b/creme/creme_core/templates/creme_core/test_js.html @@ -1,4 +1,4 @@ -{% load media %}{% load include_creme_media from creme_core_tags %} +{% load static %} @@ -7,11 +7,17 @@ {% block page_title %}{% endblock %}Creme CRM - {% include_creme_media "main.css" %} - {% include_media 'l10n.js' language=LANGUAGE_CODE %} - {% include_media 'lib.js' %} - {% include_media 'main.js' %} + {% with theme_stylesheet=THEME_NAME|add:'.css' %} + + {% endwith %} + + {% with language_catalog=LANGUAGE_CODE|add:'.js' %} + + {% endwith %} + + - {% include_media 'testlib.js' %} - {% include_media 'testcore.js' %} + + +

QUnit Test Suite

@@ -330,4 +337,4 @@

    - \ No newline at end of file + diff --git a/creme/creme_core/templates/creme_core/tests/test_frame.html b/creme/creme_core/templates/creme_core/tests/test_frame.html index 9cba32d85b..a2a69f4101 100644 --- a/creme/creme_core/templates/creme_core/tests/test_frame.html +++ b/creme/creme_core/templates/creme_core/tests/test_frame.html @@ -1,5 +1,5 @@ {% extends "creme_core/tests/testbase.html" %} -{% load media %} +{% load static %} {% block test_title %}Creme Frame Widget{% endblock %} @@ -15,7 +15,7 @@ width:640px; min-height: 200px; } - + #popup > div { padding: 5px 0px 5px 5px; } @@ -308,7 +308,7 @@ }); $('#popup button.popup-image').on('click', function() { - var url = '{% media_url "common/images/logos/hybird.png" %}'; + var url = '{% static "common/images/logos/hybird.png" %}'; var dialog = creme.dialogs.image(url, { title: $('#popup [name="image-title"]').is(':checked') ? url : false, closeOnEscape: $('#popup input.popup-closeonescape').is(':checked'), @@ -364,7 +364,7 @@ -