From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Thu, 22 Aug 2013 16:37:38 +0000 (+0200)
Subject: /portal/urls.py: Merge conflict solved
X-Git-Tag: myslice-0.2-1~41^2~6^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b29e145eaceb0b2a8f98bfaa7118713159e8c39e;hp=--cc;p=myslice.git

/portal/urls.py: Merge conflict solved
---

b29e145eaceb0b2a8f98bfaa7118713159e8c39e
diff --cc myslice/viewutils.py
index bc635bfc,9be8941a..3f1da63d
--- a/myslice/viewutils.py
+++ b/myslice/viewutils.py
@@@ -24,8 -24,9 +24,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/'})
      for d in result:
          #if d['label'].lower()find(current)>=0: d['is_active']=True
          if d['label'] == current: d['is_active']=True
diff --cc portal/urls.py
index f0e5ecd2,c0b9a96d..9882845d
--- a/portal/urls.py
+++ b/portal/urls.py
@@@ -22,7 -22,7 +22,8 @@@
  
  from django.conf.urls import patterns, include, url
  from portal           import views
 -from portal.views     import UserRegisterView, UserValidateView, DashboardView, PresViewView, PlatformsView
 +from portal.views     import  DashboardView, PresViewView
++from portal.views     import DashboardView, PresViewView, PlatformsView
  from portal.util      import TemplateView
  
  # DEPRECATED #named_register_forms = (