From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 24 Sep 2013 09:20:41 +0000 (+0200)
Subject: first rough restoration of unfold1 unfold2 under boostrap v3
X-Git-Tag: myslice-0.2-4~40
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b3b56e8d306ce13207c1cf243ebe84cba29a87d3;p=myslice.git
first rough restoration of unfold1 unfold2 under boostrap v3
---
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" %}
<body>
{% block container %}
-<div id="container">
{% block topmenu %}
{% include 'widget-topmenu.html' %}
{% endblock topmenu %}
-{% include 'messages.html' %}
-<div class="container-fluid">
- <div class="row-fluid">
-
+{% include 'messages-transient.html' %}
+<div class="container"> <div class="row">
{% block base_content%}{% endblock %}
-
- </div><!--raw-fluid-->
-</div><!--container-fluid-->
+</div></div>
{% endblock container %}
</body>
</html>
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 %}
- <div id="unfold1-main" class="span12 columns">
+ <div id="unfold1-main" class="col-md-12 columns">
{% block unfold1_main %}
"The main content area (define block 'unfold1_main')"
{% endblock unfold1_main %}
- </div><!--span12-->
+ </div><!--col-md-12-->
{% 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 %}
- <div id="unfold2-main" class="span9 columns">
+ <div id="unfold2-main" class="col-md-9 columns">
{% block unfold2_main %}
"The main content area (define block 'unfold2_main')"
{% endblock unfold2_main %}
- </div><!--span9-->
- <div id='unfold2-margin' class='span3'>
+ </div><!--col-md-9-->
+ <div id='unfold2-margin' class='col-md-3'>
{% block unfold2_margin %}
"The related content area (define block 'related_main')"
{% endblock unfold2_margin %}
- </div><!--span3-->
+ </div><!--col-md-3-->
{% endblock %}