X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=175a40e6a3f7b7d034f89ffc7b4e7fdc571a7ee1;hb=78df408072b4777a4a20540e70c38c0896645a5b;hp=d3dea6f8444f902d2172e60f526a2f6c9c3aaa33;hpb=2b1211c766c56a7b962d8b82c8f638825b6166cb;p=unfold.git diff --git a/portal/sliceview.py b/portal/sliceview.py index d3dea6f8..175a40e6 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -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 @@ -32,6 +32,7 @@ class SliceView (LoginRequiredAutoLogoutView): page = Page(request) page.add_css_files ('css/slice-view.css') + page.add_js_files ( [ "js/common.functions.js" ] ) page.add_js_chunks ('$(function() { console.log("sliceview: jQuery version " + $.fn.jquery); });') page.add_js_chunks ('$(function() { console.log("sliceview: users turned %s"); });'%("on" if do_query_users else "off")) page.expose_js_metadata() @@ -120,8 +121,8 @@ class SliceView (LoginRequiredAutoLogoutView): checkboxes = True, # center on Paris latitude = 49., - longitude = 2.2, - zoom = 3, + longitude = 9, + zoom = 4, ) resources_as_list = Hazelnut( @@ -143,7 +144,7 @@ class SliceView (LoginRequiredAutoLogoutView): resources_query_editor = QueryEditor( page = page, - query = sq_resource, + query = query_resource_all, title = "Select Columns", ) resources_active_filters = ActiveFilters(