From 9a8e897ae9644e9522abe9f79a96be3fa2df99b1 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Tue, 12 Jan 2016 00:41:00 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=8B=D1=82=D0=B0=D0=BB?= =?UTF-8?q?=D1=81=D1=8F=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20=D0=B8=D0=B7-?= =?UTF-8?q?=D0=B7=D0=B0=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=B8=D0=BD=D0=BE=D0=B3=D0=B4=D0=B0=20=D0=B2=20=D0=BA=D0=B0?= =?UTF-8?q?=D1=80=D1=82=D0=BE=D1=87=D0=BA=D0=B5=20=D1=82=D0=B5=D0=BA=D1=81?= =?UTF-8?q?=D1=82=20=D0=BD=D0=B0=D1=81=D0=BB=D0=B0=D0=B8=D0=B2=D0=B0=D0=B5?= =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D1=81=D0=B0=D0=BC=20=D0=BD=D0=B0=20=D1=81?= =?UTF-8?q?=D0=B5=D0=B1=D1=8F.=20=D0=94=D1=83=D0=BC=D0=B0=D1=8E=20=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=BE=20=D0=B2=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8?= =?UTF-8?q?=D0=BD=D0=BA=D0=B5,=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BE=D0=B9=20=D0=B1=D1=8B=D0=BB=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/IndexController.php | 2 +- public/css/style.css | 3 ++- public/js/map.js | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) 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 += '
';