Revert "Bootstrap 5 studies (#1104)" (#1123)

This reverts commit 57f19c1.
lookit · Feb 28, 2023 · be6278d · be6278d
1 parent 57f19c1
commit be6278d
Show file tree

Hide file tree

Showing 60 changed files with 1,144 additions and 1,149 deletions.
diff --git a/Makefile b/Makefile
@@ -46,8 +46,5 @@ local-certs:
 	mkcert -install
 	cd certs && mkcert local_lookit.mit.edu
 
-media:
-	gsutil -m cp -r "gs://lookit-staging/media" ./project
-
 test:
 	docker compose run --rm -e ENVIRONMENT= web poetry run ./manage.py test --failfast 
diff --git a/accounts/forms.py b/accounts/forms.py
@@ -478,7 +478,7 @@ class StudyLocation(FormChoiceEnum):
     study_list_tabs = forms.ChoiceField(
         choices=Tabs.choices(),
         initial=0,
-        widget=forms.RadioSelect(attrs={"class": "d-none"}),
+        widget=forms.RadioSelect(attrs={"class": "hidden"}),
         required=False,
     )
     study_location = forms.ChoiceField(choices=StudyLocation.choices(), required=False)

diff --git a/accounts/templates/accounts/2fa-setup.html b/accounts/templates/accounts/2fa-setup.html
@@ -1,5 +1,5 @@
 {% extends "web/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% block title %}
     Set up Two Factor Authentication
 {% endblock title %}

diff --git a/accounts/templates/accounts/account-update.html b/accounts/templates/accounts/account-update.html
@@ -1,5 +1,5 @@
 {% extends "web/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% block title %}
     Update account information
 {% endblock title %}

diff --git a/accounts/templates/accounts/participant_detail.html b/accounts/templates/accounts/participant_detail.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load exp_extras %}
 {% load i18n %}
 {% block title %}

diff --git a/accounts/templates/accounts/participant_list.html b/accounts/templates/accounts/participant_list.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load exp_extras %}
 {% load i18n %}
 {% block title %}

diff --git a/accounts/templates/accounts/researcher-registration.html b/accounts/templates/accounts/researcher-registration.html
@@ -1,5 +1,5 @@
 {% extends "web/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% block title %}
     Researcher Registration
 {% endblock title %}

diff --git a/exp/templates/exp/base.html b/exp/templates/exp/base.html
@@ -1,4 +1,4 @@
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load static %}
 {% load guardian_tags %}
 {% load web_extras %}
@@ -47,7 +47,6 @@
                 {% endblock header %}
             </header>
             <section id="flash-messages">
-                {% bootstrap_messages %}
                 {% block flash %}
                 {% endblock flash %}
             </section>

diff --git a/exp/templates/exp/support.html b/exp/templates/exp/support.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load i18n %}
 {% block title %}
     Support Lookit

diff --git a/poetry.lock b/poetry.lock
diff --git a/project/settings.py b/project/settings.py
@@ -62,8 +62,7 @@
     "guardian",
     "localflavor",
     "rest_framework",
-    "django_bootstrap5",
-    "django_bootstrap_icons",
+    "bootstrap3",
     "ace_overlay",
     "corsheaders",
     "rest_framework.authtoken",

diff --git a/pyproject.toml b/pyproject.toml
@@ -13,7 +13,7 @@ Django = "3.2.11"
 django-ace-overlay = { git = "https://github.com/lookit/django-ace-overlay.git", branch = "master" }
 django-allauth = "0.42.0"
 django-bitfield = "2.1.0"
-django-bootstrap5 = "22.2"
+django-bootstrap3 = "^21.1"
 django-celery-beat = "2.0.0"
 django-cors-headers = "3.13.0"
 django-countries = "7.2.1"
@@ -51,7 +51,6 @@ sentry-sdk = "1.3.0"
 transitions = "0.8.1"
 uWSGI = "2.0.19.1"
 pillow = "9.4.0"
-django-bootstrap-icons = "0.8.2"
 
 [tool.poetry.dev-dependencies]
 coverage = "^5.5"

diff --git a/studies/templates/studies/_all_json_and_csv_data.html b/studies/templates/studies/_all_json_and_csv_data.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load exp_extras %}
 {% block title %}
     All Responses | {{ study.name }}

diff --git a/studies/templates/studies/_study_fields.html b/studies/templates/studies/_study_fields.html
@@ -1,4 +1,4 @@
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 <script>
 
     // Show the generator function field only if use_generator is checked.

diff --git a/studies/templates/studies/lab_create.html b/studies/templates/studies/lab_create.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% block title %}
     Create lab
 {% endblock title %}

diff --git a/studies/templates/studies/lab_detail.html b/studies/templates/studies/lab_detail.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% block title %}
     {{ lab.name }}
 {% endblock title %}

diff --git a/studies/templates/studies/lab_list.html b/studies/templates/studies/lab_list.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load exp_extras %}
 {% block title %}
     Labs

diff --git a/studies/templates/studies/lab_member_list.html b/studies/templates/studies/lab_member_list.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load exp_extras %}
 {% block title %}
     Lab members

diff --git a/studies/templates/studies/lab_update.html b/studies/templates/studies/lab_update.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% block title %}
     Update lab
 {% endblock title %}

diff --git a/studies/templates/studies/study_attachments.html b/studies/templates/studies/study_attachments.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load exp_extras %}
 {% load tz %}
 {% block title %}

diff --git a/studies/templates/studies/study_detail.html b/studies/templates/studies/study_detail.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load guardian_tags %}
 {% load static %}
 {% load tz %}

diff --git a/studies/templates/studies/study_edit.html b/studies/templates/studies/study_edit.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load guardian_tags %}
 {% load exp_extras %}
 {% block head %}

diff --git a/studies/templates/studies/study_form.html b/studies/templates/studies/study_form.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% block title %}
     Create Study
 {% endblock title %}

diff --git a/studies/templates/studies/study_list.html b/studies/templates/studies/study_list.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load exp_extras %}
 {% block title %}
     Studies

diff --git a/studies/templates/studies/study_participant_analytics.html b/studies/templates/studies/study_participant_analytics.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load static %}
 {% load guardian_tags %}
 {% block head %}

diff --git a/studies/templates/studies/study_participant_contact.html b/studies/templates/studies/study_participant_contact.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load guardian_tags %}
 {% load exp_extras %}
 {% load static %}

diff --git a/studies/templates/studies/study_responses.html b/studies/templates/studies/study_responses.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load exp_extras %}
 {% load static %}
 {% block title %}

diff --git a/studies/templates/studies/study_responses_consent_ruling.html b/studies/templates/studies/study_responses_consent_ruling.html
@@ -1,5 +1,5 @@
 {% extends "exp/base.html" %}
-{% load django_bootstrap5 %}
+{% load bootstrap3 %}
 {% load exp_extras %}
 {% load static %}
 {% block title %}

diff --git a/web/static/js/studies-list.js b/web/static/js/studies-list.js
diff --git a/web/templates/web/contact.html → web/templates/frontpages/contact.html b/web/templates/web/contact.html → web/templates/frontpages/contact.html
@@ -1,5 +1,5 @@
-{% extends "web/default.html" %}
-{% load django_bootstrap5 %}
+{% extends "frontpages/default.html" %}
+{% load bootstrap3 %}
 {% load i18n %}
 {% block title %}
     Contact Us

diff --git a/web/templates/frontpages/default.html b/web/templates/frontpages/default.html
@@ -0,0 +1,86 @@
+{% load bootstrap3 %}
+{% load static %}
+{% load i18n %}
+{% load web_extras %}
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8"/>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+        <title>
+            {% block title %}
+            {% endblock title %}
+        - {% trans "Lookit" %}</title>
+        <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet"/>
+        <meta name="apple-mobile-web-app-capable" content="yes"/>
+        <meta name="viewport"
+              content="width=device-width, initial-scale=1, user-scalable=no, maximum-scale=1"/>
+        <meta name="apple-touch-fullscreen" content="yes"/>
+        <meta name="description" value=""/>
+        <meta name="keywords" value=""/>
+        {% bootstrap_css %}
+        {% bootstrap_javascript jquery=True %}
+        <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/css/select2.min.css"
+              rel="stylesheet"/>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/js/select2.full.min.js"></script>
+        <link type="text/css" rel="stylesheet" href="{% static 'base.css' %}" />
+        <script src="https://use.fontawesome.com/41c082d3c2.js"></script>
+        {% google_tag_manager %}
+    </head>
+    <body>
+        <div class="container-fluid">
+            {% bootstrap_messages %}
+            <header class="row">
+                {% block header %}
+                    {% include 'web/_navigation.html' %}
+                {% endblock header %}
+            </header>
+            <section id="flash-messages">
+                {% block flash %}
+                {% endblock flash %}
+            </section>
+            <section>
+                <article class="row">
+                    <div>
+                        {% block content %}
+                        {% endblock content %}
+                    </div>
+                </article>
+            </section>
+            {% block footerjs %}
+            {% endblock footerjs %}
+        </div>
+        <footer>
+            <div class="footer-row lookit-row">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-md-1">
+                            <img alt="NSF"
+                                 src="https://storage.googleapis.com/lookit-production/static/images/nsf.gif"/>
+                        </div>
+                        <div class="col-md-8 funding-statement">
+                            {% trans "This material is based upon work supported by the National Science Foundation (NSF) under Grants 1429216, 1823919, and 2209756; the Center for Brains, Minds and Machines (CBMM), funded by NSF STC award CCF-1231216, and by an NSF Graduate Research Fellowship under Grant No. 1122374. Any opinion, findings, and conclusions or recommendations expressed in this material are those of the authors(s) and do not necessarily reflect the views of the National Science Foundation." %}
+                        </div>
+                        <div class="col-md-3 footer-resources">
+                            <ul>
+                                <li>
+                                    <a href="{% url 'web:privacy' %}">{% trans "Privacy" %}</a>
+                                </li>
+                                <li>
+                                    <a href="{% url 'web:contact' %}">{% trans "Contact us" %}</a>
+                                </li>
+                                <li>
+                                    {% trans "Connect" %}:
+                                    <a href="https://www.facebook.com/lookit.mit.edu"
+                                       aria-label="facebook"
+                                       target="_blank"
+                                       rel="noopener"><em class="fa fa-facebook fa-lg social-link"></em> </a>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </footer>
+    </body>
+</html>