From 908a927353b1fd6f933bfc9e12846f78c179968f Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 3 Sep 2013 16:45:19 +0200 Subject: [PATCH] keep only import topmenu_items, the_user in myslice/viewutils all the rest goes into trash/trashutils --- myslice/viewutils.py | 49 ----------------------------------------- trash/dashboard.py | 2 +- trash/pluginview.py | 2 +- trash/sampleviews.py | 2 +- trash/sliceview.py | 4 +++- trash/trashutils.py | 52 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 58 insertions(+), 53 deletions(-) create mode 100644 trash/trashutils.py diff --git a/myslice/viewutils.py b/myslice/viewutils.py index b9309e1b..7fbdc77f 100644 --- a/myslice/viewutils.py +++ b/myslice/viewutils.py @@ -1,20 +1,5 @@ # a set of utilities to help make the global layout consistent across views -# this -standard_topmenu_items = [ -# { 'label':'Tab', 'href': '/tab/'}, -# { 'label':'Scroll', 'href': '/scroll/'}, -# { 'label':'One Plugin', 'href': '/plugin/'}, -# Thierry : using this goes to some test slice that not every one is in -# besides, the topmenu needs to be shrunk down horizontally -# otherwise the topmenu takes more vertical space than avail. and the layout is broken -# { 'label':'Slice', 'href': '/slice/'}, - #{'label':'My Account', 'href': '/portal/account/'} - ] - -#login_out_items = { False: { 'label':'Login', 'href':'/login/'}, -# True: { 'label':'Logout', 'href':'/logout/'}} - def topmenu_items (current,request=None): has_user=request.user.is_authenticated() result=[] @@ -45,37 +30,3 @@ def the_user (request): else: return request.user.email -# temporary for sample views -lorem=""" -Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius. Claritas est etiam processus dynamicus, qui sequitur mutationem consuetudium lectorum. Mirum est notare quam littera gothica, quam nunc putamus parum claram, anteposuerit litterarum formas humanitatis per seacula quarta decima et quinta decima. Eodem modo typi, qui nunc nobis videntur parum clari, fiant sollemnes in futurum. -""" - -lorem_p = "

"+lorem+"

" - -hard_wired_slice_names = [] -for site in [ 'inria', 'upmc' , 'ibbt' ]: - for slice in [ 'foo', 'bar', 'tutu', 'test', 'omf', 'heartbeat' ]: - hard_wired_slice_names.append ("ple.%s.%s"%(site,slice)) - -# having html tags right here is not a real use case -hard_wired_list=[] -hard_wired_list.append("this hard-wired list") -hard_wired_list.append("is defined") -hard_wired_list.append("in plugins.simplelist.py") -hard_wired_list.append("which in turn relies on") -hard_wired_list.append("template widget-template.html") -hard_wired_list.append("while it should of course") -hard_wired_list.append("instead issue a query") -hard_wired_list.append("and fill the DOM in js from there") -hard_wired_list.append("it would however maybe make sense") -hard_wired_list.append("to offer the option to 'datatablify'") -hard_wired_list.append("the list from the python code") -hard_wired_list.append("just like a standard plugin can be set as visible or not") -hard_wired_list.append("") -hard_wired_list.append("OTOH and IMHO, there should be two separate and explicit subclasses of SimpleList for slices or testbeds") - -quickfilter_criterias = [ - {'key': 'Slice', 'values': ['slice1','slice2']}, - {'key': 'Type', 'values': ['type1','type2']}, - {'key': 'Network', 'values': ['net1','net2']}, - ] diff --git a/trash/dashboard.py b/trash/dashboard.py index 07e60238..e996477f 100644 --- a/trash/dashboard.py +++ b/trash/dashboard.py @@ -16,7 +16,7 @@ from plugins.lists.slicelist import SliceList from plugins.querycode.querycode import QueryCode from plugins.quickfilter.quickfilter import QuickFilter -from myslice.viewutils import quickfilter_criterias +from trash.trashutils import quickfilter_criterias # from myslice.viewutils import topmenu_items, the_user diff --git a/trash/pluginview.py b/trash/pluginview.py index be17ee22..236744f0 100644 --- a/trash/pluginview.py +++ b/trash/pluginview.py @@ -21,7 +21,7 @@ from plugins.hazelnut import Hazelnut from plugins.updater import Updater from myslice.viewutils import topmenu_items, the_user -from myslice.viewutils import hard_wired_slice_names, hard_wired_list, lorem_p, lorem, quickfilter_criterias +from trash.trashutils import hard_wired_slice_names, hard_wired_list, lorem_p, lorem, quickfilter_criterias @login_required def test_plugin_view (request): diff --git a/trash/sampleviews.py b/trash/sampleviews.py index 81ad313c..0207d4da 100644 --- a/trash/sampleviews.py +++ b/trash/sampleviews.py @@ -8,7 +8,7 @@ from unfold.prelude import Prelude from myslice.viewutils import topmenu_items, the_user # tmp -from myslice.viewutils import lorem, hard_wired_slice_names +from trash.trashutils import lorem, hard_wired_slice_names @login_required def tab_view (request): diff --git a/trash/sliceview.py b/trash/sliceview.py index 55578e35..534ed78a 100644 --- a/trash/sliceview.py +++ b/trash/sliceview.py @@ -9,7 +9,9 @@ from unfold.page import Page from manifold.core.query import Query, AnalyzedQuery from manifold.manifoldresult import ManifoldException from manifold.metadata import MetaData as Metadata -from myslice.viewutils import quickfilter_criterias, topmenu_items, the_user +# need to remove this dep. +from trash.trashutils import quickfilter_criterias +from myslice.viewutils import topmenu_items, the_user from plugins.raw.raw import Raw from plugins.stack.stack import Stack diff --git a/trash/trashutils.py b/trash/trashutils.py new file mode 100644 index 00000000..dd470133 --- /dev/null +++ b/trash/trashutils.py @@ -0,0 +1,52 @@ +# a set of utilities to help make the global layout consistent across views + +# this +standard_topmenu_items = [ +# { 'label':'Tab', 'href': '/tab/'}, +# { 'label':'Scroll', 'href': '/scroll/'}, +# { 'label':'One Plugin', 'href': '/plugin/'}, +# Thierry : using this goes to some test slice that not every one is in +# besides, the topmenu needs to be shrunk down horizontally +# otherwise the topmenu takes more vertical space than avail. and the layout is broken +# { 'label':'Slice', 'href': '/slice/'}, + #{'label':'My Account', 'href': '/portal/account/'} + ] + +#login_out_items = { False: { 'label':'Login', 'href':'/login/'}, +# True: { 'label':'Logout', 'href':'/logout/'}} + +# temporary for sample views +lorem=""" +Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius. Claritas est etiam processus dynamicus, qui sequitur mutationem consuetudium lectorum. Mirum est notare quam littera gothica, quam nunc putamus parum claram, anteposuerit litterarum formas humanitatis per seacula quarta decima et quinta decima. Eodem modo typi, qui nunc nobis videntur parum clari, fiant sollemnes in futurum. +""" + +lorem_p = "

"+lorem+"

" + +hard_wired_slice_names = [] +for site in [ 'inria', 'upmc' , 'ibbt' ]: + for slice in [ 'foo', 'bar', 'tutu', 'test', 'omf', 'heartbeat' ]: + hard_wired_slice_names.append ("ple.%s.%s"%(site,slice)) + +# having html tags right here is not a real use case +hard_wired_list=[] +hard_wired_list.append("this hard-wired list") +hard_wired_list.append("is defined") +hard_wired_list.append("in plugins.simplelist.py") +hard_wired_list.append("which in turn relies on") +hard_wired_list.append("template widget-template.html") +hard_wired_list.append("while it should of course") +hard_wired_list.append("instead issue a query") +hard_wired_list.append("and fill the DOM in js from there") +hard_wired_list.append("it would however maybe make sense") +hard_wired_list.append("to offer the option to 'datatablify'") +hard_wired_list.append("the list from the python code") +hard_wired_list.append("just like a standard plugin can be set as visible or not") +hard_wired_list.append("") +hard_wired_list.append("OTOH and IMHO, there should be two separate and explicit subclasses of SimpleList for slices or testbeds") + +quickfilter_criterias = [ + {'key': 'Slice', 'values': ['slice1','slice2']}, + {'key': 'Type', 'values': ['type1','type2']}, + {'key': 'Network', 'values': ['net1','net2']}, + ] + -- 2.43.0