# HG changeset patch # User cavaliet # Date 1404384424 -7200 # Node ID 0bb9c29cd41db92c1b454965a393c132a9a398c4 # Parent 1235aa03159fdf4b697356f09abc22b9b82adde6 renkan first step : link, views and get put for json diff -r 1235aa03159f -r 0bb9c29cd41d .settings/org.eclipse.core.resources.prefs --- a/.settings/org.eclipse.core.resources.prefs Mon Jun 30 12:47:35 2014 +0200 +++ b/.settings/org.eclipse.core.resources.prefs Thu Jul 03 12:47:04 2014 +0200 @@ -47,5 +47,6 @@ encoding//src/hdalab/utils.py=utf-8 encoding//src/hdalab/views/ajax.py=utf-8 encoding//src/hdalab/views/pages.py=utf-8 +encoding//src/hdalab/views/renkan.py=utf-8 encoding//web/hdalab/config.py=utf-8 encoding//web/hdalab/management/commands/fill_country_codes.py=utf-8 diff -r 1235aa03159f -r 0bb9c29cd41d src/hdalab/static/hdalab/css/additionnal_renkan.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hdalab/static/hdalab/css/additionnal_renkan.css Thu Jul 03 12:47:04 2014 +0200 @@ -0,0 +1,3 @@ +#container { + overflow: hidden; +} \ No newline at end of file diff -r 1235aa03159f -r 0bb9c29cd41d src/hdalab/static/hdalab/js/gomina.js --- a/src/hdalab/static/hdalab/js/gomina.js Mon Jun 30 12:47:35 2014 +0200 +++ b/src/hdalab/static/hdalab/js/gomina.js Thu Jul 03 12:47:04 2014 +0200 @@ -229,17 +229,28 @@ .css({ "margin-left" : "0" }); + // modif renkan + var url_renkan = $("#renkan-link").attr("href"); + console.log("url_renkan", url_renkan); + url_renkan = ((url_renkan.lastIndexOf("?")>=0) ? (url_renkan.substr(0, url_renkan.lastIndexOf("?"))) : url_renkan) + "?"; + console.log("url_renkan", url_renkan); if (_cl) { + url_renkan += "countries="; _htmFilters += _(_curView.country).map(function(_t, _i) { + var country_label = ( (typeof gomNs.countries == "object" && typeof gomNs.countries[_t] == "object") ? gomNs.countries[_t].properties.labels[gomNs.languageCode] : decodeURIComponent(_t.match('[^/]+$')[0]).replace('_',' ')); + url_renkan += "," + country_label; return '