From 2f6dbbf51b9ab3eadc18b01a481b16625d26d064 Mon Sep 17 00:00:00 2001 From: Bryan Brancotte <bryan.brancotte@pasteur.fr> Date: Thu, 29 Aug 2019 12:24:18 +0200 Subject: [PATCH] Allowing to override completly the css classes in small form host. Allowing to use simple_message_page with its context --- .../templates/basetheme_bootstrap/simple_message_page.html | 6 +++--- .../templates/registration/small_form_host.html | 2 +- setup.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/basetheme_bootstrap/templates/basetheme_bootstrap/simple_message_page.html b/basetheme_bootstrap/templates/basetheme_bootstrap/simple_message_page.html index 8b18089..ef0fb3a 100644 --- a/basetheme_bootstrap/templates/basetheme_bootstrap/simple_message_page.html +++ b/basetheme_bootstrap/templates/basetheme_bootstrap/simple_message_page.html @@ -5,15 +5,15 @@ <div class="pb-2 mt-4 mb-2 col-12"> {% block content_page_title %} <div class="border-bottom text-center"> - <h1>{% block page_title %}{% endblock %}</h1> + <h1>{% block page_title %}{{page_title}}{% endblock %}</h1> </div> {% endblock %} - <h2 class="mt-4 text-center">{% block message %}{% endblock %}</h2> + <h2 class="mt-4 text-center">{% block message %}{{message}}{% endblock %}</h2> </div> {% endblock %} {% block content %} <div class="col-xs-12 col-12 text-center"> - {% block sub_message %}{% endblock %} + {% block sub_message %}{{sub_message}}{% endblock %} </div> {% endblock %} \ No newline at end of file diff --git a/basetheme_bootstrap/templates/registration/small_form_host.html b/basetheme_bootstrap/templates/registration/small_form_host.html index cde7df5..a02e157 100644 --- a/basetheme_bootstrap/templates/registration/small_form_host.html +++ b/basetheme_bootstrap/templates/registration/small_form_host.html @@ -10,7 +10,7 @@ {%if full_width_form_title%} <div class="col-12 col-xs-12 {{full_width_form_title_classes|default:'h2'}}">{{full_width_form_title}}</div> {%endif%} -<div class="col-12 col-xs-12 {%if not medium_width%}col-sm-10 col-sm-offset-1 offset-sm-1 col-md-8 col-md-offset-2 offset-md-2 col-lg-6 col-lg-offset-3 offset-lg-3 col-xl-4 col-xl-offset-4 offset-xl-4 col-xxl-2 col-xxl-offset-5{%endif%}{%if medium_width%}col-md-10 col-md-offset-1 offset-md-1 col-lg-8 col-lg-offset-2 offset-lg-2 col-xl-6 col-xl-offset-3 offset-xl-3 col-xxl-4 col-xxl-offset-4 col-xxxl-2 col-xxxl-offset-5{%endif%}"> +<div class="col-12 col-xs-12 {%if custom_css_width %}{{custom_css_width}}{%else%}{%if not medium_width%}col-sm-10 col-sm-offset-1 offset-sm-1 col-md-8 col-md-offset-2 offset-md-2 col-lg-6 col-lg-offset-3 offset-lg-3 col-xl-4 col-xl-offset-4 offset-xl-4 col-xxl-2 col-xxl-offset-5{%endif%}{%if medium_width%}col-md-10 col-md-offset-1 offset-md-1 col-lg-8 col-lg-offset-2 offset-lg-2 col-xl-6 col-xl-offset-3 offset-xl-3 col-xxl-4 col-xxl-offset-4 col-xxxl-2 col-xxxl-offset-5{%endif%}{%endif%}"> {%if form_title%}<h2>{{form_title}}</h2>{%endif%} <form method="post" enctype="multipart/form-data"> {% csrf_token %} diff --git a/setup.py b/setup.py index dbebc88..de1c40c 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ readme = open('README.rst').read() setup( name='django-basetheme-bootstrap', - version='0.1.5', + version='0.2.2', description='Django Basetheme Bootstrap', long_description=readme, author='Bryan Brancotte', -- GitLab