X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fviews.py;h=997dbfb06148e9d828864f596cf39f098dd14b22;hb=e662708d2f2f1ba05daefe1db50ee08c5439aadc;hp=78a74cdf18d4716316e8bd64517c72ac426a3285;hpb=b4ab1b3fb9c0820ea410167f7b8bf05ab2ccae24;p=myslice.git diff --git a/portal/views.py b/portal/views.py index 78a74cdf..997dbfb0 100644 --- a/portal/views.py +++ b/portal/views.py @@ -23,29 +23,26 @@ import json -from django.http import HttpResponseRedirect, HttpResponse -from django.views.generic.base import TemplateView -from django.shortcuts import render -from django.template.loader import render_to_string -from django.core.mail import send_mail -from django.utils.decorators import method_decorator -from django.contrib.auth.decorators import login_required - -from myslice.viewutils import topmenu_items, the_user - -from plugins.lists.simplelist import SimpleList -from plugins.hazelnut import Hazelnut -from plugins.pres_view import PresView -from portal.event import Event - -from portal import signals -from portal.forms import SliceRequestForm -from portal.util import RegistrationView, ActivationView -from portal.models import PendingUser, PendingSlice -from portal.actions import authority_get_pi_emails, get_request_by_authority, manifold_add_user, manifold_update_user -from manifold.manifoldapi import execute_query -from manifold.core.query import Query -from unfold.page import Page +from django.http import HttpResponseRedirect, HttpResponse +from django.views.generic.base import TemplateView +from django.shortcuts import render +from django.template.loader import render_to_string + +from ui.topmenu import topmenu_items, the_user + +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 + +from portal.models import PendingUser, PendingSlice +from portal.actions import get_request_by_authority +from manifold.manifoldapi import execute_query +from manifold.core.query import Query +from unfold.page import Page # NOTE # initially all the portal views were defined in this single file @@ -59,7 +56,8 @@ class PresViewView(TemplateView): page = Page(self.request) - pres_view = PresView(page = page) +# pres_view = PresView(page = page) + pres_view = Raw(page = page,html="

PresView needs to be integrated

") context = super(PresViewView, self).get_context_data(**kwargs)