From bc5ef80d6c1d4a2066cd6945b805ae753c726531 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Fri, 11 Sep 2015 17:52:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D0=BB=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8.=20=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BD=D0=B5?= =?UTF-8?q?=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B8=D1=82=D1=81=D1=8F=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BB-=D0=B2=D0=BE=20=D1=82=D0=BE=D1=87=D0=B5?= =?UTF-8?q?=D0=BA=20=D0=BD=D0=B0=20=D0=BA=D0=B0=D1=80=D1=82=D0=B5=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ground/app.php | 1 + ground/classes/Helper.php | 4 ++-- ground/controllers/ArticlesController.php | 3 +-- ground/controllers/IndexController.php | 13 +++++-------- ground/controllers/PageController.php | 3 +-- public/js/map.js | 4 ++-- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/ground/app.php b/ground/app.php index 72fbea0..5787c6b 100644 --- a/ground/app.php +++ b/ground/app.php @@ -33,6 +33,7 @@ class App private static $DB = null; public static $user = null; public static $request = array(); + public static $defaultTitle = 'Лучшие выходные – это выходные в путешествии! – wikipoints.ru'; /** * Разбивает урл на контроллер, метод и выбирает параметры. diff --git a/ground/classes/Helper.php b/ground/classes/Helper.php index abe474f..833039d 100644 --- a/ground/classes/Helper.php +++ b/ground/classes/Helper.php @@ -115,7 +115,7 @@ class Helper $og['title'] = str_replace('"', 'ʺ', $point->name) . ' [wikipoints.ru]'; $point->description = str_replace('"', 'ʺ', $point->description); $og['description'] = mb_substr($point->description, 0, 99, 'UTF-8') . '…'; - $og['site_name'] = 'WikiPoints: Лучшие выходные - это выходные в путешествии!'; + $og['site_name'] = App::$defaultTitle; $og['type'] = 'website'; $og['url'] = 'http://wikipoints.ru/?point=' . $point->id; $og['image'] = $point->getImg('middle'); @@ -129,7 +129,7 @@ class Helper $og['title'] = str_replace('"', 'ʺ', $article->title) . ' [wikipoints.ru]'; $article->text = Markdown::getClear(str_replace('"', 'ʺ', $article->text)); $og['description'] = mb_substr($article->text, 0, 99, 'UTF-8') . '…'; - $og['site_name'] = 'WikiPoints: Лучшие выходные - это выходные в путешествии!'; + $og['site_name'] = App::$defaultTitle; $og['type'] = 'website'; $og['url'] = 'http://wikipoints.ru/page/article/id/' . $article->id; $og['image'] = $article->getImg('middle'); diff --git a/ground/controllers/ArticlesController.php b/ground/controllers/ArticlesController.php index beb4162..230c0da 100644 --- a/ground/controllers/ArticlesController.php +++ b/ground/controllers/ArticlesController.php @@ -19,8 +19,7 @@ class ArticlesController extends Controller } // ------------------------------------------ - $res = App::DB()->query("SELECT COUNT(`id`) pointsCount FROM `points`")->fetch(PDO::FETCH_ASSOC); - App::setConfig('title', $res['pointsCount'] . ' или даже больше поводов не сидеть дома'); + App::setConfig('title', App::$defaultTitle); self::render('articles/index.php', array( 'user' => App::$user, diff --git a/ground/controllers/IndexController.php b/ground/controllers/IndexController.php index 0a4f6c5..c8221c8 100644 --- a/ground/controllers/IndexController.php +++ b/ground/controllers/IndexController.php @@ -56,12 +56,9 @@ class IndexController extends Controller $favorites = Favorite::model()->getAllMy(); } + App::setConfig('title', App::$defaultTitle); + self::addVar('isAdmin', (int) (App::$user && App::$user->isAdmin == 1)); - - $res = App::DB()->query("SELECT COUNT(`id`) pointsCount FROM `points` where `moderate` = 1")->fetch(PDO::FETCH_ASSOC); - App::setConfig('title', $res['pointsCount'] . ' или даже больше поводов не сидеть дома'); - self::addVar('pointsCount', $res['pointsCount']); - self::addVar('pointLat', 0); self::addVar('pointLng', 0); @@ -86,11 +83,11 @@ class IndexController extends Controller self::addVar('pointLng', $point->lng); } else if (isset($_GET['point']) && $_GET['point'] && strtolower($_GET['point']) == 'random') { $og['title'] = 'Случайная точка на wikipoints.ru'; - $og['description'] = 'Загляните сюда: http://vk.com/wikipoints Случайная точка на карте - лучший способ узнать что-то новое!'; - $og['site_name'] = 'WikiPoints - ' . $res['pointsCount'] . ' или даже больше поводов не сидеть дома'; + $og['description'] = 'Случайная точка на карте – это лучший способ узнать что-то новое! - wikipoints.ru'; + $og['site_name'] = App::$defaultTitle; $og['type'] = 'article'; $og['url'] = 'http://wikipoints.ru/?point=random'; - $og['image'] = 'http://wikipoints.ru/img/compas.jpg'; + $og['image'] = 'http://wikipoints.ru/img/logo.png'; } self::render('indexTemplate.php', array( diff --git a/ground/controllers/PageController.php b/ground/controllers/PageController.php index edfaba1..dd71681 100644 --- a/ground/controllers/PageController.php +++ b/ground/controllers/PageController.php @@ -63,8 +63,7 @@ class PageController extends Controller $result[$id]['categoryIcon'] = $categories[$point->categoryId]->icon; } - $res = App::DB()->query("SELECT COUNT(`id`) pointsCount FROM `points`")->fetch(PDO::FETCH_ASSOC); - App::setConfig('title', $res['pointsCount'] . ' или даже больше поводов не сидеть дома'); + App::setConfig('title', App::$defaultTitle); self::render('pointsTemplate.php', array( 'categories' => $categories, diff --git a/public/js/map.js b/public/js/map.js index 8ed7e35..a910370 100644 --- a/public/js/map.js +++ b/public/js/map.js @@ -111,7 +111,7 @@ function init(lat, lng) { myMap.on('moveend', function (e) { if (!myMap._popup && $('#boxRoute').css('display') == 'none' && status != statusMovingInHistory) { - document.title = pointsCount + ' или даже больше поводов не сидеть дома'; + document.title = 'Лучшие выходные – это выходные в путешествии! – wikipoints.ru'; history.pushState({lat: myMap.getCenter().lat, lng: myMap.getCenter().lng, zoom: myMap.getZoom()}, document.title, "/?lat=" + myMap.getCenter().lat + "&lng=" + myMap.getCenter().lng + "&zoom=" + myMap.getZoom()); } @@ -312,7 +312,7 @@ function drawInfoPopup(id, showPopup, doNotPushToHistory) { history.pushState({pointId: id}, document.title, "/?point=" + id); } - document.title = marker.options.title; + document.title = marker.options.title + ' – wikipoints.ru'; }); return true;