From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 12 Nov 2013 14:35:01 +0000 (+0100)
Subject: Merge branch 'master' into newnames
X-Git-Tag: myslice-0.3-0~113^2~7^2~24
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=f8a614d0271ddc3046e18d826df01f72a861257c;hp=558f83af287568d57dfdd915f10fd36f071d940f

Merge branch 'master' into newnames

Conflicts:
	ui/topmenu.py
---

diff --git a/README b/README
index d05ded49..3a894cc0 100644
--- a/README
+++ b/README
@@ -32,6 +32,16 @@ $ make static (which is a shorthand for cleaning up and run manage collectstatic
   that creates templates/ 
 $ make templates [$ make redo (each time when you pull, do that and restart the server)]
 
+
+## Whenever doing a git pull the following operations are recommended:
+
+$ make static # will refresh static/ from all the pieces in the project
+$ make templates # same, for templates
+$ make redo-static # clears up (rm -rf) static/ first, then make static
+$ make redo-templates # ditto for templates
+$ make redo == make redo-static redo-templates
+
+
 * run a local server:
 $ manage.py runserver 0.0.0.0:8000
 -- or -- my advice:
diff --git a/ui/templates/view-unfold2.html b/trash/templates/view-unfold2.html
similarity index 100%
rename from ui/templates/view-unfold2.html
rename to trash/templates/view-unfold2.html
diff --git a/ui/templates/layout-unfold2.html b/ui/templates/layout-unfold2.html
index 954ce22d..345f57f2 100644
--- a/ui/templates/layout-unfold2.html
+++ b/ui/templates/layout-unfold2.html
@@ -8,7 +8,7 @@
     </div><!--col-xs-9-->
     <div id='unfold2-margin' class='col-xs-3'>
       {% block unfold2_margin %}
-      "The related content area (define block 'related_main')"
+      "The related content area (define block 'unfold2_margin')"
       {% endblock unfold2_margin %}
     </div><!--col-xs-3-->
 {% endblock %}
diff --git a/ui/topmenu.py b/ui/topmenu.py
index 1be7c285..3a94a212 100644
--- a/ui/topmenu.py
+++ b/ui/topmenu.py
@@ -35,7 +35,6 @@ def topmenu_items (current,request=None):
             if d['label'][:curlen].lower() == current: 
                 d['is_active']=True
                 if up is not None: up['is_active']=True
-            print 'mark_active OUT','d=',d,'up',up
         for d in result:
             mark_active(d)
             if 'dropdown' in d:
diff --git a/unfold/static/css/onelab_marko.css b/unfold/static/css/onelab_marko.css
index 1b992b9f..92253f90 100644
--- a/unfold/static/css/onelab_marko.css
+++ b/unfold/static/css/onelab_marko.css
@@ -9,10 +9,8 @@
 /*    color: #fff; */
 }
 
-.container h1 {
+.container h1, .container h2 {
     color: #fff !important;
-    font-family: Ubuntu;
-    margin-top: 60px;
 }
 
 div.plugin-outline-complete,