diff --git a/controllers/IndexController.php b/controllers/IndexController.php index 36cc291..4ddc26e 100644 --- a/controllers/IndexController.php +++ b/controllers/IndexController.php @@ -13,7 +13,7 @@ class IndexController extends Controller self::addScript('/js/bootstrap.min.js'); self::addScript('/js/leaflet-0.7.3.js'); - self::addScript('http://maps.google.com/maps/api/js?v=3&sensor=false'); + self::addScript('http://maps.google.com/maps/api/js?v=3'); self::addScript('/js/tile/Google.js'); self::addScript('/js/api-maps-yandex-2.0.js'); diff --git a/public/css/style.css b/public/css/style.css index daa6be3..dd24683 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -16,7 +16,8 @@ body.openBox div#map {right: 250px;} div.clear {clear: both;} div.infoCard {text-align: justify;} div.infoCard h3 {text-align: center; margin-top: 0;} -div.infoCard img {width: 200px; float: left; margin: 0 10px 5px 0; cursor: pointer;} +div.infoCard div.photoContainer {position: relative; width: 200px;height: 150px;float: left;margin-right: 10px;margin-bottom: 10px; background-image: url(/img/noPhoto200150.png); } +div.infoCard img {width: 200px; margin: 0; cursor: pointer;} div.infoCard .photosCount {position: absolute;margin: 3px;color: white;background-color: black;border-radius: 3px;padding: 2px 4px;opacity: 0.5;} div.header {display: block; position: absolute; top: 0px; left: 40px; z-index: 1000; background-color: rgba(255,255,255,0.7); padding: 5px 10px; border-radius: 0 0 5px 5px;} div.header img {height: 89px;} diff --git a/public/js/map.js b/public/js/map.js index 88cf361..76099f0 100644 --- a/public/js/map.js +++ b/public/js/map.js @@ -269,10 +269,11 @@ function drawInfoPopup(id, showPopup, doNotPushToHistory) { data = pointsSources[id]; if (typeof (data.images) == 'object') { - photos = '
'; + photos = '
'; - if (data.images.length > 1) + if (data.images.length > 1) { photos += '
+' + (data.photosCount - 1) + '
'; + } photos += ''; photos += '
';