Author: bill@adequates.com
Date: Wed Aug 16 16:05:40 2006
New Revision: 4571
Log:
petits bugs et modif des chemins
Modified:
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_geosvgwmsfile.html
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_logo.html
_plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_svgfilex.html
Modified: _plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_geosvgwmsfile.html
--- _plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_geosvgwmsfile.html (original)
+++ _plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_geosvgwmsfile.html Wed Aug 16 16:05:40 2006
@@ -3,8 +3,8 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/SVG/DTD/svg10.dtd">
<BOUCLE_carte(CARTO_CARTES){id_carto_carte}>
<svg width="100%" height="100%" viewBox="0 0 850 590" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:attrib="http://www.carto.net/attrib" onload="init(evt);" zoomAndPan="enable" encoding="ISO-8859-1">
- <script type="text/ecmascript" xlink:href="helper_functions.js"/>
- <script type="text/ecmascript" xlink:href="navigation.js"/>
+ <script type="text/ecmascript" xlink:href="[(#CHEMIN{spipcarto/js/helper_functions.js})]"/>
+ <script type="text/ecmascript" xlink:href="[(#CHEMIN{spipcarto/js/navigation.js})]"/>
<script type="text/ecmascript"><![CDATA[
Modified: _plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_logo.html
--- _plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_logo.html (original)
+++ _plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_logo.html Wed Aug 16 16:05:40 2006
@@ -1,8 +1,8 @@
-<!-- TODO : Logo à revoir PNG en dur !
--->
-<div style="position: relative;visibility: visible; margin: 0px; padding: 0px; height: 410px;">
- <div style="position: absolute;height: 410px;">
+
+<div style="position: relative;visibility: visible; margin: 0px; padding: 0px;">
+ <div style="position: absolute;">
<BOUCLE_carte(CARTO_CARTES){id_carto_carte}>
+ <img alt="#TITRE" src="#URL_SITE_SPIP/spip_carto.php?fond_carte=[(#URL_CARTE|base64_encode)][&scale=(#ENV{scale})][&x=(#ENV{x})][&y=(#ENV{y})]" usemap="#map#ID_CARTO_CARTE" [height="(#ENV{args}|wkt2imgheight{#CALLAGE,#URL_CARTE})px"] [width="(#ENV{args}|wkt2imgwidth{#CALLAGE,#URL_CARTE})px"] style="position:absolute;top:0;left:0;border: 0px;"/>
<B_objets>
<map name="map#ID_CARTO_CARTE">
<BOUCLE_objets(CARTO_OBJETS){id_carto_carte=#ID_CARTO_CARTE}>
@@ -10,15 +10,12 @@
</BOUCLE_objets>
</map>
</B_objets>
-
- <img alt="#TITRE" src="#URL_SITE_SPIP/spip_carto.php?fond_carte=[(#URL_CARTE|base64_encode)][&scale=(#ENV{scale})][&x=(#ENV{x})][&y=(#ENV{y})]" usemap="#map#ID_CARTO_CARTE" [height="(#ENV{args}|wkt2imgheight{#CALLAGE,#URL_CARTE})px"] [width="(#ENV{args}|wkt2imgwidth{#CALLAGE,#URL_CARTE})px"] style="border: 0px;"/>
-
<BOUCLE_objets2(CARTO_OBJETS){id_carto_carte=#ID_CARTO_CARTE}>
- <a href="[(#URL_OBJET)]"[ title='(#TEXTE|texte_script)']>
- <img style="position: absolute;margin: 0px; padding: 0px;[(#GEOMETRIE|wkt2coords{HTMLDIV,#CALLAGE,#URL_CARTE,'',#ENV{args}})]border: 0px;"[ alt='(#TEXTE|texte_script)']
- src="<BOUCLE_mot(MOTS){id_carto_objet}{par titre}{0,1}>[IMG/moton(#ID_MOT)" onMouseOver="this.src='IMG/motoff#ID_MOT'" onMouseOut="this.src='IMG/moton#ID_MOT']</BOUCLE_mot>ecrire\img_pack\croix-rouge.gif<//B_mot>" style='border-width: 0px;' class='spip_logos'/>
+ <a href="[(#URL_OBJET)]" title='[(#TEXTE|texte_script)]'>
+ <img style="position: absolute;margin: 0px; padding: 0px;[(#GEOMETRIE|wkt2coords{HTMLDIV,#CALLAGE,#URL_CARTE,'',#ENV{args}})]border: 0px;"[ alt='(#TEXTE|texte_script)'] src="<BOUCLE_MOT(MOTS){id_carto_objet}{par titre}{0,1}>[IMG/(#LOGO_MOT_NORMAL|fichier)][" onMouseOver="this.src='[IMG/(#LOGO_MOT_SURVOL|fichier)]'" onMouseOut="this.src='IMG/(#LOGO_MOT_NORMAL|fichier)']</BOUCLE_MOT>ecrire/img_pack/croix-rouge.gif<//B_MOT>"/>
</a>
</BOUCLE_objets2>
</BOUCLE_carte>
+<hr/>
</div>
</div>
\ No newline at end of file
Modified: _plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_svgfilex.html
--- _plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_svgfilex.html (original)
+++ _plugins_/_contenu_editorial_/spipcarto/spipcarto/carto_svgfilex.html Wed Aug 16 16:05:40 2006
@@ -3,9 +3,9 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/SVG/DTD/svg10.dtd">
<BOUCLE_carte(CARTO_CARTES){id_carto_carte}>
<svg width="100%" height="100%" viewBox="0 0 760 500" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:attrib="http://www.carto.net/attrib" onload="init(evt);" zoomAndPan="enable" encoding="ISO-8859-1">
- <script type="text/ecmascript" xlink:href="helper_functions.js"/>
- <script type="text/ecmascript" xlink:href="navigation.js"/>
- <script type="text/ecmascript" xlink:href="navigationTools.js"/>
+ <script type="text/ecmascript" xlink:href="[(#CHEMIN{spipcarto/js/helper_functions.js})]"/>
+ <script type="text/ecmascript" xlink:href="[(#CHEMIN{spipcarto/js/navigation.js})]"/>
+ <script type="text/ecmascript" xlink:href="[(#CHEMIN{spipcarto/js/navigationTools.js})]"/>
<script type="text/ecmascript"><![CDATA[
@@ -34,7 +34,7 @@
document.getElementById("spipCartoObj").setAttributeNS(null,"stroke-width",myMainMap.curWidth*0.005);
// Pour charger un claque WMS ... getOrthoImage();
<BOUCLE__OBJ(CARTO_OBJETS){id_carto_carte=#ID_CARTO_CARTE}{par num titre}>
- <BOUCLE__M(MOTS){id_carto_objet}{par num titre}{doublons a}>
+ <BOUCLE__M(MOTS){id_carto_objet}{par titre}{doublons a}>
document.getElementById("spipCarto_#ID_MOT").setAttributeNS(null,"stroke-width",myMainMap.curWidth*0.005);
</BOUCLE__M>
</BOUCLE__OBJ>
@@ -197,7 +197,7 @@
<image id="ShadedRelief" x="[(#CALLAGE|worldfileLRX)]" y="[(#CALLAGE|worldfileULY)]" width="[(#CALLAGE|worldfileWidth)]px" height="[(#CALLAGE|worldfileHeight)]px" xlink:href="#URL_SITE_SPIP/spip_carto.php?fond_carte=[(#URL_CARTE|base64_encode)][&scale=(#ENV{scale})][&x=(#ENV{x})][&y=(#ENV{y})]" />
<BOUCLE_OBJ(CARTO_OBJETS){id_carto_carte=#ID_CARTO_CARTE}{par num titre}>
- <BOUCLE_M(MOTS){id_carto_objet}{par num titre}{doublons b}>
+ <BOUCLE_M(MOTS){id_carto_objet}{par titre}{doublons b}>
<!-- #DESCRIPTIF -->
<g id="spipCarto_#ID_MOT">
<BOUCLE_OBJECT(CARTO_OBJETS){id_carto_carte=#ID_CARTO_CARTE}{id_mot}{doublons obj}>
@@ -250,31 +250,31 @@
<!-- checkbox -->
<BOUCLE_OBJ2(CARTO_OBJETS){id_carto_carte=#ID_CARTO_CARTE}{par num titre}>
- <BOUCLE_M2(MOTS){id_carto_objet}{par num titre}{doublons c}>
+ <BOUCLE_M2(MOTS){id_carto_objet}{par titre}{doublons c}>
<g transform="translate(0 [(#ID_MOT|ajoute{20})])">
<use id="checkBoxspipCarto_#ID_MOT" xlink:href="#checkBoxRect" onclick="checkBoxScript(evt,'spipCarto_#ID_MOT');"/>
<use id="checkCrossspipCarto_#ID_MOT" xlink:href="#checkBoxCross" visibility="visible"/>
</g>
<g class="allText normalText">
- <text x="12" y="[(#ID_MOT|plus{6})]">#TITRE</text>';
+ <text x="12" y="[(#_OBJ2:COMPTEUR_BOUCLE|plus{6})]">#TITRE</text>';
</g>
</BOUCLE_M2>
</BOUCLE_OBJ2>
<!-- first checkbox -->
- <g transform="translate(0 [(#ID_MOT|plus{20})])">
+ <g transform="translate(0 [(#TOTAL_BOUCLE|plus{20})])">
<use id="checkBoxspipCartoObj" xlink:href="#checkBoxRect" onclick="checkBoxScript(evt,'spipCartoObj');"/>
<use id="checkCrossspipCartoObj" xlink:href="#checkBoxCross" visibility="visible"/>
</g>
<!-- second checkbox -->
- <g transform="translate(0 [(#ID_MOT|plus{40})])">
+ <g transform="translate(0 [(#TOTAL_BOUCLE|plus{40})])">
<use id="checkBoxShadedRelief" xlink:href="#checkBoxRect" onclick="checkBoxScript(evt,'ShadedRelief');"/>
<use id="checkCrossShadedRelief" xlink:href="#checkBoxCross" visibility="visible"/>
</g>
<!-- checkbox text labels -->
<g class="allText normalText">
- <text x="12" y="[(#ID_MOT|plus{26})]">Objets</text>
- <text x="12" y="[(#ID_MOT|plus{46})]">Fond de carte</text>
+ <text x="12" y="[(#TOTAL_BOUCLE|plus{26})]">Objets</text>
+ <text x="12" y="[(#TOTAL_BOUCLE|plus{46})]">Fond de carte</text>
</g>
</g>
</B_OBJ2>