From 7bd8d49ee21cdbc107c8e3eb99a17d636b79dccd Mon Sep 17 00:00:00 2001 From: arno Date: Fri, 7 Aug 2009 16:53:07 +0200 Subject: [PATCH] rename marker files --- COPYING.txt | 3 +++ build.sh | 3 --- js/admin.js | 19 +++++++------------ js/syp.js | 11 +++++------ media/marker-normal.png | Bin 0 -> 992 bytes media/marker-selected.png | Bin 0 -> 967 bytes media/marker-temp.png | Bin 0 -> 831 bytes 7 files changed, 15 insertions(+), 21 deletions(-) create mode 100644 media/marker-normal.png create mode 100644 media/marker-selected.png create mode 100644 media/marker-temp.png diff --git a/COPYING.txt b/COPYING.txt index 67f5285..42134a9 100644 --- a/COPYING.txt +++ b/COPYING.txt @@ -5,6 +5,9 @@ - OpenLayers is available under a BSD-style License. A copy of its license should be available at http://svn.openlayers.org/trunk/openlayers/license.txt +- marker-normal.png, marker-selected.png and marker-temp.png are part of + Openlayers. + - Jquery is available under both MIT and GPL licences. More informations can be found at http://docs.jquery.com/Licensing diff --git a/build.sh b/build.sh index 764f1c6..6cfb069 100755 --- a/build.sh +++ b/build.sh @@ -30,13 +30,10 @@ cp -RLp openlayers/build/OpenLayers.js $DESTDIR/openlayers/ # openlayers images mkdir $DESTDIR/openlayers/img for file in east-mini.png \ - marker-gold.png \ north-mini.png \ blank.gif \ west-mini.png \ zoom-plus-mini.png \ - marker-blue.png \ - marker-green.png \ south-mini.png \ zoom-minus-mini.png \ zoom-world-mini.png; do diff --git a/js/admin.js b/js/admin.js index c070ff2..259c914 100644 --- a/js/admin.js +++ b/js/admin.js @@ -56,12 +56,10 @@ OpenLayers.Control.SypDragFeature = OpenLayers.Class (OpenLayers.Control.DragFea var Admin = { Settings: { - MARKER_ICON: "openlayers/img/marker-blue.png", - MARKER_ICON_HEIGHT: 25, - MARKER_SELECT_ICON: "openlayers/img/marker-green.png", - MARKER_SELECT_ICON_HEIGHT: 25, - MARKER_TEMPORARY_ICON: "openlayers/img/marker-gold.png", - MARKER_TEMPORARY_ICON_HEIGHT: 25 + MARKER_ICON: "media/marker-normal.png", + MARKER_SELECT_ICON: "media/marker-selected.png", + MARKER_TEMPORARY_ICON: "media/marker-temp.png", + MARKER_HEIGHT: 25 }, map: null, @@ -137,18 +135,15 @@ var Admin = { var styleMap = new OpenLayers.StyleMap ( {"default": { externalGraphic: this.Settings.MARKER_ICON, - graphicHeight: this.Settings.MARKER_ICON_HEIGHT - || 32 + graphicHeight: this.Settings.MARKER_HEIGHT || 32 }, "temporary": { externalGraphic: this.Settings.MARKER_TEMPORARY_ICON, - graphicHeight: this.Settings.MARKER_TEMPORARY_ICON_HEIGHT - || 32 + graphicHeight: this.Settings.MARKER_HEIGHT || 32 }, "select": { externalGraphic: this.Settings.MARKER_SELECT_ICON, - graphicHeight: this.Settings.MARKER_SELECT_ICON_HEIGHT - || 32 + graphicHeight: this.Settings.MARKER_HEIGHT || 32 }}); var layer = new OpenLayers.Layer.GML("KML", "items.php", diff --git a/js/syp.js b/js/syp.js index d8a54b5..cf92ef5 100644 --- a/js/syp.js +++ b/js/syp.js @@ -18,10 +18,9 @@ OpenLayers.Control.SypAttribution = OpenLayers.Class (OpenLayers.Control.Attribu var SYP = { Settings: { - MARKER_ICON: "openlayers/img/marker-blue.png", - MARKER_ICON_HEIGHT: 25, - MARKER_SELECT_ICON: "openlayers/img/marker-green.png", - MARKER_SELECT_ICON_HEIGHT: 25 + MARKER_ICON: "media/marker-normal.png", + MARKER_SELECT_ICON: "media/marker-selected.png", + MARKER_HEIGHT: 25 }, map: null, @@ -77,7 +76,7 @@ var SYP = { }, { context: { height: function(feature) { - var defaultHeight = SYP.Settings.MARKER_ICON_HEIGHT || 32; + var defaultHeight = SYP.Settings.MARKER_HEIGHT || 32; var increase = 4 * (feature.attributes.count - 1); return Math.min(defaultHeight + increase, 50); } @@ -85,7 +84,7 @@ var SYP = { }); var selectStyle = new OpenLayers.Style({ externalGraphic: this.Settings.MARKER_SELECT_ICON, - graphicHeight: this.Settings.MARKER_SELECT_ICON_HEIGHT || 32 + graphicHeight: this.Settings.MARKER_HEIGHT || 32 }); var styleMap = new OpenLayers.StyleMap ( {"default": defaultStyle, diff --git a/media/marker-normal.png b/media/marker-normal.png new file mode 100644 index 0000000000000000000000000000000000000000..83a90b4c85f708b08220ff501e281b6df6e1171c GIT binary patch literal 992 zcmV<610Vc}P)X1^@s6-qmI800004b3#c}2nYxW zd>{!xLrWaJ zX<&2cGVi$Fn;O%iVYe{MyHLDr%-V2_xvjO8>z;f5pY!~B(I&gQXWOOv!Sm+#{eC~^ zJUq`iKM)b-TL3BqpV$ImaY6q141yr;lH{Pea?K`7_J_s*Z1~qu0LA{m!uFEVGNt}R znvO>`+EI6&0->-b`9mK7@XeNGlYpFJj6Eg$Ll>UdxOLG>)yD#&C_m6L_eXI0#8z!& zu1$!F8;$qHqacvFaI5b6@xO_~hUwT#g>XhkGhuXc*9~3CGgmyh8KM+`BnLs9qpZ9#&tn=Y;?3`BhMuV=B3A$aB1&=YwtpKxV$BS! zEZ>Nl!{6bBEe$x(m_{HJ&VzmvJ8ZeGeTj&!1G!h~VMz}5)_wGIXvwliJ-6spzuoIW zW8_)IHnkN*G!6j5lt@Iw#QD)gORZKg5kOnhPL(@${S+_<3IL8{9=qG~W45;|SrG8% zwJ7~QbZ5|Y?WXDd94HYPmZ`oIJGo2c+?^9>Xc;70_UeYNR1*=O6*>uyXEWnH*E^c| zOl^8yjvg{Och3`1=S(dR3IL|AyxIQ6K~q;JJb}XlX{3^8EK^r%y>w3~5#0tTcBQSs z^w4nb)3;Q|vGx+tp9Mn!z%;V^QpwZK=+G}Y{mx`7{V{sCpSasRTXt3`5sh)zZHRwX zqfYg-?0sB3vtKv=IULW=dQK<+xUSte*ne}P=hoK%fUnNJXK-@Q5z(!=a)nINs^TTf zv%BBFN|GF$08sp&rzsI35G=a3AY5XAvF-oMh@O1g$9EK2H literal 0 HcmV?d00001 diff --git a/media/marker-selected.png b/media/marker-selected.png new file mode 100644 index 0000000000000000000000000000000000000000..17168f1b91a857283440eb923328ff7743c276d8 GIT binary patch literal 967 zcmV;&133JNP)X1^@s6-qmI800004b3#c}2nYxW zdd3EAu<8`J~$<(~h1 z_s%`%%mERh(gN_DqAEWE*tR8oC4u5oj%j|)+WGR%f*#N_0ABppPynH->Z+gX8|!o7 z+hK}4j?j_5BV;^j*t%cu0pQyxmMsHHj4`%P59skd2lmvo_p}?TuCDqP=N8fXZm<1t z^5I>cy6g#M zjMW=KW1z0FuDRnvM|Eg>$P>8MW`3W+`M1y8!V*!jB;F&U{3?_&_KF_Rqx+BUf1aP&HHF>Z$?c+ zji)AICMebw6VjC@71wby!MdQ_@xl&I@zjkeL|%(v=zAa!=jfxAwAzXB!AW zodV$d?4#_1QFFAs3;>J|j-$wnaPkhA!jQa?^n{N6G=|J{CgnQrmkJS)$cc{lC-FSb zmEWT2%_gXZ3eB&9Bw^P}yUH}e5{Pz1ZJydz7aI~TMoChwSC^EuMev9rtweX zgP!>@;t{65mAY_taXTJz?!%I9O)g|lsa^FNJuGTM09(-&$AzS zj(1)?b5+=j-p`wwNFiY+3L+;?digz}L^KXU^x7BKgoh92G1DrF;s-?Zc*{@#5SHjl zTucB)=z~EX1^@s6-qmI800004b3#c}2nYxW zdR7i=X zm0L(uQ51&1J>KS=IZl?TU6ANPJtT>sX4w@Xirx%_Uc%}vgDw!1LJ*};FA<>_71o1g zqy>seJ(OK2%Y>whsZl`}1fy)6GdeRms|Ot!ouf{=;D6cs-{1Kci?cT(!gK=GL`PEv z%#FxDogq4kBHfOemxE8&=mj>+7z!lBJ7`?Bl>V+JL^_a$3S^FfN4HZ7MEw^O$Z=@& z9N5i(w|xW{)X&FAZU&~)pbbc!77D1iSc;tnW_`tYSg3~IBc+G&>vsBq{7IoeveUuS z%ryGHH%|@>RZ9)BAPFNMK{8wfWIY zSic*J&%??c;Bs60_U5BjuRwq#8*sU&moHU!5i4`u0~qvzXAo=(9=2FRYwtt%SAO`1 zC<_iLJHd(RdL2HDhu09@J|aU${Cokgj`>7X^7XWHBDN3nDS{&W)8qk-eTDNFbA3i}=0sWooOO6^*n z%Jt4B98pn|16^)dl82|y#TF514c)U%G>b@G?;koY-6Akm$`j}D28OAf2n<53ZmINm z2cADKt^fHqcM;u=3z%nhJ}l|zhuTHBU2*|$_#PA%V|slY6_MYTZA@`VCuwoGI~vEQ zyjn`YY4DcOdHnZt5*x#@%~`mEz~3#1)4&8WX8cA0F^10f#>x@s{#^_hI#*`>@Buqh z7vO$=1JUgC0SU8)iU>}FXUT~SDn(%={)nJJdTb2UQw=9n{{ZUlb)-Lb_=Nxf002ov JPDHLkV1l45bA|u_ literal 0 HcmV?d00001 -- 2.39.2