From: Thierry Parmentelat Date: Mon, 16 Dec 2013 10:47:32 +0000 (+0100) Subject: merged trash/ into sample/ X-Git-Tag: myslice-0.3-0~68 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=04ea5e29850e650e370b7815c491f3538b442d9e merged trash/ into sample/ --- diff --git a/myslice/settings.py b/myslice/settings.py index b7b7b2c9..5c2d29cc 100644 --- a/myslice/settings.py +++ b/myslice/settings.py @@ -34,12 +34,13 @@ if not os.path.isdir (os.path.join(HTTPROOT,"static")): if not os.path.isdir(ROOT): raise Exception,"Cannot find ROOT %s for unfold"%ROOT if not os.path.isdir(HTTPROOT): raise Exception,"Cannot find HTTPROOT %s for unfold"%HTTPROOT -# dec 2013 - we currently have 3 auxiliary subdirs with various utilities +# dec 2013 - we currently have 2 auxiliary subdirs with various utilities # that we do not wish to package -# hopefully the number should go down to 1 +# * sandbox is for plugin developers +# * sample is for various test views # for each of these, if we find a directory of that name under ROOT, it then gets # inserted in INSTALLED_APPS and its urls get included (see urls.py) -auxiliaries = [ 'sandbox', 'sample', 'trash', ] +auxiliaries = [ 'sandbox', 'sample', ] #################### ADMINS = ( diff --git a/trash/dashboardview.py b/sample/dashboardview.py similarity index 100% rename from trash/dashboardview.py rename to sample/dashboardview.py diff --git a/trash/pluginview.py b/sample/pluginview.py similarity index 100% rename from trash/pluginview.py rename to sample/pluginview.py diff --git a/trash/querygridview.py b/sample/querygridview.py similarity index 100% rename from trash/querygridview.py rename to sample/querygridview.py diff --git a/trash/querytableview.py b/sample/querytableview.py similarity index 100% rename from trash/querytableview.py rename to sample/querytableview.py diff --git a/trash/scrollview.py b/sample/scrollview.py similarity index 100% rename from trash/scrollview.py rename to sample/scrollview.py diff --git a/trash/static/css/dashboard.css b/sample/static/css/dashboard.css similarity index 100% rename from trash/static/css/dashboard.css rename to sample/static/css/dashboard.css diff --git a/trash/static/css/sample.css b/sample/static/css/sample.css similarity index 100% rename from trash/static/css/sample.css rename to sample/static/css/sample.css diff --git a/trash/tabview.py b/sample/tabview.py similarity index 100% rename from trash/tabview.py rename to sample/tabview.py diff --git a/trash/templates/view-scroll.html b/sample/templates/view-scroll.html similarity index 100% rename from trash/templates/view-scroll.html rename to sample/templates/view-scroll.html diff --git a/trash/templates/view-tab.html b/sample/templates/view-tab.html similarity index 100% rename from trash/templates/view-tab.html rename to sample/templates/view-tab.html diff --git a/trash/templates/view-unfold2.html b/sample/templates/view-unfold2.html similarity index 100% rename from trash/templates/view-unfold2.html rename to sample/templates/view-unfold2.html diff --git a/trash/trashutils.py b/sample/trashutils.py similarity index 100% rename from trash/trashutils.py rename to sample/trashutils.py diff --git a/sample/urls.py b/sample/urls.py index d56b5dc9..0d06e3e9 100644 --- a/sample/urls.py +++ b/sample/urls.py @@ -23,7 +23,19 @@ from django.conf.urls import patterns, url from sample.views import WebSocketsView, WebSockets2View -urlpatterns = patterns('', +import sample.querytableview +import sample.querygridview +import sample.validatebuttonview + +urlpatterns = patterns( + '', url(r'^websockets/?$', WebSocketsView.as_view(), name='websockets'), url(r'^websockets2/?$', WebSockets2View.as_view(), name='websockets2'), + url(r'^tab/?$', 'sample.tabview.tab_view'), + url(r'^scroll/?$', 'sample.scrollview.scroll_view'), + url(r'^plugin/?$', 'sample.pluginview.test_plugin_view'), + url(r'^dashboard/?$', 'sample.dashboardview.dashboard_view'), + url(r'^querytable/(?P[\w\.]+)/?$', sample.querytableview.QueryTableView.as_view()), + url(r'^querygrid/(?P[\w\.]+)/?$', sample.querygridview.QueryGridView.as_view()), + url(r'^validatebutton/(?P[\w\._]+)/?$', sample.validatebuttonview.ValidateButtonView.as_view()), ) diff --git a/trash/validatebuttonview.py b/sample/validatebuttonview.py similarity index 100% rename from trash/validatebuttonview.py rename to sample/validatebuttonview.py diff --git a/trash/__init__.py b/trash/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/trash/urls.py b/trash/urls.py deleted file mode 100644 index 88bfe3e7..00000000 --- a/trash/urls.py +++ /dev/null @@ -1,16 +0,0 @@ -from django.conf.urls import patterns, include, url - -import trash.querytableview -import trash.querygridview -import trash.validatebuttonview - -urlpatterns = patterns( - '', - 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[\w\.]+)/?$', trash.querytableview.QueryTableView.as_view()), - url(r'^querygrid/(?P[\w\.]+)/?$', trash.querygridview.QueryGridView.as_view()), - url(r'^validatebutton/(?P[\w\._]+)/?$', trash.validatebuttonview.ValidateButtonView.as_view()), -)