move former myslice/viewutils.py, to gether with the contents of former views/ subdir...
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 30 Sep 2013 09:12:53 +0000 (11:12 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 30 Sep 2013 09:12:53 +0000 (11:12 +0200)
34 files changed:
README
debug_platform/views.py
myslice/settings.py
portal/accountview.py
portal/contactview.py
portal/dashboardview.py
portal/homeview.py
portal/platformsview.py
portal/platformview.py
portal/portalpage.py
portal/registrationview.py
portal/slicerequestview.py
portal/sliceview.py
portal/views.py
sample/views.py
trash/dashboard.py
trash/pluginview.py
trash/sampleviews.py
ui/__init__.py [moved from views/__init__.py with 100% similarity]
ui/static/css/layout-unfold2.css [moved from views/static/css/layout-unfold2.css with 100% similarity]
ui/static/css/topmenu.css [moved from views/static/css/topmenu.css with 100% similarity]
ui/static/img/favicon.ico [moved from views/static/img/favicon.ico with 100% similarity]
ui/static/img/myslice-icon.png [moved from views/static/img/myslice-icon.png with 100% similarity]
ui/static/img/myslice-logo.png [moved from views/static/img/myslice-logo.png with 100% similarity]
ui/static/img/onelab-logo.png [moved from views/static/img/onelab-logo.png with 100% similarity]
ui/templates/base.html [moved from views/templates/base.html with 100% similarity]
ui/templates/layout-unfold1.html [moved from views/templates/layout-unfold1.html with 100% similarity]
ui/templates/layout-unfold2.html [moved from views/templates/layout-unfold2.html with 100% similarity]
ui/templates/messages-transient-header.html [moved from views/templates/messages-transient-header.html with 100% similarity]
ui/templates/messages-transient.html [moved from views/templates/messages-transient.html with 100% similarity]
ui/templates/view-unfold1.html [moved from views/templates/view-unfold1.html with 100% similarity]
ui/templates/view-unfold2.html [moved from views/templates/view-unfold2.html with 100% similarity]
ui/templates/widget-topmenu.html [moved from views/templates/widget-topmenu.html with 100% similarity]
ui/topmenu.py [moved from myslice/viewutils.py with 99% similarity]

diff --git a/README b/README
index cae4a28..79ca81c 100644 (file)
--- a/README
+++ b/README
@@ -112,6 +112,11 @@ package is published)
   for how to use a separate authentication system, 
   as well as settings.py for how to enable it
 
+* ui/
+  provides building blocks for the UI, especially layouts (1 or 2 columns) as
+  well as the topmenu widget
+  + some global static files (css, js, images..)
+
 * portal/
   this is where the first implementation of myslice, with complete
   user-management including registration, is taking place
@@ -120,11 +125,6 @@ package is published)
   rough/preliminary scaffolding views are in here
   as the name suggests this is temporary
 
-* views/
-  will receive actual views over time 
-  currently has some global html templates as well
-  + some global static files (css, js, images..)
-
 * insert_above: 
   a third-party django app for adding on-the-fly mentions to css or js files that need to go in the header
 
index f56661b..e6b0c95 100644 (file)
@@ -29,7 +29,7 @@ from django.views.generic.base   import TemplateView
 from django.shortcuts            import render
 from manifold.core.query         import Query
 from unfold.page                 import Page
-from myslice.viewutils           import topmenu_items, the_user
+from ui.topmenu                  import topmenu_items, the_user
 from django.http                 import HttpResponseRedirect
 from plugins.debug_platform      import DebugPlatform
 
index 93d044c..4878c0d 100644 (file)
@@ -174,7 +174,7 @@ INSTALLED_APPS = (
     # plugins
     'plugins',
     # views - more or less stable 
-    'views',
+    'ui',
     # managing database migrations
     'south', 
     # Uncomment the next line to enable the admin:
index af0d03e..d97126f 100644 (file)
@@ -4,7 +4,7 @@ from manifold.core.query                import Query
 from manifold.manifoldapi               import execute_query
 from portal.actions                     import manifold_update_user, manifold_update_account
 #
-from myslice.viewutils                  import topmenu_items, the_user
+from ui.topmenu                         import topmenu_items, the_user
 #
 from django.http                        import HttpResponse, HttpResponseRedirect
 from django.contrib                     import messages
index 8272fe0..0f2e401 100644 (file)
@@ -1,9 +1,9 @@
 from django.shortcuts           import render
-from django.template.loader      import render_to_string
+from django.template.loader     import render_to_string
 from django.views.generic       import View
 from django.core.mail           import send_mail
 
-from myslice.viewutils          import topmenu_items, the_user
+from ui.topmenu                 import topmenu_items, the_user
 
 from portal.forms               import ContactForm
 
index bbd1941..01478c7 100644 (file)
@@ -5,7 +5,7 @@ from plugins.lists.simplelist    import SimpleList
 
 from unfold.loginrequired        import LoginRequiredAutoLogoutView
 
-from myslice.viewutils           import topmenu_items, the_user
+from ui.topmenu                  import topmenu_items, the_user
 
 #This view requires login 
 class DashboardView (LoginRequiredAutoLogoutView):
index 592bc93..b5e47fe 100644 (file)
@@ -7,7 +7,7 @@ from django.template import RequestContext
 from django.shortcuts import render_to_response
 
 from manifold.manifoldresult import ManifoldResult
-from myslice.viewutils import topmenu_items, the_user
+from ui.topmenu import topmenu_items, the_user
 from myslice.config import Config
 
 class HomeView (View):
index 7101164..ddc9689 100644 (file)
@@ -3,7 +3,7 @@ from django.views.generic.base   import TemplateView
 from manifold.core.query         import Query
 from unfold.page                 import Page
 
-from myslice.viewutils           import topmenu_items, the_user
+from ui.topmenu                  import topmenu_items, the_user
 
 from plugins.hazelnut            import Hazelnut
 
index a432bc1..16148ee 100644 (file)
@@ -3,7 +3,7 @@ from django.views.generic.base   import TemplateView
 from manifold.core.query         import Query
 from unfold.page                 import Page
 
-from myslice.viewutils           import topmenu_items, the_user
+from ui.topmenu                  import topmenu_items, the_user
 
 from plugins.hazelnut            import Hazelnut
 
index 3cc5ab9..b5470fd 100644 (file)
@@ -2,7 +2,7 @@ from django.template import RequestContext
 from django.shortcuts import render_to_response
 
 from unfold.page import Page
-from myslice.viewutils import topmenu_items, the_user
+from ui.topmenu import topmenu_items, the_user
 
 class PortalPage(Page):
     def __init__(self, request):
index e756c3f..aefdaa7 100644 (file)
@@ -7,7 +7,7 @@ from django.template.loader     import render_to_string
 from django.shortcuts           import render
 
 from unfold.page                import Page
-from myslice.viewutils          import topmenu_items
+from ui.topmenu                 import topmenu_items
 
 from manifold.manifoldapi       import execute_query
 from manifold.core.query        import Query
index 6589e8a..de1f83d 100644 (file)
@@ -9,7 +9,7 @@ from portal.models               import PendingSlice
 from portal.actions              import authority_get_pi_emails
 from portal.forms                import SliceRequestForm
 from unfold.loginrequired        import LoginRequiredAutoLogoutView
-from myslice.viewutils           import topmenu_items, the_user
+from ui.topmenu                  import topmenu_items, the_user
 
 class SliceRequestView (LoginRequiredAutoLogoutView):
 
index f640b32..175a40e 100644 (file)
@@ -6,7 +6,7 @@ from unfold.loginrequired            import LoginRequiredAutoLogoutView
 from unfold.page                     import Page
 from manifold.core.query             import Query, AnalyzedQuery
 
-from myslice.viewutils               import topmenu_items, the_user
+from ui.topmenu                      import topmenu_items, the_user
 
 from plugins.raw                     import Raw
 from plugins.stack                   import Stack
index 60f1613..997dbfb 100644 (file)
@@ -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 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
index c134269..a0f0cf8 100644 (file)
@@ -21,7 +21,7 @@
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 from django.views.generic.base   import TemplateView
-from myslice.viewutils           import topmenu_items, the_user
+from ui.topmenu                  import topmenu_items, the_user
 
 class WebSocketsView(TemplateView):
     template_name = "websockets.html"
index 20bc15f..08a630d 100644 (file)
@@ -16,10 +16,10 @@ from plugins.lists.slicelist import SliceList
 from plugins.querycode import QueryCode
 from plugins.quickfilter import QuickFilter
 
-from trash.trashutils  import quickfilter_criterias
+from trash.trashutils import quickfilter_criterias
 
 # 
-from myslice.viewutils import topmenu_items, the_user
+from ui.topmenu import topmenu_items, the_user
 
 @login_required
 def dashboard_view (request):
index 366c131..0b22e11 100644 (file)
@@ -19,8 +19,8 @@ from plugins.raw                        import Raw
 from plugins.messages                   import Messages
 from plugins.hazelnut                   import Hazelnut
 
-from myslice.viewutils                  import topmenu_items, the_user
-from trash.trashutils                  import hard_wired_slice_names, hard_wired_list, lorem_p, lorem, quickfilter_criterias
+from ui.topmenu                         import topmenu_items, the_user
+from trash.trashutils                   import hard_wired_slice_names, hard_wired_list, lorem_p, lorem, quickfilter_criterias
 
 #might be useful or not depending on the context
 #@login_required
index 0207d4d..ad8571d 100644 (file)
@@ -6,9 +6,9 @@ from django.contrib.auth.decorators import login_required
 
 from unfold.prelude import Prelude
 
-from myslice.viewutils import topmenu_items, the_user
+from ui.topmenu import topmenu_items, the_user
 # tmp
-from trash.trashutils  import lorem, hard_wired_slice_names
+from trash.trashutils import lorem, hard_wired_slice_names
 
 @login_required
 def tab_view (request):
similarity index 100%
rename from views/__init__.py
rename to ui/__init__.py
similarity index 99%
rename from myslice/viewutils.py
rename to ui/topmenu.py
index f00a451..bcf74b1 100644 (file)
@@ -40,4 +40,3 @@ def the_user (request):
         return ''
     else: 
         return request.user.email
-