rename portal/templateviews.py -> views/loginrequired.py

diff --git a/portal/accountview.py b/portal/accountview.py
index 30e0b9a..9a3f6d4 100644 (file)
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -1,6 +1,6 @@
-from portal.templateviews            import LoginRequiredAutoLogoutView
+from views.loginrequired                import LoginRequiredAutoLogoutView
 #
-from manifold.core.query             import Query
+from manifold.core.query                import Query
 from manifold.manifoldapi               import execute_query
 from portal.actions                     import manifold_update_user, manifold_update_account
 #

diff --git a/portal/dashboardview.py b/portal/dashboardview.py
index 961b7dc..1a05359 100644 (file)
--- a/portal/dashboardview.py
+++ b/portal/dashboardview.py
@@ -1,9 +1,9 @@
-from manifold.core.query        import Query
-from unfold.page                import Page
+from manifold.core.query         import Query
+from unfold.page                 import Page
 
 from plugins.lists.simplelist    import SimpleList
 
-from portal.templateviews       import LoginRequiredAutoLogoutView
+from views.loginrequired         import LoginRequiredAutoLogoutView
 
 from myslice.viewutils           import topmenu_items, the_user
 

diff --git a/portal/homeview.py b/portal/homeview.py
index fb01240..592bc93 100644 (file)
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -12,6 +12,7 @@ from myslice.config import Config
 
 class HomeView (View):
 
+    # expose this so we can mention the backend URL on the welcome page
     def default_env (self):
         return { 
                  'manifold_url':Config.manifold_url,

diff --git a/portal/registrationview.py b/portal/registrationview.py
index e85d44f..30a0ed3 100644 (file)
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -1,6 +1,6 @@
 import os.path, re
 
-from django.core.mail            import send_mail
+from django.core.mail           import send_mail
 
 from django.views.generic       import View
 from django.template.loader     import render_to_string

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 85faad8..c921986 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -8,7 +8,7 @@ from manifold.manifoldapi        import execute_query
 from portal.models               import PendingSlice
 from portal.actions              import authority_get_pi_emails
 from portal.forms                import SliceRequestForm
-from portal.templateviews        import LoginRequiredAutoLogoutView
+from views.loginrequired         import LoginRequiredAutoLogoutView
 from myslice.viewutils           import topmenu_items, the_user
 
 class SliceRequestView (LoginRequiredAutoLogoutView):

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 24567f3..762e64a 100644 (file)
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -1,7 +1,7 @@
 from django.template                 import RequestContext
 from django.shortcuts                import render_to_response
 
-from portal.templateviews            import LoginRequiredAutoLogoutView
+from views.loginrequired             import LoginRequiredAutoLogoutView
 
 from unfold.page                     import Page
 from manifold.core.query             import Query, AnalyzedQuery
@@ -13,7 +13,7 @@ from plugins.stack.stack             import Stack
 from plugins.tabs.tabs               import Tabs
 from plugins.hazelnut                import Hazelnut 
 from plugins.resources_selected      import ResourcesSelected
-from plugins.googlemap              import GoogleMap
+from plugins.googlemap               import GoogleMap
 from plugins.senslabmap.senslabmap   import SensLabMap
 from plugins.querycode.querycode     import QueryCode
 from plugins.query_editor            import QueryEditor

diff --git a/portal/templateviews.py b/views/loginrequired.py
similarity index 100%
rename from portal/templateviews.py
rename to views/loginrequired.py