cleanup the trash/ area

diff --git a/trash/dashboard.py b/trash/dashboardview.py
similarity index 100%
rename from trash/dashboard.py
rename to trash/dashboardview.py

diff --git a/trash/simplegridview.py b/trash/querygridview.py
similarity index 98%
rename from trash/simplegridview.py
rename to trash/querygridview.py
index 014e143..ef8d993 100644 (file)
--- a/trash/simplegridview.py
+++ b/trash/querygridview.py
@@ -11,7 +11,7 @@ from ui.topmenu import topmenu_items, the_user
 
 from plugins.querygrid import QueryGrid
 
 
 from plugins.querygrid import QueryGrid
 

-class SimpleGridView (TemplateView):
+class QueryGridView (TemplateView):

 
     def get (self, request, slicename='ple.inria.f14'):
 
 
     def get (self, request, slicename='ple.inria.f14'):
 

diff --git a/trash/simpletableview.py b/trash/querytableview.py
similarity index 98%
rename from trash/simpletableview.py
rename to trash/querytableview.py
index e0fd770..2e08abc 100644 (file)
--- a/trash/simpletableview.py
+++ b/trash/querytableview.py
@@ -11,7 +11,7 @@ from ui.topmenu import topmenu_items, the_user
 
 from plugins.querytable import QueryTable
 
 
 from plugins.querytable import QueryTable
 

-class SimpleTableView (TemplateView):
+class QueryTableView (TemplateView):

 
     def get (self, request, slicename='ple.inria.f14'):
 
 
     def get (self, request, slicename='ple.inria.f14'):
 

diff --git a/trash/sampleviews.py b/trash/sampleviews.py
deleted file mode 100644 (file)
index e1c66d8..0000000
--- a/trash/sampleviews.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# Create your views here.
-from django.core.context_processors import csrf
-from django.template import RequestContext
-from django.shortcuts import render_to_response
-from django.contrib.auth.decorators import login_required
-
-from unfold.prelude import Prelude
-
-from ui.topmenu import topmenu_items, the_user
-# tmp
-from trash.trashutils import lorem, hard_wired_slice_names
-
-@login_required
-def tab_view (request):
-    print "request", request.__class__
-    print request
-    prelude=Prelude( js_files='js/bootstrap.js', css_files='css/bootstrap.css')
-    prelude_env = prelude.prelude_env()
-
-    tab_env = {'title':'Page for playing with Tabs',
-               'topmenu_items': topmenu_items('tab',request),
-               'username':the_user (request),
-               'lorem': lorem,                                
-               }
-    tab_env.update (prelude_env)
-    return render_to_response ('view-tab.html', tab_env,
-                               context_instance=RequestContext(request))
-
-def scroll_view (request):
-    return render_to_response ('view-scroll.html',
-                               {'title':'Toy page for scrolling',
-                                'topmenu_items': topmenu_items('scroll',request),
-                                'username':the_user (request),
-                                'lorem':lorem,
-                                },
-                               context_instance=RequestContext(request))
-
-@login_required
-def test_plugin_view (request):
-
-    page = Page(request)
-    
-    # variables that will get passed to this template
-    template_env = {}
-    
-    main_plugin = \
-        Stack ( page=page,
-                title='title for the vertical layout',
-                sons = [ StaticList (page=page,
-                                     title='StaticList - with datatables - starts toggled off',
-                                     list=hard_wired_list, 
-                                     header='Hard wired header', 
-                                     foo='the value for foo',
-                                     with_datatables=True,
-                                     toggled=False),
-                         Tabs (page=page,
-                               title='Sample Tabs',
-                               domid='test-tabs',
-                               # *** we select this one to be the active tab ***
-                               active_domid='son2',
-                               sons = [ Raw (page=page,
-                                             title='a raw plugin',
-                                             domid='son0',
-                                             togglable=False,
-                                             html= 3*lorem_p,
-                                             ),
-                                        StaticList(page=page,
-                                                   title='a slice list',
-                                                   domid='son1',
-                                                   togglable=False,
-                                                   header="static list but not togglable",
-                                                   list=hard_wired_slice_names,
-                                                   ),
-                                        Raw (page=page,
-                                             title='raw title',
-                                             domid='son2',
-                                             togglable=False,
-                                             html=lorem) ]),
-                         StaticList (page=page,
-                                     title='SimpleList with slice names', 
-                                     list=hard_wired_slice_names,
-                                     ),
-                         QuickFilter (page=page,
-                                      title='QuickFilter in main content',
-                                      criterias=quickfilter_criterias,
-                                      ) ] )
-    # define 'unfold_main' to the template engine
-    template_env [ 'unfold_main' ] = main_plugin.render(request)
-
-    ##########
-    related_plugin = StaticList (page=page,
-                                 title='SliceList plugin',domid='slicelist1',
-                                 with_datatables='yes', 
-                                 list=hard_wired_slice_names, 
-                                 header='Slices')
-    # likewise but on the side view
-    template_env [ 'unfold_margin' ] = related_plugin.render (request)
-
-    # more general variables expected in the template
-    template_env [ 'title' ] = 'Test Plugin View' 
-    template_env [ 'topmenu_items' ] = topmenu_items('plugin', request) 
-    template_env [ 'username' ] = the_user (request) 
-
-    # we don't have anythong asynchroneous, and manifold.js is not loaded
-#    page.expose_queries ()
-
-    # the prelude object in page contains a summary of the requirements() for all plugins
-    # define {js,css}_{files,chunks}
-    prelude_env = page.prelude_env()
-    template_env.update(prelude_env)
-    return render_to_response ('view-unfold2.html',template_env,
-                               context_instance=RequestContext(request))
-                               

diff --git a/trash/scrollview.py b/trash/scrollview.py
new file mode 100644 (file)
index 0000000..605cb3c
--- /dev/null
+++ b/trash/scrollview.py
@@ -0,0 +1,20 @@
+from django.core.context_processors import csrf
+from django.template import RequestContext
+from django.shortcuts import render_to_response
+from django.contrib.auth.decorators import login_required
+
+from unfold.prelude import Prelude
+
+from ui.topmenu import topmenu_items, the_user
+# tmp
+from trash.trashutils import lorem, hard_wired_slice_names
+
+def scroll_view (request):
+    return render_to_response ('view-scroll.html',
+                               {'title':'Toy page for scrolling',
+                                'topmenu_items': topmenu_items('scroll',request),
+                                'username':the_user (request),
+                                'lorem':lorem,
+                                },
+                               context_instance=RequestContext(request))
+

diff --git a/trash/tabview.py b/trash/tabview.py
new file mode 100644 (file)
index 0000000..167788e
--- /dev/null
+++ b/trash/tabview.py
@@ -0,0 +1,27 @@
+from django.core.context_processors import csrf
+from django.template import RequestContext
+from django.shortcuts import render_to_response
+from django.contrib.auth.decorators import login_required
+
+from unfold.prelude import Prelude
+
+from ui.topmenu import topmenu_items, the_user
+# tmp
+from trash.trashutils import lorem, hard_wired_slice_names
+
+@login_required
+def tab_view (request):
+    print "request", request.__class__
+    print request
+    prelude=Prelude( js_files='js/bootstrap.js', css_files='css/bootstrap.css')
+    prelude_env = prelude.prelude_env()
+
+    tab_env = {'title':'Page for playing with Tabs',
+               'topmenu_items': topmenu_items('tab',request),
+               'username':the_user (request),
+               'lorem': lorem,                                
+               }
+    tab_env.update (prelude_env)
+    return render_to_response ('view-tab.html', tab_env,
+                               context_instance=RequestContext(request))
+

diff --git a/trash/urls.py b/trash/urls.py
index 32e3ad4..88bfe3e 100644 (file)
--- a/trash/urls.py
+++ b/trash/urls.py
@@ -1,16 +1,16 @@
 from django.conf.urls           import patterns, include, url
 
 from django.conf.urls           import patterns, include, url
 

-import trash.simpletableview
-import trash.simplegridview
-import trash.simplevalidatebutton
+import trash.querytableview
+import trash.querygridview
+import trash.validatebuttonview

 
 urlpatterns = patterns(
     '',
 
 urlpatterns = patterns(
     '',

-    url(r'^tab/?$',          'trash.sampleviews.tab_view'),
-    url(r'^scroll/?$',          'trash.sampleviews.scroll_view'),
-    url(r'^plugin/?$',          'trash.pluginview.test_plugin_view'),
-    url(r'^dashboard/?$',       'trash.dashboard.dashboard_view'),
-    url(r'^simpletable/(?P<slicename>[\w\.]+)/?$', trash.simpletableview.SimpleTableView.as_view()),
-    url(r'^simplegrid/(?P<slicename>[\w\.]+)/?$', trash.simplegridview.SimpleGridView.as_view()),
-    url(r'^simplevalidatebutton/(?P<username>[\w\._]+)/?$', trash.simplevalidatebutton.SimpleValidateButtonView.as_view()),
+    url(r'^tab/?$',                                             'trash.tabview.tab_view'),
+    url(r'^scroll/?$',                                          'trash.scrollview.scroll_view'),
+    url(r'^plugin/?$',                                          'trash.pluginview.test_plugin_view'),
+    url(r'^dashboard/?$',                                       'trash.dashboardview.dashboard_view'),
+    url(r'^querytable/(?P<slicename>[\w\.]+)/?$',               trash.querytableview.QueryTableView.as_view()),
+    url(r'^querygrid/(?P<slicename>[\w\.]+)/?$',                trash.querygridview.QueryGridView.as_view()),
+    url(r'^validatebutton/(?P<username>[\w\._]+)/?$',           trash.validatebuttonview.ValidateButtonView.as_view()),

 )
 )

diff --git a/trash/simplevalidatebutton.py b/trash/validatebuttonview.py
similarity index 98%
rename from trash/simplevalidatebutton.py
rename to trash/validatebuttonview.py
index b4bd638..5c861f7 100644 (file)
--- a/trash/simplevalidatebutton.py
+++ b/trash/validatebuttonview.py
@@ -11,7 +11,7 @@ from ui.topmenu import topmenu_items, the_user
 
 from plugins.validatebutton import ValidateButton
 
 
 from plugins.validatebutton import ValidateButton
 

-class SimpleValidateButtonView (TemplateView):
+class ValidateButtonView (TemplateView):

 
     # mention a user name in the URL as .../trash/simplevalidatebutton/ple.inria.thierry_parmentelat
     def get (self, request, username='ple.inria.thierry_parmentelat'):
 
     # mention a user name in the URL as .../trash/simplevalidatebutton/ple.inria.thierry_parmentelat
     def get (self, request, username='ple.inria.thierry_parmentelat'):