From c6cb049fa23065c0c7442f3c021c92dba43c5658 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 14 Mar 2013 14:39:05 +0100 Subject: [PATCH] reorganize plugins by plugin --- Makefile | 2 +- engine/tests.py | 2 +- plugins/{ => lists}/__init__.py | 0 plugins/{static/css => lists}/simplelist.css | 0 plugins/{templates => lists}/simplelist.html | 0 plugins/{static/js => lists}/simplelist.js | 0 plugins/{ => lists}/simplelist.py | 0 plugins/{ => lists}/slicelist.py | 2 +- plugins/{static/css => lists}/staticlist.css | 0 plugins/{templates => lists}/staticlist.html | 0 plugins/{ => lists}/staticlist.py | 0 plugins/{static/js => lists}/with-datatables.js | 0 plugins/querycode/__init__.py | 0 plugins/{static/css => querycode}/querycode.css | 0 plugins/{templates => querycode}/querycode.html | 0 plugins/{static/js => querycode}/querycode.js | 0 plugins/{ => querycode}/querycode.py | 0 plugins/quickfilter/__init__.py | 0 plugins/{static/css => quickfilter}/quickfilter.css | 0 plugins/{templates => quickfilter}/quickfilter.html | 0 plugins/{static/js => quickfilter}/quickfilter.js | 0 plugins/{ => quickfilter}/quickfilter.py | 0 plugins/raw/__init__.py | 0 plugins/{ => raw}/raw.py | 0 plugins/tabs/__init__.py | 0 plugins/{static/css => tabs}/tabs.css | 0 plugins/{templates => tabs}/tabs.html | 0 plugins/{ => tabs}/tabs.py | 0 plugins/verticallayout/__init__.py | 0 .../{templates => verticallayout}/verticallayout.html | 0 plugins/{ => verticallayout}/verticallayout.py | 0 trash/dashboard.py | 6 +++--- trash/pluginview.py | 10 +++++----- 33 files changed, 11 insertions(+), 11 deletions(-) rename plugins/{ => lists}/__init__.py (100%) rename plugins/{static/css => lists}/simplelist.css (100%) rename plugins/{templates => lists}/simplelist.html (100%) rename plugins/{static/js => lists}/simplelist.js (100%) rename plugins/{ => lists}/simplelist.py (100%) rename plugins/{ => lists}/slicelist.py (88%) rename plugins/{static/css => lists}/staticlist.css (100%) rename plugins/{templates => lists}/staticlist.html (100%) rename plugins/{ => lists}/staticlist.py (100%) rename plugins/{static/js => lists}/with-datatables.js (100%) create mode 100644 plugins/querycode/__init__.py rename plugins/{static/css => querycode}/querycode.css (100%) rename plugins/{templates => querycode}/querycode.html (100%) rename plugins/{static/js => querycode}/querycode.js (100%) rename plugins/{ => querycode}/querycode.py (100%) create mode 100644 plugins/quickfilter/__init__.py rename plugins/{static/css => quickfilter}/quickfilter.css (100%) rename plugins/{templates => quickfilter}/quickfilter.html (100%) rename plugins/{static/js => quickfilter}/quickfilter.js (100%) rename plugins/{ => quickfilter}/quickfilter.py (100%) create mode 100644 plugins/raw/__init__.py rename plugins/{ => raw}/raw.py (100%) create mode 100644 plugins/tabs/__init__.py rename plugins/{static/css => tabs}/tabs.css (100%) rename plugins/{templates => tabs}/tabs.html (100%) rename plugins/{ => tabs}/tabs.py (100%) create mode 100644 plugins/verticallayout/__init__.py rename plugins/{templates => verticallayout}/verticallayout.html (100%) rename plugins/{ => verticallayout}/verticallayout.py (100%) diff --git a/Makefile b/Makefile index c267b499..7d4cbbcc 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ all-static: clean-static run-static #################### manage templates for the plugin area templates run-templates templates-run: force mkdir -p all-templates - ln -sf $(foreach x,$(shell $(MAKE) list-templates),.../$(x)) ./all-templates + ln -sf $(foreach x,$(shell $(MAKE) list-templates),../$(x)) ./all-templates # rsync -av $(shell $(MAKE) list-templates) ./all-templates clean-templates templates-clean: force diff --git a/engine/tests.py b/engine/tests.py index ec825fe4..4ef3cd14 100644 --- a/engine/tests.py +++ b/engine/tests.py @@ -7,7 +7,7 @@ Replace this with more appropriate tests for your application. from django.test import TestCase -from plugins.simplelist import SimpleList +from plugins.lists.simplelist import SimpleList class PluginTest(TestCase): def test_basic(self): diff --git a/plugins/__init__.py b/plugins/lists/__init__.py similarity index 100% rename from plugins/__init__.py rename to plugins/lists/__init__.py diff --git a/plugins/static/css/simplelist.css b/plugins/lists/simplelist.css similarity index 100% rename from plugins/static/css/simplelist.css rename to plugins/lists/simplelist.css diff --git a/plugins/templates/simplelist.html b/plugins/lists/simplelist.html similarity index 100% rename from plugins/templates/simplelist.html rename to plugins/lists/simplelist.html diff --git a/plugins/static/js/simplelist.js b/plugins/lists/simplelist.js similarity index 100% rename from plugins/static/js/simplelist.js rename to plugins/lists/simplelist.js diff --git a/plugins/simplelist.py b/plugins/lists/simplelist.py similarity index 100% rename from plugins/simplelist.py rename to plugins/lists/simplelist.py diff --git a/plugins/slicelist.py b/plugins/lists/slicelist.py similarity index 88% rename from plugins/slicelist.py rename to plugins/lists/slicelist.py index c70e4122..b9220db9 100644 --- a/plugins/slicelist.py +++ b/plugins/lists/slicelist.py @@ -1,4 +1,4 @@ -from plugins.simplelist import SimpleList +from plugins.lists.simplelist import SimpleList # the SimpleList plugin requires 'key' and 'value' that are used # on the results of the query for rendering diff --git a/plugins/static/css/staticlist.css b/plugins/lists/staticlist.css similarity index 100% rename from plugins/static/css/staticlist.css rename to plugins/lists/staticlist.css diff --git a/plugins/templates/staticlist.html b/plugins/lists/staticlist.html similarity index 100% rename from plugins/templates/staticlist.html rename to plugins/lists/staticlist.html diff --git a/plugins/staticlist.py b/plugins/lists/staticlist.py similarity index 100% rename from plugins/staticlist.py rename to plugins/lists/staticlist.py diff --git a/plugins/static/js/with-datatables.js b/plugins/lists/with-datatables.js similarity index 100% rename from plugins/static/js/with-datatables.js rename to plugins/lists/with-datatables.js diff --git a/plugins/querycode/__init__.py b/plugins/querycode/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/plugins/static/css/querycode.css b/plugins/querycode/querycode.css similarity index 100% rename from plugins/static/css/querycode.css rename to plugins/querycode/querycode.css diff --git a/plugins/templates/querycode.html b/plugins/querycode/querycode.html similarity index 100% rename from plugins/templates/querycode.html rename to plugins/querycode/querycode.html diff --git a/plugins/static/js/querycode.js b/plugins/querycode/querycode.js similarity index 100% rename from plugins/static/js/querycode.js rename to plugins/querycode/querycode.js diff --git a/plugins/querycode.py b/plugins/querycode/querycode.py similarity index 100% rename from plugins/querycode.py rename to plugins/querycode/querycode.py diff --git a/plugins/quickfilter/__init__.py b/plugins/quickfilter/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/plugins/static/css/quickfilter.css b/plugins/quickfilter/quickfilter.css similarity index 100% rename from plugins/static/css/quickfilter.css rename to plugins/quickfilter/quickfilter.css diff --git a/plugins/templates/quickfilter.html b/plugins/quickfilter/quickfilter.html similarity index 100% rename from plugins/templates/quickfilter.html rename to plugins/quickfilter/quickfilter.html diff --git a/plugins/static/js/quickfilter.js b/plugins/quickfilter/quickfilter.js similarity index 100% rename from plugins/static/js/quickfilter.js rename to plugins/quickfilter/quickfilter.js diff --git a/plugins/quickfilter.py b/plugins/quickfilter/quickfilter.py similarity index 100% rename from plugins/quickfilter.py rename to plugins/quickfilter/quickfilter.py diff --git a/plugins/raw/__init__.py b/plugins/raw/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/plugins/raw.py b/plugins/raw/raw.py similarity index 100% rename from plugins/raw.py rename to plugins/raw/raw.py diff --git a/plugins/tabs/__init__.py b/plugins/tabs/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/plugins/static/css/tabs.css b/plugins/tabs/tabs.css similarity index 100% rename from plugins/static/css/tabs.css rename to plugins/tabs/tabs.css diff --git a/plugins/templates/tabs.html b/plugins/tabs/tabs.html similarity index 100% rename from plugins/templates/tabs.html rename to plugins/tabs/tabs.html diff --git a/plugins/tabs.py b/plugins/tabs/tabs.py similarity index 100% rename from plugins/tabs.py rename to plugins/tabs/tabs.py diff --git a/plugins/verticallayout/__init__.py b/plugins/verticallayout/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/plugins/templates/verticallayout.html b/plugins/verticallayout/verticallayout.html similarity index 100% rename from plugins/templates/verticallayout.html rename to plugins/verticallayout/verticallayout.html diff --git a/plugins/verticallayout.py b/plugins/verticallayout/verticallayout.py similarity index 100% rename from plugins/verticallayout.py rename to plugins/verticallayout/verticallayout.py diff --git a/trash/dashboard.py b/trash/dashboard.py index 62a0618f..1872a52d 100644 --- a/trash/dashboard.py +++ b/trash/dashboard.py @@ -10,9 +10,9 @@ from django.contrib.auth.decorators import login_required from engine.page import Page from engine.manifoldquery import ManifoldQuery -from plugins.verticallayout import VerticalLayout -from plugins.slicelist import SliceList -from plugins.querycode import QueryCode +from plugins.verticallayout.verticallayout import VerticalLayout +from plugins.lists.slicelist import SliceList +from plugins.querycode.querycode import QueryCode # from myslice.viewutils import topmenu_items, the_user diff --git a/trash/pluginview.py b/trash/pluginview.py index 3c717a12..5d29eb5b 100644 --- a/trash/pluginview.py +++ b/trash/pluginview.py @@ -9,11 +9,11 @@ from django.contrib.auth.decorators import login_required from engine.page import Page -from plugins.verticallayout import VerticalLayout -from plugins.tabs import Tabs -from plugins.staticlist import StaticList -from plugins.quickfilter import QuickFilter -from plugins.raw import Raw +from plugins.verticallayout.verticallayout import VerticalLayout +from plugins.tabs.tabs import Tabs +from plugins.lists.staticlist import StaticList +from plugins.quickfilter.quickfilter import QuickFilter +from plugins.raw.raw import Raw from myslice.viewutils import topmenu_items, the_user from myslice.viewutils import hard_wired_slice_names, hard_wired_list, lorem_p, lorem, quickfilter_criterias -- 2.43.0