git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 45d2b44)
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 24 Sep 2013 09:55:00 +0000 (11:55 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Tue, 24 Sep 2013 09:55:00 +0000 (11:55 +0200)
myslice/settings.py patch | blob | history
views/static/css/layout-unfold2.css patch | blob | history
views/templates/base.html patch | blob | history
views/templates/layout-unfold1.html patch | blob | history
views/templates/layout-unfold2.html patch | blob | history

diff --git a/myslice/settings.py b/myslice/settings.py
index 3a39ab9..93d044c 100644 (file)
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -175,8 +175,6 @@ INSTALLED_APPS = (
     'plugins',
     # views - more or less stable 
     'views',
-    # temporary
-    'trash',
     # managing database migrations
     'south', 
     # Uncomment the next line to enable the admin:
@@ -184,6 +182,8 @@ INSTALLED_APPS = (
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'portal',
+    # temporary - not packaged
+    'trash',
     'sample',
 # DEPRECATED #    'django.contrib.formtools',
 # DEPRECATED ##    'crispy_forms',
diff --git a/views/static/css/layout-unfold2.css b/views/static/css/layout-unfold2.css
index 9346643..9e06837 100644 (file)
--- a/views/static/css/layout-unfold2.css
+++ b/views/static/css/layout-unfold2.css
@@ -3,5 +3,5 @@
 }
 #unfold2-margin {
     padding: 10;
-#    background-color: #fff2ff;
+/*    background-color: #fff2ff; */
 }
diff --git a/views/templates/base.html b/views/templates/base.html
index ca7a969..3ee9ba2 100644 (file)
--- 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 851de44..002a023 100644 (file)
--- 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 4754fa1..1d092c2 100644 (file)
--- 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 %}
myslice (django)