Commit dc6bdeadf2cb20c780c92b905f83c1aa3d943d2c

Authored by David RENÉ
1 parent 9ca3fbc5

refactoring of the language flag management and use the new location of the flags

resources/web/public/xlib/js/xlib.js
@@ -42,9 +42,6 @@ jQuery.cachedScript = function( url, options ) { @@ -42,9 +42,6 @@ jQuery.cachedScript = function( url, options ) {
42 42
43 $.import_js('xlib/js/loadingoverlay.js') 43 $.import_js('xlib/js/loadingoverlay.js')
44 44
45 -// ---------------------------------------------------------------------------  
46 -// Script utile pour le menu "drapeaux"  
47 -window.onload=montre;  
48 45
49 var event_language_changed = new Event('language_changed', { 46 var event_language_changed = new Event('language_changed', {
50 bubbles: true 47 bubbles: true
@@ -52,7 +49,7 @@ var event_language_changed = new Event('language_changed', { @@ -52,7 +49,7 @@ var event_language_changed = new Event('language_changed', {
52 49
53 function language_changed(lang) { 50 function language_changed(lang) {
54 console.log("language_changed language_code "+lang); 51 console.log("language_changed language_code "+lang);
55 - window.location.href = '?aws_controller=language&aws_action=do_change_language&language_code='+ encodeURIComponent(lang); 52 + window.location.href = '?aws_c=language&aws_a=do_change_language&language_code='+ encodeURIComponent(lang);
56 // $.ajax({ 53 // $.ajax({
57 // url: '?aws_controller=language&aws_action=do_change_language&language_code='+ encodeURIComponent(lang), 54 // url: '?aws_controller=language&aws_action=do_change_language&language_code='+ encodeURIComponent(lang),
58 // type: 'GET', 55 // type: 'GET',
@@ -68,15 +65,6 @@ function language_changed(lang) { @@ -68,15 +65,6 @@ function language_changed(lang) {
68 // }); 65 // });
69 } 66 }
70 67
71 -function montre(id) {  
72 - var d = document.getElementById(id);  
73 - $("[id^='drapo']").each(function () {  
74 - $(this).hide();  
75 - });  
76 -  
77 - if (d) {d.style.display='block';}  
78 -}  
79 -  
80 function xlib_debug(o) { 68 function xlib_debug(o) {
81 console.log(o); 69 console.log(o);
82 } 70 }
web_controllers/language/language_management.anubis
@@ -120,8 +120,10 @@ public define HTML_Partial_Content @@ -120,8 +120,10 @@ public define HTML_Partial_Content
120 [ 120 [
121 dl([ 121 dl([
122 //literal("<dt style=\"background-image: url(../flags/"+lang+".png);\" onmouseover=\"javascript:montre('drapo1');\" onmouseout=\"javascript:montre();\">&nbsp;</dt>\n"), 122 //literal("<dt style=\"background-image: url(../flags/"+lang+".png);\" onmouseover=\"javascript:montre('drapo1');\" onmouseout=\"javascript:montre();\">&nbsp;</dt>\n"),
123 - literal("<img src=\"../flags/"+lang+".png\" onmouseover=\"javascript:montre('drapo1');\" onmouseout=\"javascript:montre();\">"),  
124 - dd([style("display: none"),id("drapo1"), event(onmouseover, "montre('drapo1');"), event(onmouseout, "montre();")], 123 + //literal("<img src=\"/xlib/flags/24x24/"+lang+".png\" onmouseover=\"javascript:montre('drapo1');\" onmouseout=\"javascript:montre();\">"),
  124 +
  125 + img([event(onmouseover, "showObject('l3-flag');"), event(onmouseout, "hideObject('l3-flag');")], "/xlib/flags/24x24/"+lang+".png" ),
  126 + dd([style("display: none"),id("l3-flag"), event(onmouseover, "showObject('l3-flag');"), event(onmouseout, "hideObject('l3-flag');")],
125 ul( 127 ul(
126 map(make_line, l3_get_all_dicos(dictionary_collection_name))+ 128 map(make_line, l3_get_all_dicos(dictionary_collection_name))+
127 [ 129 [