ajout panneau PronSci British; correction bug rect_r_slash dans svg PronSci...

ajout panneau PronSci British; correction bug rect_r_slash dans svg PronSci British; correction ordre affichage js et footer

static/js/interface.js

@@ -51,10 +51,10 @@ function selectLang(lang, p="default", f="default"){
         phonoEnAlem.innerHTML = "ALeM British";
         phonolist.appendChild(phonoEnAlem);
 
-        // var phonoEnPronSciBr = document.createElement('option');
-        // phonoEnPronSciBr.value = "phonoEnPronSciBr";
-        // phonoEnPronSciBr.innerHTML = "PronSci British";
-        // phonolist.appendChild(phonoEnPronSciBr);
+        var phonoEnPronSciBr = document.createElement('option');
+        phonoEnPronSciBr.value = "phonoEnPronSciBr";
+        phonoEnPronSciBr.innerHTML = "PronSci British";
+        phonolist.appendChild(phonoEnPronSciBr);
 
         var newFid = document.createElement('option');
         newFid.value = "fidelEnPSUK";
@@ -76,8 +76,8 @@ function selectPanneau(p){
     } else if (p=="default" && thisPageLang=="en") {
         p = "phonoEnAlem";
     }
-    var svgEnPronSciBr = document.getElementById('svgEnPronSciBr'); // Panneau EN PronSci
 
+    var svgEnPronSciBr = document.getElementById('svgEnPronSciBr'); // Panneau EN PronSci
     var svgEnAlem = document.getElementById('svgEnAlem'); // Panneau EN ALeM (fond couleurs)
     var pngCalqEnAlemLignes = document.getElementById('pngCalqEnAlemLignes'); // Panneau EN ALeM (lignes)
     var pngPochoirEnAlem = document.getElementById('pngPochoirEnAlem'); // Panneau EN ALeM (formes bouches)
@@ -98,6 +98,14 @@ function selectPanneau(p){
         pngPochoirEnAlem.style.display = 'block';
         svgClickEnAlem.style.display = 'block';
 
+        doCalques.style.display = 'none';
+    } else if (p == 'phonoEnPronSciBr') {
+        svgEnPronSciBr.style.display = 'block';
+
+        svgEnAlem.style.display = 'none';
+        pngCalqEnAlemLignes.style.display = 'none';
+        pngPochoirEnAlem.style.display = 'none';
+        svgClickEnAlem.style.display = 'none';
         doCalques.style.display = 'none';
     }
 }
@@ -139,6 +147,5 @@ function interface(lang) {
         
         // Indiquer le lien de Page Vierge
         document.getElementById('hrefNewPage').href = thisRawURL+'fr/';
-
     }
 }
\ No newline at end of file

static/svg/en_pronsci-br.svg

@@ -221,8 +221,8 @@
   <rect
 	onclick="top.recupPhon(this.id)"
      style="fill-opacity:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect_r_alv"
-     class="svgPhonClick phon_r_alv"
+     id="rect_r_slash"
+     class="svgPhonClick phon_r_slash"
      width="74.248932"
      height="33.189617"
      x="383.20819"

templates/clavier.html

@@ -169,12 +169,13 @@
         </div>
     </div>
 
+{% endblock %}
 
+{% block javascript %}
     <script type="text/javascript" src="{% static 'js/id2class.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/phon2api.js' %}"></script>
-    <script type="text/javascript" src="{% static 'js/interface_basic.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/interface.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/clavierCalques.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/popupAide.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/clavier.js' %}"></script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file

templates/playerHome.html

@@ -46,6 +46,9 @@
         </div>
     </div>
 
-    <script type="text/javascript" src="{% static 'js/playerPhonoHome.js' %}"></script>
+{% endblock content %}
 
-{% endblock content %}
\ No newline at end of file
+{% block javascript %}
+    <script type="text/javascript" src="{% static 'js/interface_basic.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/playerPhonoHome.js' %}"></script>
+{% endblock %}
\ No newline at end of file

templates/playerPhono.html

@@ -116,11 +116,13 @@
             </div>
         </div>
     </div>
+{% endblock content %}
 
+{% block javascript %}
     <script type="text/javascript" src="{% static 'js/id2class.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/interface_basic.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/interface.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/clavierCalques.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/popupAide.js' %}"></script>
     <script type="text/javascript" src="{% static 'js/playerPhono.js' %}"></script>
-{% endblock content %}
\ No newline at end of file
+{% endblock javascript %}
\ No newline at end of file