From b3b56e8d306ce13207c1cf243ebe84cba29a87d3 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 24 Sep 2013 11:20:41 +0200 Subject: [PATCH] first rough restoration of unfold1 unfold2 under boostrap v3 --- views/templates/base.html | 11 +++-------- views/templates/layout-unfold1.html | 4 ++-- views/templates/layout-unfold2.html | 8 ++++---- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/views/templates/base.html b/views/templates/base.html index ca7a969d..3ee9ba29 100644 --- a/views/templates/base.html +++ b/views/templates/base.html @@ -21,18 +21,13 @@ {% insert_str prelude "css/manifold.css" %} {% block container %} -

{% block topmenu %} {% include 'widget-topmenu.html' %} {% endblock topmenu %} -{% include 'messages.html' %} -

- +{% include 'messages-transient.html' %} +

{% block base_content%}{% endblock %} - -

{% endblock container %} diff --git a/views/templates/layout-unfold1.html b/views/templates/layout-unfold1.html index 851de44b..002a0231 100644 --- a/views/templates/layout-unfold1.html +++ b/views/templates/layout-unfold1.html @@ -1,9 +1,9 @@ {% extends "base.html" %} {% block base_content %} -

{% block unfold1_main %} "The main content area (define block 'unfold1_main')" {% endblock unfold1_main %} -

{% endblock %} diff --git a/views/templates/layout-unfold2.html b/views/templates/layout-unfold2.html index 4754fa1c..1d092c21 100644 --- a/views/templates/layout-unfold2.html +++ b/views/templates/layout-unfold2.html @@ -1,14 +1,14 @@ {% extends "base.html" %} {% block base_content %} -

{% block unfold2_main %} "The main content area (define block 'unfold2_main')" {% endblock unfold2_main %} -

{% block unfold2_margin %} "The related content area (define block 'related_main')" {% endblock unfold2_margin %} -

{% endblock %} -- 2.43.0