# HG changeset patch # User veltr # Date 1328550619 -3600 # Node ID fdf808d7d374eb76a109cf72b267bafe13881c5c # Parent dc6c3ac62efaed210873fe38ffcef9c1db9a5e92 Ajout de l agregation geographique par pays et des donnees insee diff -r dc6c3ac62efa -r fdf808d7d374 hdalab/css/style.css --- a/hdalab/css/style.css Thu Feb 02 12:03:07 2012 +0100 +++ b/hdalab/css/style.css Mon Feb 06 18:50:19 2012 +0100 @@ -179,8 +179,16 @@ color: #ffffff; background: #000066; } +#filters li.filcountry { + color: #ffffff; background: #cc0066; +} + #filters li.filperiod { - color: #ffffff; background: #e07000; cursor: pointer; cursor: hand; + color: #ffffff; background: #e07000; +} + +span.spyr { + cursor: pointer; cursor: hand; } .spyr input { @@ -196,7 +204,7 @@ } #map { - height: 200px; + height: 250px; } #tagcloud { @@ -268,6 +276,10 @@ color: #000066; } +.maplet { + float: right; +} + .content-item p { font-size: 12px; margin: 3px 0; } diff -r dc6c3ac62efa -r fdf808d7d374 hdalab/filter.php --- a/hdalab/filter.php Thu Feb 02 12:03:07 2012 +0100 +++ b/hdalab/filter.php Mon Feb 06 18:50:19 2012 +0100 @@ -4,6 +4,7 @@ require('connect.inc.php'); $periode = (isset($_REQUEST['period']) ? pg_escape_string($_REQUEST['period']) : NULL); +$pays = (isset($_REQUEST['country']) ? pg_escape_string($_REQUEST['country']) : NULL); $label = (isset($_REQUEST['label']) ? pg_escape_string($_REQUEST['label']) : NULL); $contentlist = (isset($_REQUEST['contentlist']) ? pg_escape_string($_REQUEST['contentlist']) : NULL); $max_tag_order = (isset($_REQUEST['mto']) ? pg_escape_string($_REQUEST['mto']) : 12); @@ -11,10 +12,10 @@ $tag_count = (isset($_REQUEST['tagcount']) ? pg_escape_string($_REQUEST['tagcount']) : 30); $cont_count = 0; -if ($label or $periode or gettype($contentlist) != "NULL") { - $globalsql = "SELECT id, title, description, url FROM hdabo_datasheet E"; +if ($label or $pays or $periode or gettype($contentlist) != "NULL") { + $globalsql = "SELECT id, title, description, url, latitude, longitude FROM hdabo_datasheet E LEFT JOIN hdaviz_datasheet_insee K ON E.id = K.datasheet_id LEFT JOIN hdaviz_insee_coords Q ON K.insee_code = Q.code_insee"; $globalids = array(); - $globalfilters = array(); + $globalfilters = array("validated=TRUE"); if ($periode) { $years = split(',',$periode); $start_year = $years[0]; @@ -31,6 +32,19 @@ $globalids = $ids; $globalfilters[] = "EXISTS (SELECT * FROM hdabo_taggedsheet F WHERE F.tag_id IN (" . join(",", $ids) . ") AND F.order <= $max_tag_order AND F.datasheet_id = E.id)"; } + if ($pays) { + $listepays = split(',',$pays); + foreach ($listepays as $unpays) { + $rq = pg_query("SELECT id FROM hdaviz_inclusiongeo WHERE isocode='$unpays'"); + $ids = array(); + while($ligne = pg_fetch_row($rq)) { + $ids[] = $ligne[0]; + } + pg_free_result($rq); + $globalids = array_merge($globalids,$ids); + $globalfilters[] = "EXISTS (SELECT * FROM hdabo_taggedsheet G WHERE G.tag_id IN (" . join(",", $ids) . ") AND G.order <= $max_tag_order AND G.datasheet_id = E.id)"; + } + } if ($label) { $lblist = split(',',$label); foreach ($lblist as $txtlbl) { @@ -64,12 +78,6 @@ $contenus[$ligne["id"]] = $ligne; } pg_free_result($rq); - $rq = pg_query("SELECT label, isocode FROM hdaviz_cc"); - $countries = array(); - while($ligne = pg_fetch_row($rq)) { - $countries[$ligne[0]] = array("isocode" => $ligne[1], "score" => 0); - } - pg_free_result($rq); $rq = pg_query("SELECT DISTINCT label FROM hdabo_tag WHERE category_id=5"); $disciplines = array(); while($ligne = pg_fetch_row($rq)) { @@ -79,22 +87,27 @@ $tags = array(); $contentids = join(",",array_keys($contenus)); if ($contentids) { - $rq = pg_query("SELECT L.datasheet_id, L.tag_id, M.label, L.order FROM hdabo_taggedsheet L, hdabo_tag M WHERE L.datasheet_id IN ($contentids) AND L.tag_id = M.id AND L.order <= $max_tag_order ORDER BY L.order ASC"); + $rq = pg_query("SELECT L.datasheet_id, L.tag_id, M.label, L.order, M.category_id FROM hdabo_taggedsheet L, hdabo_tag M WHERE L.datasheet_id IN ($contentids) AND L.tag_id = M.id AND L.order <= $max_tag_order ORDER BY L.order ASC"); while($ligne = pg_fetch_row($rq)) { $match_tag = in_array($ligne[1], $globalids); $contenus[$ligne[0]]["tags"][] = array("id" => $ligne[1], "label" => $ligne[2], "order" => $ligne[3], "match" => $match_tag); $tagscore = 2*$max_tag_order-$ligne[3]; - if (!isset($tags[$ligne[1]])) { - $tags[$ligne[1]] = array("id" => $ligne[1], "label" => $ligne[2], "score" => 0); + if (!in_array($ligne[4], array(1,2,5))) { + if (!isset($tags[$ligne[1]])) { + $tags[$ligne[1]] = array("id" => $ligne[1], "label" => $ligne[2], "score" => 0); + } + $tags[$ligne[1]]["score"] += $tagscore; + if ($match_tag) { + $tags[$ligne[1]]["match"] = True; + } } - $tags[$ligne[1]]["score"] += $tagscore; if ($match_tag) { $contenus[$ligne[0]]["score"] += $tagscore; - $tags[$ligne[1]]["match"] = True; } - if (isset($countries[$ligne[2]])) { +/* if (isset($countries[$ligne[2]])) { $countries[$ligne[2]]["score"] += $tagscore; } + */ if (isset($disciplines[$ligne[2]])) { $disciplines[$ligne[2]]["score"] += $tagscore; } @@ -112,26 +125,33 @@ } usort($tags,"triscore"); usort($disciplines,"triscore"); - $countries = array_values($countries); +/* $countries = array_values($countries); + */ $tags = array_slice($tags, 0, $tag_count); $disciplines = array_slice($disciplines, 0, 10); $years = array(); + $countries = array(); if ($contentids) { - $rq = pg_query("SELECT U.start_year, U.end_year, SUM(".(2*$max_tag_order)." - V.order)/(U.end_year + 1 - U.start_year) score FROM hdaviz_years U, hdabo_taggedsheet V WHERE U.tag_id = V.tag_id AND V.order <= $max_tag_order AND V.datasheet_id IN ($contentids) GROUP BY U.start_year, U.end_year"); + $rq = pg_query("SELECT U.start_year, U.end_year, COUNT(*) score FROM hdaviz_years U, hdabo_taggedsheet V WHERE U.tag_id = V.tag_id AND V.order <= $max_tag_order AND V.datasheet_id IN ($contentids) GROUP BY U.start_year, U.end_year"); while($ligne = pg_fetch_row($rq)) { foreach(range($ligne[0], $ligne[1]) as $year) { $years[$year] = $ligne[2] + ( isset($years[$year]) ? $years[$year] : 0 ); } } pg_free_result($rq); + $rq = pg_query("SELECT U.isocode, COUNT(*) FROM hdaviz_inclusiongeo U, hdabo_taggedsheet V WHERE U.id = V.tag_id AND V.order <= $max_tag_order AND V.datasheet_id IN ($contentids) GROUP BY U.isocode"); + while($ligne = pg_fetch_row($rq)) { + $countries[$ligne[0]] = $ligne[1]; + } + pg_free_result($rq); } } else { - $rq = pg_query("SELECT id, title, description, url FROM hdabo_datasheet ORDER BY RANDOM() LIMIT $content_count"); + $rq = pg_query("SELECT id, title, description, url, latitude, longitude FROM hdabo_datasheet E LEFT JOIN hdaviz_datasheet_insee K ON E.id = K.datasheet_id LEFT JOIN hdaviz_insee_coords Q ON K.insee_code = Q.code_insee WHERE validated=TRUE ORDER BY RANDOM() LIMIT $content_count"); while($ligne = pg_fetch_assoc($rq)) { $ligne["tags"] = array(); $contenus[$ligne["id"]] = $ligne; } - $rq = pg_query("SELECT COUNT(*) FROM hdabo_datasheet"); + $rq = pg_query("SELECT COUNT(*) FROM hdabo_datasheet WHERE validated=TRUE"); $ligne = pg_fetch_row($rq); $cont_count = $ligne[0]; pg_free_result($rq); @@ -141,16 +161,16 @@ } pg_free_result($rq); $contenus = array_values($contenus); - $rq = pg_query("SELECT hdabo_tag.id, label, SUM(".(2*$max_tag_order)." - hdabo_taggedsheet.order) score FROM hdabo_tag, hdabo_taggedsheet WHERE hdabo_tag.id = hdabo_taggedsheet.tag_id AND hdabo_taggedsheet.order <= $max_tag_order GROUP BY hdabo_tag.id, label ORDER BY score DESC LIMIT $tag_count"); + + $rq = pg_query("SELECT label, SUM(".(2*$max_tag_order)." - V.order) score FROM hdabo_tag U, hdabo_taggedsheet V WHERE U.id = V.tag_id AND V.order <= $max_tag_order AND category_id NOT IN (1,2,5) AND EXISTS (SELECT * FROM hdabo_datasheet W WHERE V.datasheet_id = W.id AND W.validated=TRUE) GROUP BY label ORDER BY score DESC LIMIT $tag_count"); $tags = pg_fetch_all($rq); pg_free_result($rq); - $rq = pg_query("SELECT C.isocode, SUM(".(2*$max_tag_order)." - B.order) score FROM hdabo_tag A, hdabo_taggedsheet B, hdaviz_cc C WHERE A.id = B.tag_id AND B.order <= $max_tag_order AND A.label = C.label GROUP BY C.isocode"); - $countries = pg_fetch_all($rq); - pg_free_result($rq); - $rq = pg_query("SELECT A.label, SUM(".(2*$max_tag_order)." - B.order) score FROM hdabo_tag A, hdabo_taggedsheet B WHERE A.id = B.tag_id AND B.order <= $max_tag_order AND A.category_id=5 GROUP BY A.label ORDER BY score DESC LIMIT 10"); + + $rq = pg_query("SELECT A.label, COUNT(*) score FROM hdabo_tag A, hdabo_taggedsheet B WHERE A.id = B.tag_id AND B.order <= $max_tag_order AND A.category_id=5 AND EXISTS (SELECT * FROM hdabo_datasheet W WHERE B.datasheet_id = W.id AND W.validated=TRUE) GROUP BY A.label ORDER BY score DESC LIMIT 10"); $disciplines = pg_fetch_all($rq); pg_free_result($rq); - $rq = pg_query("SELECT U.start_year, U.end_year, SUM(".(2*$max_tag_order)." - hdabo_taggedsheet.order)/(U.end_year + 1 - U.start_year) score FROM hdaviz_years U, hdabo_taggedsheet WHERE U.tag_id = hdabo_taggedsheet.tag_id AND hdabo_taggedsheet.order <= $max_tag_order GROUP BY U.start_year, U.end_year"); + + $rq = pg_query("SELECT U.start_year, U.end_year, COUNT(*) FROM hdaviz_years U, hdabo_taggedsheet V WHERE U.tag_id = V.tag_id AND V.order <= $max_tag_order AND EXISTS (SELECT * FROM hdabo_datasheet W WHERE V.datasheet_id = W.id AND W.validated=TRUE) GROUP BY U.start_year, U.end_year"); $years = array(); while($ligne = pg_fetch_row($rq)) { foreach(range($ligne[0], $ligne[1]) as $year) { @@ -158,6 +178,12 @@ } } pg_free_result($rq); + $countries = array(); + $rq = pg_query("SELECT U.isocode, COUNT(*) FROM hdaviz_inclusiongeo U, hdabo_taggedsheet V WHERE U.id = V.tag_id AND V.order <= $max_tag_order AND EXISTS (SELECT * FROM hdabo_datasheet W WHERE V.datasheet_id = W.id AND W.validated=TRUE) GROUP BY U.isocode"); + while($ligne = pg_fetch_row($rq)) { + $countries[$ligne[0]] = $ligne[1]; + } + pg_free_result($rq); } ksort($years); $yearchange = array(); diff -r dc6c3ac62efa -r fdf808d7d374 hdalab/index.html --- a/hdalab/index.html Thu Feb 02 12:03:07 2012 +0100 +++ b/hdalab/index.html Mon Feb 06 18:50:19 2012 +0100 @@ -6,11 +6,13 @@ Gomina + + diff -r dc6c3ac62efa -r fdf808d7d374 hdalab/js/geojson_quickconv.js --- a/hdalab/js/geojson_quickconv.js Thu Feb 02 12:03:07 2012 +0100 +++ b/hdalab/js/geojson_quickconv.js Mon Feb 06 18:50:19 2012 +0100 @@ -1,109 +1,118 @@ gomNs.countryLabels = { - "AFG" :"Afghanistan", - "AGO" :"Angola", - "ALB" :"Albanie", - "ARG" :"Argentine", - "ARM" :"Arménie", - "ATA" :"Antarctique", - "AUS" :"Australie", - "AUT" :"Autriche", - "AZE" :"Azerbaïdjan", - "BDI" :"Burundi", - "BEL" :"Belgique", - "BEN" :"Bénin", - "BGR" :"Bulgarie", - "BIH" :"Bosnie-Herzégovine", - "BOL" :"Bolivie", - "BRA" :"Brésil", - "BRN" :"Brunei", - "CAF" :"République centrafricaine", - "CAN" :"Canada", - "CHE" :"Suisse", - "CHL" :"Chili", - "CHN" :"Chine", - "CIV" :"Côte d'Ivoire", - "CMR" :"Cameroun", - "COD" :"République démocratique du Congo", - "CZE" :"République tchèque", - "DEU" :"Allemagne", - "DNK" :"Danemark", - "DZA" :"Algérie", - "EGY" :"Égypte", - "ESP" :"Espagne", - "EST" :"Estonie", - "ETH" :"Éthiopie", - "FIN" :"Finlande", - "FRA" :"France", - "GAB" :"Gabon", - "GBR" :"Royaume-Uni", - "GHA" :"Ghana", - "GRC" :"Grèce", - "HTI" :"Haïti", - "HUN" :"Hongrie", - "IDN" :"Indonésie", - "IND" :"Inde", - "IRL" :"Irlande", - "IRN" :"Iran", - "ISL" :"Islande", - "ISR" :"Israël", - "ITA" :"Italie", - "JAM" :"Jamaïque", - "JPN" :"Japon", - "KAZ" :"Kazakhstan", - "KGZ" :"Kirghizistan", - "KHM" :"Cambodge", - "LBN" :"Liban", - "LTU" :"Lituanie", - "LVA" :"Lettonie", - "MAR" :"Maroc", - "MDA" :"Moldavie", - "MEX" :"Mexique", - "MLI" :"Mali", - "MMR" :"Birmanie", - "MNG" :"Mongolie", - "MOZ" :"Mozambique", - "NCL" :"Nouvelle-Calédonie", - "NER" :"Niger", - "NGA" :"Nigeria", - "NLD" :"Pays-Bas", - "NOR" :"Norvège", - "NPL" :"Népal", - "NZL" :"Nouvelle-Zélande", - "PAK" :"Pakistan", - "PHL" :"Philippines", - "PNG" :"Papouasie-Nouvelle-Guinée", - "POL" :"Pologne", - "PRT" :"Portugal", - "PSE" :"Palestine", - "ROU" :"Roumanie", - "RUS" :"Russie", - "SDN" :"Soudan", - "SEN" :"Sénégal", - "SLV" :"Salvador", - "SVK" :"Slovaquie", - "SVN" :"Slovénie", - "SWE" :"Suède", - "SYR" :"Syrie", - "TCD" :"Tchad", - "THA" :"Thaïlande", - "TJK" :"Tadjikistan", - "TTO" :"Trinité-et-Tobago", - "TUN" :"Tunisie", - "TUR" :"Turquie", - "UGA" :"Ouganda", - "UKR" :"Ukraine", - "USA" :"États-Unis", - "UZB" :"Ouzbékistan", - "VNM" :"Viêt Nam", - "ZAF" :"Afrique du Sud", +AFG: 'Afghanistan', +AGO: 'Angola', +ALB: 'Albanie', +ARG: 'Argentine', +ARM: 'Arménie', +ATA: 'Antarctique', +AUS: 'Australie', +AUT: 'Autriche', +AZE: 'Azerbaïdjan', +BDI: 'Burundi', +BEL: 'Belgique', +BEN: 'Bénin', +BGR: 'Bulgarie', +BIH: 'Bosnie-Herzégovine', +BOL: 'Bolivie', +BRA: 'Brésil', +BRN: 'Brunei', +CAF: 'République centrafricaine', +CAN: 'Canada', +CHE: 'Suisse', +CHL: 'Chili', +CHN: 'Chine', +CIV: 'Côte d\'Ivoire', +CMR: 'Cameroun', +COD: 'République démocratique du Congo', +CZE: 'République tchèque', +DEU: 'Allemagne', +DNK: 'Danemark', +DZA: 'Algérie', +EGY: 'Égypte', +ESP: 'Espagne', +EST: 'Estonie', +ETH: 'Éthiopie', +FIN: 'Finlande', +FRA: 'France', +GAB: 'Gabon', +GBR: 'Royaume-Uni', +GGY: 'Guernesey', +GHA: 'Ghana', +GLP: 'Guadeloupe', +GRC: 'Grèce', +GUF: 'Guyane', +HTI: 'Haïti', +HUN: 'Hongrie', +IDN: 'Indonésie', +IND: 'Inde', +IRL: 'Irlande', +IRN: 'Iran', +ISL: 'Islande', +ISR: 'Israël', +ITA: 'Italie', +JAM: 'Jamaïque', +JEY: 'Jersey', +JPN: 'Japon', +KAZ: 'Kazakhstan', +KGZ: 'Kirghizistan', +KHM: 'Cambodge', +LBN: 'Liban', +LTU: 'Lituanie', +LVA: 'Lettonie', +MAR: 'Maroc', +MDA: 'Moldavie', +MEX: 'Mexique', +MLI: 'Mali', +MLT: 'Malte', +MMR: 'Birmanie', +MNG: 'Mongolie', +MOZ: 'Mozambique', +MTQ: 'Martinique', +NCL: 'Nouvelle-Calédonie', +NER: 'Niger', +NGA: 'Nigeria', +NLD: 'Pays-Bas', +NOR: 'Norvège', +NPL: 'Népal', +NZL: 'Nouvelle-Zélande', +PAK: 'Pakistan', +PHL: 'Philippines', +PNG: 'Papouasie-Nouvelle-Guinée', +POL: 'Pologne', +PRT: 'Portugal', +PSE: 'Palestine', +PYF: 'Polynésie française', +ROU: 'Roumanie', +RUS: 'Russie', +SDN: 'Soudan', +SEN: 'Sénégal', +SGP: 'Singapour', +SLV: 'Salvador', +SVK: 'Slovaquie', +SVN: 'Slovénie', +SWE: 'Suède', +SYR: 'Syrie', +TCD: 'Tchad', +THA: 'Thaïlande', +TJK: 'Tadjikistan', +TTO: 'Trinité-et-Tobago', +TUN: 'Tunisie', +TUR: 'Turquie', +UGA: 'Ouganda', +UKR: 'Ukraine', +USA: 'États-Unis', +UZB: 'Ouzbékistan', +VNM: 'Viêt Nam', +ZAF: 'Afrique du Sud' } -function polygon_to_gmap(polycoords, label) { +function polygon_to_gmap(polycoords, isocode) { var _opts = { strokeColor: "#000000", strokeWeight: .5, fillColor: "#7070a0", fillOpacity: .8, + title: isocode } _opts.paths = polycoords.map(function(path) { return path.map(function(coord) { @@ -112,15 +121,15 @@ }); var _polygon = new google.maps.Polygon(_opts); _polygon.setMap(gomNs.map); - if (label) { + if (gomNs.countryLabels[isocode]) { google.maps.event.addListener(_polygon, 'click', function(a,b) { - tagInfo(label); + addFilter('country', isocode); }) } return _polygon; } -function showCountries(geoJson) { +function showCountriesGmap(geoJson) { gomNs.countries = {}; _(geoJson.features).each(function(feature) { var _el = { "label" : gomNs.countryLabels[feature.id] }; @@ -129,15 +138,37 @@ } else { switch(feature.geometry.type) { case('Polygon'): - _el.gPolygons = [ polygon_to_gmap(feature.geometry.coordinates, _el.label) ]; + _el.gPolygons = [ polygon_to_gmap(feature.geometry.coordinates, feature.id) ]; break; case('MultiPolygon'): _el.gPolygons = feature.geometry.coordinates.map(function(polygon) { - return polygon_to_gmap(polygon, _el.label); + return polygon_to_gmap(polygon, feature.id); }) break; } } gomNs.countries[feature.id] = _el; }); -} \ No newline at end of file +} + +function showCountriesLeaflet(geoJson) { + gomNs.countries = {}; + var gJ = new L.GeoJSON(); + gJ.on('featureparse', function(_f) { + var isocode = _f.id; + _f.layer.setStyle({ + color: "#000000", + weight: .5, + fillColor: "#7070a0", + fillOpacity: .8 + }); + if (gomNs.countryLabels[isocode]) { + _f.layer.on('click', function() { + addFilter('country', isocode); + }); + } + gomNs.countries[_f.id] = _f.layer; + }); + gJ.addGeoJSON(geoJson); + gomNs.map.addLayer(gJ); +} diff -r dc6c3ac62efa -r fdf808d7d374 hdalab/js/gomina.js --- a/hdalab/js/gomina.js Thu Feb 02 12:03:07 2012 +0100 +++ b/hdalab/js/gomina.js Mon Feb 06 18:50:19 2012 +0100 @@ -9,6 +9,7 @@ tlGamma: 6, heatGamma: 4, displayedDates: [-5000,0,500,1000,1200,1400,1600,1700,1750,1800,1850,1900,1950,2010], + mappingLibrary: 'leaflet', } function yearToPx(year) { @@ -42,9 +43,9 @@ + '" />'; } if (data.abstract) { - _html += '

' + _(data.abstract).escape() + '

'; + _html += '

' + _(data.abstract).escape().replace(/(^.{0,240})([\s]|$)(.*)/,'$1…') + '

'; } - if (data.links) { +/* if (data.links) { var _lC = data.requested_label.toLowerCase(); var _t = data.links.map(function(d) { return (d.subject.toLowerCase() == _lC) ? d.object : d.subject; @@ -58,26 +59,27 @@ + ''; }).join('') + ''; - } + } */ $("#tagdata").html(_html); }); - filterTag(_taglabel); + addFilter('tag', _taglabel); $("#showlist").removeClass("actif"); } -function filterTag(_tagLabel) { +function addFilter(_type, _label) { var _curView = gomNs.sessiondata.views[gomNs.sessiondata.view]; if (_curView.type == 'filter') { - _curView.tag.push(_tagLabel); + _curView[_type].push(_label); + console.log(_curView[_type]); updateFilters(); debouncedSaveChanges(); } } -function removeFilter(_index) { +function removeFilter(_type, _index) { var _curView = gomNs.sessiondata.views[gomNs.sessiondata.view]; if (_curView.type == 'filter') { - _curView.tag.splice(_index,1); + _curView[_type].splice(_index,1); updateFilters(); debouncedSaveChanges(); } @@ -93,6 +95,9 @@ if (_curView.tag.length) { _params.label = _curView.tag.join(','); } + if (_curView.country.length) { + _params.country = _curView.country.join(','); + } $.getJSON("filter.php", _params, updateDisplay); } } @@ -141,12 +146,13 @@ return; } var _htmFilters = '', - _fl = _curView.tag.length; - if (!_curView.period && !_fl) { + _fl = _curView.tag.length, + _cl = _curView.country.length; + if (!_curView.period && !_fl && !_cl) { _htmFilters = '
  • Aucun filtre
  • '; } if (_curView.period) { - _htmFilters += '
  • ' + _htmFilters += '
  • Période : ' + _curView.period[0] + ' à ' + _curView.period[1] @@ -166,11 +172,20 @@ "margin-left" : "0" }); } + if (_cl) { + _htmFilters += _(_curView.country).map(function(_t, _i) { + return '
  • Pays : ' + + ( gomNs.countryLabels[_t] || _t ) + + '[x]
  • '; + }).join(""); + } if (_fl) { _htmFilters += _(_curView.tag).map(function(_t, _i) { - return '
  • ' + return '
  • Tag : ' + _t - + '[x]
  • '; }).join(""); @@ -183,14 +198,26 @@ if (contentdata && contentdata.length) { var _htmlCl = '