From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 23 Aug 2013 09:10:12 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~41^2~6
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=129b1502b5188c74f48e82da6c20c3b63350936c

Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan

Conflicts:
	myslice/viewutils.py
---

129b1502b5188c74f48e82da6c20c3b63350936c
diff --cc myslice/viewutils.py
index c6067f28,3f1da63d..b62e1a47
--- a/myslice/viewutils.py
+++ b/myslice/viewutils.py
@@@ -23,9 -23,10 +23,9 @@@ def topmenu_items (current,request=None
      else:
          result = []
          result.append({'label':'Home', 'href': '/login'})
-         result.append({ 'label':'Register', 'href': '/portal/user/register/'})
+         result.append({ 'label':'Register', 'href': '/portal/register/'})
 -        result.append({'label':'Contact Support', 'href': '/portal/contact/'})
      result.append({'label':'Platforms', 'href': '/portal/platforms/'})
 +    result.append({'label':'Contact Support', 'href': '/portal/contact/'})
      for d in result:
          #if d['label'].lower()find(current)>=0: d['is_active']=True
          if d['label'] == current: d['is_active']=True