Make .html to .html.jinja2 rename seamless (#104, #166) (#167)

baseframe/templates/403.html.jinja2

@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}{% trans %}Access denied{% endtrans %}{% endblock %}
 
 {% block content %}

baseframe/templates/404.html.jinja2

@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}{% trans %}Not Found{% endtrans %}{% endblock %}
 
 {% block content %}

baseframe/templates/500.html.jinja2

@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 {% block title %}{% trans %}Internal Server Error{% endtrans %}{% endblock %}
 
 {% block content %}

baseframe/templates/baseframe.html

@@ -1,2 +1,2 @@
 {# DEPRECATED: This template is due to be be removed. Use the referenced template directly. #}
-{% extends "baseframe/bootstrap3/baseframe.html.jinja2" %}
+{% extends "baseframe.html.jinja2" %}

baseframe/templates/baseframe.html.jinja2

@@ -0,0 +1,5 @@
+{%- if config['theme'] == 'mui' %}
+  {%- extends 'baseframe/mui/baseframe.html.jinja2' %}
+{%- else %}
+  {% extends 'baseframe/bootstrap3/baseframe.html.jinja2' %}
+{%- endif %}

baseframe/templates/baseframe/components.html

@@ -1,2 +1,2 @@
 {# DEPRECATED: This template is due to be be removed. Use the referenced template directly. #}
-{% extends "baseframe/bootstrap3/components.html.jinja2" %}
+{% extends "baseframe/components.html.jinja2" %}

baseframe/templates/baseframe/components.html.jinja2

@@ -0,0 +1,5 @@
+{%- if config['theme'] == 'mui' %}
+  {%- extends 'baseframe/mui/components.html.jinja2' %}
+{%- else %}
+  {% extends 'baseframe/bootstrap3/components.html.jinja2' %}
+{%- endif %}

baseframe/templates/baseframe/forms.html

@@ -1,2 +1,2 @@
 {# DEPRECATED: This template is due to be be removed. Use the referenced template directly. #}
-{% extends "baseframe/bootstrap3/forms.html.jinja2" %}
+{% extends "baseframe/forms.html.jinja2" %}

baseframe/templates/baseframe/forms.html.jinja2

@@ -0,0 +1,5 @@
+{%- if config['theme'] == 'mui' %}
+  {%- extends 'baseframe/mui/forms.html.jinja2' %}
+{%- else %}
+  {% extends 'baseframe/bootstrap3/forms.html.jinja2' %}
+{%- endif %}

baseframe/templates/baseframe/mui/autoform.html.jinja2

@@ -1,4 +1,4 @@
-{% extends "baseframe/mui/formlayout.html.jinja2" %}
+{% extends "formlayout.html.jinja2" %}
 {% from "baseframe/mui/forms.html.jinja2" import renderform, ajaxform, widget_ext_scripts, widgetscripts %}
 
 {% block content %}

baseframe/templates/baseframe/mui/delete.html.jinja2

@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "layout.html.jinja2" %}
 
 {% block content %}
 <div class="grid">

baseframe/templates/baseframe/mui/formlayout.html.jinja2

@@ -1 +1 @@
-{% extends "layout.html" -%}
+{% extends "layout.html.jinja2" -%}

baseframe/templates/baseframe/mui/message.html.jinja2

@@ -1,4 +1,4 @@
-{% extends "baseframe/mui/formlayout.html.jinja2" %}
+{% extends "formlayout.html.jinja2" %}
 
 {% block content %}
 <p>{{ message }}</p>

baseframe/templates/baseframe/networkbar.html

@@ -1,2 +1,2 @@
 {# DEPRECATED: This template is due to be be removed. Use the referenced template directly. #}
-{% extends "baseframe/bootstrap3/networkbar.html.jinja2" %}
+{% extends "baseframe/networkbar.html.jinja2" %}

baseframe/templates/baseframe/networkbar.html.jinja2

@@ -0,0 +1,5 @@
+{%- if config['theme'] == 'mui' %}
+  {%- extends 'baseframe/mui/networkbar.html.jinja2' %}
+{%- else %}
+  {% extends 'baseframe/bootstrap3/networkbar.html.jinja2' %}
+{%- endif %}

baseframe/templates/formlayout.html

@@ -1,2 +1,2 @@
 {# DEPRECATED: This template is due to be be removed. Use the referenced template directly. #}
-{% extends "baseframe/bootstrap3/formlayout.html.jinja2" %}
+{% extends "formlayout.html.jinja2" %}

baseframe/templates/formlayout.html.jinja2

@@ -0,0 +1,5 @@
+{%- if config['theme'] == 'mui' %}
+  {%- extends 'baseframe/mui/formlayout.html.jinja2' %}
+{%- else %}
+  {% extends 'baseframe/bootstrap3/formlayout.html.jinja2' %}
+{%- endif %}

baseframe/templates/layout.html

@@ -1,2 +1,2 @@
 {# DEPRECATED: This template is due to be be removed. Use the referenced template directly. #}
-{% extends "baseframe/bootstrap3/layout.html.jinja2" %}
+{% extends "layout.html.jinja2" %}

baseframe/templates/layout.html.jinja2

@@ -0,0 +1,5 @@
+{%- if config['theme'] == 'mui' %}
+  {%- extends 'baseframe/mui/layout.html.jinja2' %}
+{%- else %}
+  {% extends 'baseframe/bootstrap3/layout.html.jinja2' %}
+{%- endif %}

baseframe/views.py

@@ -129,13 +129,13 @@ def robots(subdomain=None):
 @baseframe.route('/api/baseframe/1/toastr_messages.js', subdomain='<subdomain>')
 @baseframe.route('/api/baseframe/1/toastr_messages.js', defaults={'subdomain': None})
 def toastr_messages_js(subdomain=None):
-    return current_app.response_class(render_template('toastr_messages.js'), mimetype='application/javascript')
+    return current_app.response_class(render_template('toastr_messages.js.jinja2'), mimetype='application/javascript')
 
 
 @baseframe.route('/api/baseframe/1/editor.css', subdomain='<subdomain>')
 @baseframe.route('/api/baseframe/1/editor.css', defaults={'subdomain': None})
 def editorcss(subdomain=None):
-    response = current_app.response_class(render_template('editor.css'),
+    response = current_app.response_class(render_template('editor.css.jinja2'),
         mimetype='text/css',
         headers={'Expires': (datetime.utcnow() + timedelta(minutes=60)).strftime('%a, %d %b %Y %H:%M:%S GMT')})
     return response