Use basetheme_bootstrap

43a01ff5 · Bryan BRANCOTTE · 766b4cec · 43a01ff5 · 43a01ff5 · 43a01ff5
Commit 43a01ff5 authored 4 years ago by Bryan BRANCOTTE
--- a/src/strass/requirements.txt
+++ b/src/strass/requirements.txt
@@ -2,4 +2,5 @@ django==3.1.*
 django-extensions
 django-crispy-forms
 python-decouple
+git+https://gitlab.pasteur.fr/bbrancot/django-basetheme-bootstrap.git@v0.2.38
 #END OF FILE
\ No newline at end of file
--- a/src/strass/strass/settings.py
+++ b/src/strass/strass/settings.py
@@ -45,6 +45,7 @@ INSTALLED_APPS = [
    'django.contrib.messages',
    'django.contrib.staticfiles',
    'crispy_forms',
+    'basetheme_bootstrap',
    'strass_app',
 ]

@@ -74,6 +75,7 @@ TEMPLATES = [
                'django.template.context_processors.request',
                'django.contrib.auth.context_processors.auth',
                'django.contrib.messages.context_processors.messages',
+                'basetheme_bootstrap.context_processors.processors',
            ],
        },
    },
@@ -137,3 +139,18 @@ STATIC_ROOT = os.path.join(BASE_DIR, '.static')
 STATIC_URL = config('STATIC_URL', default='/static') + '/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'persistent_volume', '.media')
 MEDIA_URL = config('MEDIA_URL', default='/media') + '/'
+
+################################################################################
+# django-crispy-forms
+################################################################################
+CRISPY_TEMPLATE_PACK = 'bootstrap4'
+
+################################################################################
+# basetheme_bootstrap
+################################################################################
+BASETHEME_BOOTSTRAP_TEMPLATE_LOCATION_PROJECT = "strass_app"
+BASETHEME_BOOTSTRAP_USERNAME_IS_EMAIL = True
+BASETHEME_BOOTSTRAP_FIRST_LAST_NAME_REQUIRED = True
+BASETHEME_BOOTSTRAP_VALIDATE_EMAIL_BEFORE_ACTIVATION = True
+
+################################################################################
--- a/src/strass/strass/urls.py
+++ b/src/strass/strass/urls.py
@@ -17,6 +17,7 @@ from django.contrib import admin
 from django.urls import path, include

 urlpatterns = [
+    path('', include('basetheme_bootstrap.urls')),
    path('', include('strass_app.urls')),
    path('admin/', admin.site.urls),
 ]
--- a/src/strass/strass_app/static/css/base.css
+++ b/src/strass/strass_app/static/css/base.css
+.fa-in-superscript{
+    left: -0.5em;
+    top: -0.8em;
+    position: relative;
+/*    text-shadow: 0 0 2px white;*/
+    font-size: 0.8em;
+    margin-right: -0.8em;
+}
\ No newline at end of file
--- a/src/strass/strass_app/templates/strass_app/base.html
+++ b/src/strass/strass_app/templates/strass_app/base.html
-<html>
-<head>
-</head>
-<body>
-{%block content%}{%endblock%}
-</body>
-</html>
\ No newline at end of file
+{% extends "basetheme_bootstrap/basePasteur.html" %}
+{% load i18n %}
+{% load basetheme_bootstrap %}
+{% load sstatic %}
+
+
+{% block upper_nav_bar_right_before_form %}
+{%if live_settings.show_documentation_link == "True" %}
+<li class="nav-item"><a class="nav-link" href="http://hub.pages.pasteur.fr/viralhostrangedb/" target="_blank"><i class="fa fa-book"></i> {%trans "Documentation"%}</a></li>
+{% endif %}
+{% endblock %}
+
+{% block upper_nav_bar_right_form %}{% endblock %}
+
+{% block before_nav_content %}<div id="search-bar-container" ></div>{% endblock %}
+
+{%block project_name %}<img src="{% sstatic '/img/logo.png' %}"/>{%trans "STRASS_APP Name" %}{%endblock%}
+{% block sign_in_word %}{%trans "Login "%}{% endblock %}
+
+{% block extra_css %}
+{{block.super}}
+<link rel="stylesheet" href="{% sstatic '/css/base.css' %}"/>
+{% endblock %}
+
+{% block extra_js %}
+{{block.super}}
+<script src="{% sstatic '/js/base.js' %}"></script>
+{% endblock %}
\ No newline at end of file
--- a/src/strass/strass_app/templates/strass_app/form_host.html
+++ b/src/strass/strass_app/templates/strass_app/form_host.html
-{% extends "strass_app/base.html" %}
-{% load static %}
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-
-
-{%block content%}
-{% crispy form %}
-{%endblock%}
\ No newline at end of file
--- a/src/strass/strass_app/views.py
+++ b/src/strass/strass_app/views.py
@@ -24,6 +24,6 @@ def candidate_apply(request):
    )
    return render(
        request=request,
-        template_name='strass_app/form_host.html',
+        template_name='basetheme_bootstrap/form_host.html',
        context=context,
    )