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
Fixed bug: select columns all checked in filters, autocomplete based on query_all...
[myslice.git]
/
portal
/
views.py
diff --git
a/portal/views.py
b/portal/views.py
index
2029e70
..
997dbfb
100644
(file)
--- a/
portal/views.py
+++ b/
portal/views.py
@@
-28,10
+28,12
@@
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 plugins.pres_view import PresView
from portal.event import Event
from portal.event import Event
+# presview is put in observation for now
+#from plugins.pres_view import PresView
+from plugins.raw import Raw
# these seem totally unused for now
#from portal.util import RegistrationView, ActivationView
# these seem totally unused for now
#from portal.util import RegistrationView, ActivationView
@@
-54,7
+56,8
@@
class PresViewView(TemplateView):
page = Page(self.request)
page = Page(self.request)
- pres_view = PresView(page = page)
+# pres_view = PresView(page = page)
+ pres_view = Raw(page = page,html="<h1>PresView needs to be integrated</h1>")
context = super(PresViewView, self).get_context_data(**kwargs)
context = super(PresViewView, self).get_context_data(**kwargs)