X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=74101f2cf847e6aeeaf56e0d9230dbb3d218f4e3;hb=f0dee854c76a1b065550eff5989abff77e87cb32;hp=871947f24157cd7beb42fa082ae4b39fef204451;hpb=1c6cc165d68615e58949124447b5eb8bc4c995b5;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index 871947f2..74101f2c 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 @@ -21,6 +21,8 @@ from plugins.active_filters import ActiveFilters from plugins.quickfilter import QuickFilter from plugins.messages import Messages +from myslice.config import Config + tmp_default_slice='ple.upmc.myslicedemo' # temporary : turn off the users part to speed things up @@ -33,8 +35,9 @@ 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.add_js_chunks ('$(function() { messages.debug("sliceview: jQuery version " + $.fn.jquery); });') + page.add_js_chunks ('$(function() { messages.debug("sliceview: users turned %s"); });'%("on" if do_query_users else "off")) + page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(Config.manifold_url())) page.expose_js_metadata() metadata = page.get_metadata() @@ -121,8 +124,8 @@ class SliceView (LoginRequiredAutoLogoutView): checkboxes = True, # center on Paris latitude = 49., - longitude = 2.2, - zoom = 3, + longitude = 9, + zoom = 4, ) resources_as_list = Hazelnut(