From d5d2bad74aa714447e776157bd7c1c1dd96632e2 Mon Sep 17 00:00:00 2001 From: Stefan Breunig Date: Tue, 26 Feb 2013 00:53:27 +0100 Subject: [PATCH] more fixes for https --- code/boot.js | 4 ++-- dist/images/layers.png | Bin 0 -> 973 bytes external/leaflet.css | 2 +- images/layers.png | Bin 0 -> 973 bytes plugins/draw-tools.user.js | 7 ++++++- 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 dist/images/layers.png create mode 100644 images/layers.png diff --git a/code/boot.js b/code/boot.js index 7cfd6d23..f14e7015 100644 --- a/code/boot.js +++ b/code/boot.js @@ -237,12 +237,12 @@ window.setupDialogs = function() { function boot() { window.debug.console.overwriteNativeIfRequired(); - console.log('loading done, booting. Built: ' + window.iitcBuildDate); + console.log('loading done, booting. Built: @@BUILDDATE@@'); if(window.deviceID) console.log('Your device ID: ' + window.deviceID); window.runOnSmartphonesBeforeBoot(); // overwrite default Leaflet Marker icon to be a neutral color - var base = 'http://breunigs.github.com/ingress-intel-total-conversion/dist/images/'; + var base = 'https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/dist/images/'; L.Icon.Default.imagePath = base; window.iconEnl = L.Icon.Default.extend({options: { iconUrl: base + 'marker-green.png' } }); diff --git a/dist/images/layers.png b/dist/images/layers.png new file mode 100644 index 0000000000000000000000000000000000000000..ef90a080bcff7b4e7917539732fa85847c788fb1 GIT binary patch literal 973 zcmeAS@N?(olHy`uVBq!ia0vp^QXtI13?%1G+4F~ifpKksPlzioFE2kozkq;%prD|T zkdTOoh^VNjgoK2oq@;|DjI6Azyu7@!va*JThM}RMiHV7+si~QnnT3UgrKP2nm6f%% zwVj=vy}iAIgM*`^qqDQKtE;Prhlh`kkFT$9WMpJiR8(48+W-ImSFc{Zb?esl_V&KM zz7;E0%$hZ8?%cT>Hf-3rb7xCSOLuqo%$YMMO_~H$Q&m;f)YP^&UNe7?b@}g zqN1X{z8)xb;J|^ryu7lqvN?0+0ChDqH00;!0}a``cW-57Wn5fbe0)66x{QpBoSdB8 z++3hypn}4}!kU_z+S=N>x;miA&CSiNt*vcsZCzbmy}iAYCr_R-Wy;j4Q>Ra#K4Zp= z*|TTQn>TO%{P_zOELga3;i5&0fG%0JYSo%GYk-bfzkdD3jT<*_-n?bY7NC2!ZQHhE z#}1$ifezTWZ{Pm?`wt#Gc=+()BS(%LJ$m%`@#7~?o;-Ex)alcw&zw1P?%cWa=g(ib zaN*LWOP4QSzIyfQwQJX|U%!6y=FMBTZr#3p`_7#^ckkZ4fB*iYM~|L7dGh@E^A|5( zynXxj-Me?6KY#x6 z>o;%Sy!-L{_wPR%c~^OC{BIq%{ z`Kyx?3KXQ`RalY*JQtRDSLSA3zuTtNQJuN${<(A8t(#W~=-W3ot_joWyQuH=ID3cU zJ+{0FDKXPTKD3vc#kN^{7_Yk|^uO(M^zDV-+Z;7(0w)A+X=i<0Z8Vcz$Em9<&Z}z* zL(0S*GIlraH5GVF)Vy~&s+8+G#>~i3mi3VpD z>6ugo2uhthvFZNfu(XXU-FpRj3w1v2uw~el_UdA`#kAjhtfdvC)BKpPZ+@e9TY4MM oxx+1cTK=C&bYJD1&CF28Aba!1z2xr;ZiC|1)78&qol`;+0Qh;)5C8xG literal 0 HcmV?d00001 diff --git a/external/leaflet.css b/external/leaflet.css index ea3da390..04f229a4 100644 --- a/external/leaflet.css +++ b/external/leaflet.css @@ -285,7 +285,7 @@ border-radius: 8px; } .leaflet-control-layers-toggle { - background-image: url(images/layers.png); + background-image: url(https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/dist/images/layers.png); width: 36px; height: 36px; } diff --git a/images/layers.png b/images/layers.png new file mode 100644 index 0000000000000000000000000000000000000000..ef90a080bcff7b4e7917539732fa85847c788fb1 GIT binary patch literal 973 zcmeAS@N?(olHy`uVBq!ia0vp^QXtI13?%1G+4F~ifpKksPlzioFE2kozkq;%prD|T zkdTOoh^VNjgoK2oq@;|DjI6Azyu7@!va*JThM}RMiHV7+si~QnnT3UgrKP2nm6f%% zwVj=vy}iAIgM*`^qqDQKtE;Prhlh`kkFT$9WMpJiR8(48+W-ImSFc{Zb?esl_V&KM zz7;E0%$hZ8?%cT>Hf-3rb7xCSOLuqo%$YMMO_~H$Q&m;f)YP^&UNe7?b@}g zqN1X{z8)xb;J|^ryu7lqvN?0+0ChDqH00;!0}a``cW-57Wn5fbe0)66x{QpBoSdB8 z++3hypn}4}!kU_z+S=N>x;miA&CSiNt*vcsZCzbmy}iAYCr_R-Wy;j4Q>Ra#K4Zp= z*|TTQn>TO%{P_zOELga3;i5&0fG%0JYSo%GYk-bfzkdD3jT<*_-n?bY7NC2!ZQHhE z#}1$ifezTWZ{Pm?`wt#Gc=+()BS(%LJ$m%`@#7~?o;-Ex)alcw&zw1P?%cWa=g(ib zaN*LWOP4QSzIyfQwQJX|U%!6y=FMBTZr#3p`_7#^ckkZ4fB*iYM~|L7dGh@E^A|5( zynXxj-Me?6KY#x6 z>o;%Sy!-L{_wPR%c~^OC{BIq%{ z`Kyx?3KXQ`RalY*JQtRDSLSA3zuTtNQJuN${<(A8t(#W~=-W3ot_joWyQuH=ID3cU zJ+{0FDKXPTKD3vc#kN^{7_Yk|^uO(M^zDV-+Z;7(0w)A+X=i<0Z8Vcz$Em9<&Z}z* zL(0S*GIlraH5GVF)Vy~&s+8+G#>~i3mi3VpD z>6ugo2uhthvFZNfu(XXU-FpRj3w1v2uw~el_UdA`#kAjhtfdvC)BKpPZ+@e9TY4MM oxx+1cTK=C&bYJD1&CF28Aba!1z2xr;ZiC|1)78&qol`;+0Qh;)5C8xG literal 0 HcmV?d00001 diff --git a/plugins/draw-tools.user.js b/plugins/draw-tools.user.js index 88fbd21c..b12e30af 100644 --- a/plugins/draw-tools.user.js +++ b/plugins/draw-tools.user.js @@ -31,10 +31,15 @@ window.plugin.drawTools = function() {}; window.plugin.drawTools.loadExternals = function() { var base = 'https://raw.github.com/breunigs/ingress-intel-total-conversion/gh-pages/external'; //~ var base = 'http://0.0.0.0:8000/dist'; - $('head').append(''); load(base+'/leaflet.draw.0.1.6.js').thenRun(window.plugin.drawTools.boot); // overwrite default Leaflet Marker icon. L.Icon.Default.imagePath = base + '/images'; + + // FIXME: this is currently manually included from + // external/leaflet.draw.0.1.6.css. It should either be loaded remotely + // automatically or the buildscript should include it here, similar to + // how it works for the main script. + $('head').append(''); }