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
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
[myslice.git]
/
portal
/
views.py
diff --git
a/portal/views.py
b/portal/views.py
index
60f1613
..
997dbfb
100644
(file)
--- a/
portal/views.py
+++ b/
portal/views.py
@@
-28,7
+28,7
@@
from django.views.generic.base import TemplateView
from django.shortcuts import render
from django.template.loader import render_to_string
from django.shortcuts import render
from django.template.loader import render_to_string
-from
myslice.viewutils
import topmenu_items, the_user
+from
ui.topmenu
import topmenu_items, the_user
from portal.event import Event
# presview is put in observation for now
from portal.event import Event
# presview is put in observation for now