From 1d455cb8e0fe3459c899b9bf27f3236114bf4072 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Sat, 31 Oct 2015 19:00:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BD=D0=B0=20=D1=81=20?= =?UTF-8?q?=D1=84=D0=BE=D1=82=D0=BE=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D1=8F?= =?UTF-8?q?=D0=BC=D0=B8=20=D0=BD=D0=B0=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA?= =?UTF-8?q?=D0=B5=20=D1=82=D0=BE=D1=87=D0=B5=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ground/controllers/PageController.php | 1 + ground/views/pointsTemplate.php | 19 +++++++++++++------ public/css/pageStyle.css | 7 +++++++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ground/controllers/PageController.php b/ground/controllers/PageController.php index 2642630..f3fe032 100644 --- a/ground/controllers/PageController.php +++ b/ground/controllers/PageController.php @@ -69,6 +69,7 @@ class PageController extends Controller $result[$id]['name'] = $point->name; $result[$id]['lat'] = $point->lat; $result[$id]['lng'] = $point->lng; + $result[$id]['img'] = $point->getImg('middle'); $result[$id]['author'] = $point->authorUser->nick; $result[$id]['categoryId'] = $point->categoryId; $result[$id]['categoryIcon'] = $categories[$point->categoryId]->icon; diff --git a/ground/views/pointsTemplate.php b/ground/views/pointsTemplate.php index 2cc14d8..ec4cb91 100644 --- a/ground/views/pointsTemplate.php +++ b/ground/views/pointsTemplate.php @@ -39,7 +39,7 @@ if (App::getParam('user')) { print ""; } ?> - Все точки + Все типы

- - # - -
- +
+ + +
+ + + + +
+
+ +
diff --git a/public/css/pageStyle.css b/public/css/pageStyle.css index d8f227b..07fdcfa 100644 --- a/public/css/pageStyle.css +++ b/public/css/pageStyle.css @@ -1,3 +1,9 @@ +div.pointsWall {} +div.pointsWall .line{} +div.pointsWall .point {background-size: cover; width: 50%; height: 300px; display: inline-block; float: left; padding: 10px;} +div.pointsWall .point span.header {font-size: 22px; color: white; font-weight: bold; text-shadow: -1px -1px 0 #666, 1px -1px 0 #666, -1px 1px 0 #444, 1px 1px 0 #444;} + + /* -------------------------------------------*/ /* ------------- ADAPTIVE --------------------*/ /* -------------------------------------------*/ @@ -29,4 +35,5 @@ } .pagePoinsNearCards {display: inline-block; width: 201px; height: 150px; overflow: hidden;} .pagePoinsNearCardsImg {width: 201px; height: 150px;} + div.pointsWall .point {width: 100%;} }