diff --git a/requirements.txt b/requirements.txt index 9d04a185..ae5f95b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -53,8 +53,6 @@ boto3>=1.12.0,<1.29.0 urllib3==1.26.5 pyasn1==0.5.0 contextlib2==21.6.0 -rcssmin==1.1.0 -rjsmin==1.2.0 chardet==5.2.0 idna==3.4 @@ -75,15 +73,12 @@ django-debug-toolbar==4.2.0 django-markwhat==1.6.2 django-appconf==1.0.4 -django-compressor>=3.1,<5.0 django-storages==1.9.1 -django-cacheds3storage==0.3.0 django-impersonate==1.9.1 -django-waffle==4.0.0 django-ga-context==0.1.0 django-smtp-ssl==1.0 -ccnmtlsettings==1.9.1 +ctlsettings==0.2.0 pbr==5.11.0 PyYAML>=3.10.0 # MIT diff --git a/smart_sa/assessmentquiz_task/templates/assessmentquiz_task/audit.html b/smart_sa/assessmentquiz_task/templates/assessmentquiz_task/audit.html index 32694218..bcb3581f 100644 --- a/smart_sa/assessmentquiz_task/templates/assessmentquiz_task/audit.html +++ b/smart_sa/assessmentquiz_task/templates/assessmentquiz_task/audit.html @@ -1,17 +1,12 @@ {% extends "intervention/game.html" %} -{% load compress %} {% block game_js %} -{% compress js %} -{% endcompress %} {% endblock %} {% block game_css %} -{% compress css %} -{% endcompress %} {% endblock %} {% block game_content %} diff --git a/smart_sa/assessmentquiz_task/templates/assessmentquiz_task/drugaudit.html b/smart_sa/assessmentquiz_task/templates/assessmentquiz_task/drugaudit.html index 54ddf674..13c12e01 100644 --- a/smart_sa/assessmentquiz_task/templates/assessmentquiz_task/drugaudit.html +++ b/smart_sa/assessmentquiz_task/templates/assessmentquiz_task/drugaudit.html @@ -1,17 +1,12 @@ {% extends "intervention/game.html" %} -{% load compress %} {% block game_js %} -{% compress js %} -{% endcompress %} {% endblock %} {% block game_css %} -{% compress css %} -{% endcompress %} {% endblock %} {% block game_content %} diff --git a/smart_sa/assessmentquiz_task/templates/assessmentquiz_task/kten.html b/smart_sa/assessmentquiz_task/templates/assessmentquiz_task/kten.html index 858c9f69..8066b4c7 100644 --- a/smart_sa/assessmentquiz_task/templates/assessmentquiz_task/kten.html +++ b/smart_sa/assessmentquiz_task/templates/assessmentquiz_task/kten.html @@ -1,16 +1,11 @@ {% extends "intervention/game.html" %} -{% load compress %} {% block game_js %} -{% compress js %} -{% endcompress %} {% endblock %} {% block game_css %} -{% compress css %} -{% endcompress %} {% endblock %} {% block game_content %} diff --git a/smart_sa/island_game/templates/island_game/island.html b/smart_sa/island_game/templates/island_game/island.html index fb7abab7..e9da37d4 100644 --- a/smart_sa/island_game/templates/island_game/island.html +++ b/smart_sa/island_game/templates/island_game/island.html @@ -1,22 +1,17 @@ {% extends "intervention/game.html" %} -{% load compress %} {% block game_js %} -{% compress js %} -{% endcompress %} {% endblock %} {% block game_css %} -{% compress css %} -{% endcompress %} {% endblock %} diff --git a/smart_sa/lifegoal_task/templates/lifegoal_task/goals.html b/smart_sa/lifegoal_task/templates/lifegoal_task/goals.html index 6c69611e..64fcfde5 100644 --- a/smart_sa/lifegoal_task/templates/lifegoal_task/goals.html +++ b/smart_sa/lifegoal_task/templates/lifegoal_task/goals.html @@ -1,20 +1,15 @@ {% extends "intervention/game.html" %} -{% load compress %} {% block game_js %} -{% compress js %} -{% endcompress %} {% endblock %} {% block game_css %} -{% compress css %} -{% endcompress %} {% endblock %} {% block game_content %} diff --git a/smart_sa/pill_game/templates/pill_game/pill.html b/smart_sa/pill_game/templates/pill_game/pill.html index 7eaa063d..94baae0c 100644 --- a/smart_sa/pill_game/templates/pill_game/pill.html +++ b/smart_sa/pill_game/templates/pill_game/pill.html @@ -1,8 +1,6 @@ {% extends "intervention/game.html" %} -{% load compress %} {% block game_js %} -{% compress js %} @@ -10,7 +8,6 @@ -{% endcompress %} -{% endcompress %} -{% endcompress %} {% endblock %} {% block game_content %} diff --git a/smart_sa/templates/base.html b/smart_sa/templates/base.html index 0ff53e61..5cbe7dc8 100644 --- a/smart_sa/templates/base.html +++ b/smart_sa/templates/base.html @@ -1,5 +1,3 @@ -{% load waffle_tags %} -{% load compress %} @@ -9,10 +7,8 @@ Masivukeni: {% block title %}{% endblock %} -{% compress css %} -{% endcompress %} {% block css %}{% endblock %} {% block js %}{% endblock %} diff --git a/smart_sa/templates/intervention/activity.html b/smart_sa/templates/intervention/activity.html index a5d82dfa..b1cac24e 100644 --- a/smart_sa/templates/intervention/activity.html +++ b/smart_sa/templates/intervention/activity.html @@ -1,5 +1,4 @@ {% extends "base.html" %} -{% load waffle_tags %} {% block title %}{{ activity.long_title }}{% endblock %} diff --git a/smart_sa/templates/intervention/game.html b/smart_sa/templates/intervention/game.html index 210e38ed..cda332e9 100644 --- a/smart_sa/templates/intervention/game.html +++ b/smart_sa/templates/intervention/game.html @@ -1,7 +1,5 @@ {% extends "base.html" %} -{% load waffle_tags %} -{% load compress %} {% block title %}{{ game.activity.long_title }}{% endblock %} {% load participant_status %} @@ -21,10 +19,8 @@ -{% compress js %} -{% endcompress %}