git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
/portal/urls.py: Merge conflict solved
[myslice.git]
/
myslice
/
viewutils.py
diff --git
a/myslice/viewutils.py
b/myslice/viewutils.py
index
c469d5c
..
3f1da63
100644
(file)
--- a/
myslice/viewutils.py
+++ b/
myslice/viewutils.py
@@
-24,8
+24,9
@@
def topmenu_items (current,request=None):
else:
result = []
result.append({'label':'Home', 'href': '/login'})
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':'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
for d in result:
#if d['label'].lower()find(current)>=0: d['is_active']=True
if d['label'] == current: d['is_active']=True