aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2013-07-03 16:43:26 +0100
committerStruan Donald <struan@exo.org.uk>2013-07-03 16:44:32 +0100
commitafce4eeb88cdb92e91de3009438104661319aa9a (patch)
tree60e24e8c88fa5a0d6380fbd4935185a00be9c70d
parent996bf676b2aa53b682157a6adafa3b17511d4430 (diff)
consolidate the images in one directory
-rw-r--r--www/css/fms.css12
-rw-r--r--www/i/arrow-east.gifbin65 -> 0 bytes
-rw-r--r--www/i/arrow-north.gifbin61 -> 0 bytes
-rw-r--r--www/i/arrow-northeast.gifbin61 -> 0 bytes
-rw-r--r--www/i/arrow-northwest.gifbin61 -> 0 bytes
-rw-r--r--www/i/arrow-south.gifbin60 -> 0 bytes
-rw-r--r--www/i/arrow-southeast.gifbin61 -> 0 bytes
-rw-r--r--www/i/arrow-southwest.gifbin61 -> 0 bytes
-rw-r--r--www/i/arrow-west.gifbin64 -> 0 bytes
-rw-r--r--www/i/email.pngbin593 -> 0 bytes
-rw-r--r--www/i/flower.gifbin1644 -> 0 bytes
-rw-r--r--www/i/grey.gifbin34 -> 0 bytes
-rw-r--r--www/i/moj.pngbin2067 -> 0 bytes
-rw-r--r--www/i/mysociety-dark.pngbin4688 -> 0 bytes
-rw-r--r--www/i/mysociety-on-white.gifbin1132 -> 0 bytes
-rw-r--r--www/i/new.pngbin989 -> 0 bytes
-rw-r--r--www/i/rose.gifbin1421 -> 0 bytes
-rw-r--r--www/i/zoomin.gifbin1090 -> 0 bytes
-rw-r--r--www/i/zoomout.gifbin1082 -> 0 bytes
-rw-r--r--www/images/camera.png (renamed from www/i/camera.png)bin180 -> 180 bytes
-rw-r--r--www/images/camera@x2.png (renamed from www/i/camera@x2.png)bin269 -> 269 bytes
-rw-r--r--www/images/dropdown-arrow.svg (renamed from www/i/dropdown-arrow.svg)0
-rw-r--r--www/images/photos.png (renamed from www/i/photos.png)bin179 -> 179 bytes
-rw-r--r--www/images/photos@x2.png (renamed from www/i/photos@x2.png)bin277 -> 277 bytes
-rw-r--r--www/images/pin-green.png (renamed from www/i/pin-green.png)bin1806 -> 1806 bytes
-rw-r--r--www/images/pin-red.png (renamed from www/i/pin-red.png)bin1841 -> 1841 bytes
-rw-r--r--www/images/pin-shadow-big.png (renamed from www/i/pin-shadow-big.png)bin1202 -> 1202 bytes
-rw-r--r--www/images/pin-shadow.png (renamed from www/i/pin-shadow.png)bin720 -> 720 bytes
-rw-r--r--www/images/pin-yellow-big.png (renamed from www/i/pin-yellow-big.png)bin2364 -> 2364 bytes
-rw-r--r--www/images/pin-yellow.png (renamed from www/i/pin-yellow.png)bin1475 -> 1475 bytes
-rw-r--r--www/images/pin.svg (renamed from www/i/pin.svg)0
-rw-r--r--www/images/pin_shadow.svg (renamed from www/i/pin_shadow.svg)0
-rw-r--r--www/images/user.png (renamed from www/i/user.png)bin147 -> 147 bytes
-rw-r--r--www/images/user@x2.png (renamed from www/i/user@x2.png)bin216 -> 216 bytes
-rw-r--r--www/js/map-OpenLayers.js16
35 files changed, 14 insertions, 14 deletions
diff --git a/www/css/fms.css b/www/css/fms.css
index a6f7dbe..dc73c8d 100644
--- a/www/css/fms.css
+++ b/www/css/fms.css
@@ -586,25 +586,25 @@
background-size: 18px 18px;
}
.ui-icon-fms-account {
- background-image: url(../i/user.png);
+ background-image: url(../images/user.png);
background-size: 18px 18px;
}
.ui-icon-fms-photo-new {
- background-image: url(../i/camera.png);
+ background-image: url(../images/camera.png);
}
.ui-icon-fms-photo-existing {
- background-image: url(../i/photos.png);
+ background-image: url(../images/photos.png);
}
@media only screen and (min-resolution: 320dpi),
only screen and (-webkit-min-device-pixel-ratio: 2) {
.ui-icon-fms-account {
- background-image: url(../i/user@x2.png);
+ background-image: url(../images/user@x2.png);
}
.ui-icon-fms-photo-new {
- background-image: url(../i/camera@x2.png);
+ background-image: url(../images/camera@x2.png);
}
.ui-icon-fms-photo-existing {
- background-image: url(../i/photos@x2.png);
+ background-image: url(../images/photos@x2.png);
}
}
diff --git a/www/i/arrow-east.gif b/www/i/arrow-east.gif
deleted file mode 100644
index 132bd93..0000000
--- a/www/i/arrow-east.gif
+++ /dev/null
Binary files differ
diff --git a/www/i/arrow-north.gif b/www/i/arrow-north.gif
deleted file mode 100644
index 2e0422f..0000000
--- a/www/i/arrow-north.gif
+++ /dev/null
Binary files differ
diff --git a/www/i/arrow-northeast.gif b/www/i/arrow-northeast.gif
deleted file mode 100644
index 08546cc..0000000
--- a/www/i/arrow-northeast.gif
+++ /dev/null
Binary files differ
diff --git a/www/i/arrow-northwest.gif b/www/i/arrow-northwest.gif
deleted file mode 100644
index d682da8..0000000
--- a/www/i/arrow-northwest.gif
+++ /dev/null
Binary files differ
diff --git a/www/i/arrow-south.gif b/www/i/arrow-south.gif
deleted file mode 100644
index 1c3f281..0000000
--- a/www/i/arrow-south.gif
+++ /dev/null
Binary files differ
diff --git a/www/i/arrow-southeast.gif b/www/i/arrow-southeast.gif
deleted file mode 100644
index 11af475..0000000
--- a/www/i/arrow-southeast.gif
+++ /dev/null
Binary files differ
diff --git a/www/i/arrow-southwest.gif b/www/i/arrow-southwest.gif
deleted file mode 100644
index 41e4831..0000000
--- a/www/i/arrow-southwest.gif
+++ /dev/null
Binary files differ
diff --git a/www/i/arrow-west.gif b/www/i/arrow-west.gif
deleted file mode 100644
index 12a335b..0000000
--- a/www/i/arrow-west.gif
+++ /dev/null
Binary files differ
diff --git a/www/i/email.png b/www/i/email.png
deleted file mode 100644
index 030eafd..0000000
--- a/www/i/email.png
+++ /dev/null
Binary files differ
diff --git a/www/i/flower.gif b/www/i/flower.gif
deleted file mode 100644
index 7e8f22a..0000000
--- a/www/i/flower.gif
+++ /dev/null
Binary files differ
diff --git a/www/i/grey.gif b/www/i/grey.gif
deleted file mode 100644
index 98eee7d..0000000
--- a/www/i/grey.gif
+++ /dev/null
Binary files differ
diff --git a/www/i/moj.png b/www/i/moj.png
deleted file mode 100644
index 2f9adb9..0000000
--- a/www/i/moj.png
+++ /dev/null
Binary files differ
diff --git a/www/i/mysociety-dark.png b/www/i/mysociety-dark.png
deleted file mode 100644
index 2bf2604..0000000
--- a/www/i/mysociety-dark.png
+++ /dev/null
Binary files differ
diff --git a/www/i/mysociety-on-white.gif b/www/i/mysociety-on-white.gif
deleted file mode 100644
index 0f8a102..0000000
--- a/www/i/mysociety-on-white.gif
+++ /dev/null
Binary files differ
diff --git a/www/i/new.png b/www/i/new.png
deleted file mode 100644
index 5889d82..0000000
--- a/www/i/new.png
+++ /dev/null
Binary files differ
diff --git a/www/i/rose.gif b/www/i/rose.gif
deleted file mode 100644
index cceaaad..0000000
--- a/www/i/rose.gif
+++ /dev/null
Binary files differ
diff --git a/www/i/zoomin.gif b/www/i/zoomin.gif
deleted file mode 100644
index 32ced67..0000000
--- a/www/i/zoomin.gif
+++ /dev/null
Binary files differ
diff --git a/www/i/zoomout.gif b/www/i/zoomout.gif
deleted file mode 100644
index 8de898b..0000000
--- a/www/i/zoomout.gif
+++ /dev/null
Binary files differ
diff --git a/www/i/camera.png b/www/images/camera.png
index c3f8d2b..c3f8d2b 100644
--- a/www/i/camera.png
+++ b/www/images/camera.png
Binary files differ
diff --git a/www/i/camera@x2.png b/www/images/camera@x2.png
index d5c2467..d5c2467 100644
--- a/www/i/camera@x2.png
+++ b/www/images/camera@x2.png
Binary files differ
diff --git a/www/i/dropdown-arrow.svg b/www/images/dropdown-arrow.svg
index c416be7..c416be7 100644
--- a/www/i/dropdown-arrow.svg
+++ b/www/images/dropdown-arrow.svg
diff --git a/www/i/photos.png b/www/images/photos.png
index 25f967d..25f967d 100644
--- a/www/i/photos.png
+++ b/www/images/photos.png
Binary files differ
diff --git a/www/i/photos@x2.png b/www/images/photos@x2.png
index 32a8a31..32a8a31 100644
--- a/www/i/photos@x2.png
+++ b/www/images/photos@x2.png
Binary files differ
diff --git a/www/i/pin-green.png b/www/images/pin-green.png
index 8b64d51..8b64d51 100644
--- a/www/i/pin-green.png
+++ b/www/images/pin-green.png
Binary files differ
diff --git a/www/i/pin-red.png b/www/images/pin-red.png
index 9b754e4..9b754e4 100644
--- a/www/i/pin-red.png
+++ b/www/images/pin-red.png
Binary files differ
diff --git a/www/i/pin-shadow-big.png b/www/images/pin-shadow-big.png
index 113184b..113184b 100644
--- a/www/i/pin-shadow-big.png
+++ b/www/images/pin-shadow-big.png
Binary files differ
diff --git a/www/i/pin-shadow.png b/www/images/pin-shadow.png
index 8b47059..8b47059 100644
--- a/www/i/pin-shadow.png
+++ b/www/images/pin-shadow.png
Binary files differ
diff --git a/www/i/pin-yellow-big.png b/www/images/pin-yellow-big.png
index 59ed29d..59ed29d 100644
--- a/www/i/pin-yellow-big.png
+++ b/www/images/pin-yellow-big.png
Binary files differ
diff --git a/www/i/pin-yellow.png b/www/images/pin-yellow.png
index f9359b0..f9359b0 100644
--- a/www/i/pin-yellow.png
+++ b/www/images/pin-yellow.png
Binary files differ
diff --git a/www/i/pin.svg b/www/images/pin.svg
index ae97408..ae97408 100644
--- a/www/i/pin.svg
+++ b/www/images/pin.svg
diff --git a/www/i/pin_shadow.svg b/www/images/pin_shadow.svg
index 1e9b0eb..1e9b0eb 100644
--- a/www/i/pin_shadow.svg
+++ b/www/images/pin_shadow.svg
diff --git a/www/i/user.png b/www/images/user.png
index 980ccdd..980ccdd 100644
--- a/www/i/user.png
+++ b/www/images/user.png
Binary files differ
diff --git a/www/i/user@x2.png b/www/images/user@x2.png
index 0b46740..0b46740 100644
--- a/www/i/user@x2.png
+++ b/www/images/user@x2.png
Binary files differ
diff --git a/www/js/map-OpenLayers.js b/www/js/map-OpenLayers.js
index 6b0d8f6..7a4b2cb 100644
--- a/www/js/map-OpenLayers.js
+++ b/www/js/map-OpenLayers.js
@@ -65,35 +65,35 @@ function fixmystreet_onload() {
backgroundGraphicZIndex: 10
})
});
- var location_img = 'i/location_pin.png';
- var location_bg_img = 'i/location_pin_shadow.png';
+ var location_img = 'images/location_pin.png';
+ var location_bg_img = 'images/location_pin_shadow.png';
if ( typeof device !== 'undefined' &&
(device.platform == 'Android' && parseInt(device.version, 10) > 2) ||
(device.platform !== 'Android') ) {
- location_img = 'i/pin.svg';
- location_bg_img = 'i/pin_shadow.svg';
+ location_img = 'images/pin.svg';
+ location_bg_img = 'images/pin_shadow.svg';
}
pin_layer_style_map.addUniqueValueRules('default', 'size', {
'normal': {
- externalGraphic: "i/pin-${colour}.png",
+ externalGraphic: "images/pin-${colour}.png",
graphicWidth: 48,
graphicHeight: 64,
graphicXOffset: -24,
graphicYOffset: -64,
- backgroundGraphic: "i/pin-shadow.png",
+ backgroundGraphic: "images/pin-shadow.png",
backgroundWidth: 60,
backgroundHeight: 30,
backgroundXOffset: -7,
backgroundYOffset: -30
},
'big': {
- externalGraphic: "i/pin-${colour}-big.png",
+ externalGraphic: "images/pin-${colour}-big.png",
graphicWidth: 78,
graphicHeight: 105,
graphicXOffset: -39,
graphicYOffset: -105,
- backgroundGraphic: "i/pin-shadow-big.png",
+ backgroundGraphic: "images/pin-shadow-big.png",
backgroundWidth: 88,
backgroundHeight: 40,
backgroundXOffset: -10,