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 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
[myslice.git]
/
portal
/
views.py
diff --git
a/portal/views.py
b/portal/views.py
index
7e79382
..
f72f6ce
100644
(file)
--- a/
portal/views.py
+++ b/
portal/views.py
@@
-21,10
+21,10
@@
# this program; see the file COPYING. If not, write to the Free Software
# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# this program; see the file COPYING. If not, write to the Free Software
# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-from django.conf import settings
-from django.contrib.sites.models import Site, RequestSite
-from django.contrib import messages
-from django.views.generic import View
+import os.path, re
+import json
+
+
#
from django.views.generic import View
from django.views.generic.base import TemplateView
from django.shortcuts import render
from django.template.loader import render_to_string
from django.views.generic.base import TemplateView
from django.shortcuts import render
from django.template.loader import render_to_string
@@
-36,7
+36,6
@@
from plugins.lists.simplelist import SimpleList
from plugins.hazelnut import Hazelnut
from plugins.pres_view import PresView
from portal.event import Event
from plugins.hazelnut import Hazelnut
from plugins.pres_view import PresView
from portal.event import Event
-import json
from portal import signals
from portal.forms import SliceRequestForm, ContactForm
from portal import signals
from portal.forms import SliceRequestForm, ContactForm
@@
-49,9
+48,6
@@
from unfold.page import Page
from myslice.viewutils import topmenu_items, the_user
from django.http import HttpResponseRedirect, HttpResponse
from myslice.viewutils import topmenu_items, the_user
from django.http import HttpResponseRedirect, HttpResponse
-from M2Crypto import Rand, RSA, BIO
-import os, re
-
#class for my_account
class AccountView(TemplateView):
template_name = "my_account.html"
#class for my_account
class AccountView(TemplateView):
template_name = "my_account.html"