From 278045497748bcf838d604700533c906bd129e9f Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Mon, 11 Aug 2014 22:05:59 +0400 Subject: [PATCH] Fotorama --- ground/controllers/IndexController.php | 2 ++ ground/controllers/JsonController.php | 3 +++ ground/views/modals/image.php | 1 + public/css/fotorama.css | 4 ++++ public/css/fotorama.png | Bin 0 -> 3223 bytes public/css/fotorama@2x.png | Bin 0 -> 7319 bytes public/css/style.css | 1 + public/js/app.js | 25 ++++++++++++++++++++++--- public/js/fotorama.js | 5 +++++ public/js/map.js | 9 +++++++-- 10 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 public/css/fotorama.css create mode 100644 public/css/fotorama.png create mode 100644 public/css/fotorama@2x.png create mode 100644 public/js/fotorama.js diff --git a/ground/controllers/IndexController.php b/ground/controllers/IndexController.php index 3a87d03..d6799c2 100644 --- a/ground/controllers/IndexController.php +++ b/ground/controllers/IndexController.php @@ -25,6 +25,7 @@ class IndexController extends Controller self::addScript('/js/leaflet-routing-machine.js'); self::addScript('/js/route.js?ver='.App::getConfig('version')); self::addScript('/js/leaflet.markercluster.js'); + self::addScript('/js/fotorama.js'); self::addStyle('/css/style.css?ver='.App::getConfig('version')); self::addStyle('http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css'); @@ -33,6 +34,7 @@ class IndexController extends Controller self::addStyle('/css/leaflet-routing-machine.css'); self::addStyle('/css/MarkerCluster.css'); self::addStyle('/css/MarkerCluster.Default.css'); + self::addStyle('/css/fotorama.css'); if (!App::$user ) self::addScript('//ulogin.ru/js/ulogin.js'); diff --git a/ground/controllers/JsonController.php b/ground/controllers/JsonController.php index d0d3a11..3a90d73 100644 --- a/ground/controllers/JsonController.php +++ b/ground/controllers/JsonController.php @@ -42,6 +42,7 @@ class JsonController extends Controller $point->descriptionHtml = nl2br($point->description); $point->name = htmlspecialchars($point->name); $imgs = $point->photos; + $photosCount = 1; if ($point->img == '' && !empty($imgs)) { @@ -53,6 +54,7 @@ class JsonController extends Controller if (!empty($imgs)) { $tmp = array(); + $photosCount = count($imgs); foreach ($imgs as $img) { $tmp[] = $img->name; @@ -64,6 +66,7 @@ class JsonController extends Controller $point->categoryIcon = $categories[$point->categoryId]['icon']; $point->categoryName = $categories[$point->categoryId]['name']; + $point->photosCount = $photosCount; self::renderPartial('json.php', $point->getValues()); } else diff --git a/ground/views/modals/image.php b/ground/views/modals/image.php index 9f25650..6bf3529 100644 --- a/ground/views/modals/image.php +++ b/ground/views/modals/image.php @@ -7,6 +7,7 @@