All4DK
/
wikipoints
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: All4DK:205fb641803fbf37a2332472936b5a1d5d6017d1
Branches Tags
All4DK:master
..
compare: All4DK:98ccd3c334ec8fe9f6766a6781f16f01a9f01c28
Branches Tags
All4DK:master

No commits in common. "205fb641803fbf37a2332472936b5a1d5d6017d1" and "98ccd3c334ec8fe9f6766a6781f16f01a9f01c28" have entirely different histories.
205fb64180 ... 98ccd3c334

25 changed files with 67 additions and 2158 deletions
Show Stats Expand all files Collapse all files

14
controllers/JsonController.php
View File

@ -476,14 +476,6 @@ class JsonController extends Controller
if (!empty($out)) {
$obj = simplexml_load_string($out);
if (isset($obj->GeoObjectCollection->metaDataProperty->GeocoderResponseMetaData->Point)) {
$coords = explode(' ', (string) $obj->GeoObjectCollection->metaDataProperty->GeocoderResponseMetaData->Point->pos);
$lat = $coords[1];
$lng = $coords[0];
$name = "Координаты N°" . $lat . ' E°' . $lng;
$results[] = array('value' => $name, 'data' => "/?lat=$lat&lng=$lng&zoom=13&marker=true");
}
if (isset($obj->GeoObjectCollection->metaDataProperty->GeocoderResponseMetaData->found)) {
$count = (int) $obj->GeoObjectCollection->metaDataProperty->GeocoderResponseMetaData->found;
if ($count > 0) {
@ -494,6 +486,12 @@ class JsonController extends Controller
$lng = $coords[0];
$results[] = array('value' => $name, 'data' => "/?lat=$lat&lng=$lng&zoom=13&marker=true");
}
} else if (isset($obj->GeoObjectCollection->metaDataProperty->GeocoderResponseMetaData->Point)) {
$coords = explode(' ', (string) $obj->GeoObjectCollection->metaDataProperty->GeocoderResponseMetaData->Point->pos);
$lat = $coords[1];
$lng = $coords[0];
$name = "Координаты N°" . $lat . ' E°' . $lng;
$results[] = array('value' => $name, 'data' => "/?lat=$lat&lng=$lng&zoom=13&marker=true");
}
}
}

1
controllers/PointController.php
View File

@ -55,7 +55,6 @@ class PointController extends Controller
$point->descriptionHtml = nl2br($point->descriptionHtml);
$point->name = htmlspecialchars($point->name);
App::setConfig('title', $point->name . ' – wikipoints.ru');
App::setConfig('description', mb_substr(Helper::replaceLinks($point->description), 0, 99, 'UTF-8') . '…');
self::addVar('pointLat', $point->lat);
self::addVar('pointLng', $point->lng);
self::addVar('pointId', $point->id);

10
public/js/app.js
View File

@ -147,14 +147,16 @@ window.addEventListener('popstate', function(e)
if (e.state.hasOwnProperty('pointId'))
{
showInfo(e.state.pointId, false, true);
} else if (e.state.hasOwnProperty('zoom'))
} else
if (e.state.hasOwnProperty('zoom'))
{
lat = e.state.lat;
lng = e.state.lng;
zoom = e.state.zoom;
myMap.setView([lat, lng], zoom);
} else if (e.state.hasOwnProperty('route'))
} else
if (e.state.hasOwnProperty('route'))
{
loadRouteJSON(e.state.route);
}
@ -249,7 +251,9 @@ function activateAddPoint()
$('#map').css('cursor', 'crosshair');
$('div#addHelper').slideDown(200);
setStatus(statusHunting)
} else {
}
else
{
$('div#addHelper').hide(150);
$('#map').css('cursor', 'arrow');
setStatus(statusReady)

15
public/js/map.js
View File

@ -87,7 +87,8 @@ function init(lat, lng) {
myMap.on('click', function (e) {
if (!myMap._popup) {
if (status == statusHunting) {
if (status == statusHunting)
{
$('div#addHelper').hide(150);
$('#addPointId').remove();
$('#addPointForm input:text').val('');
@ -98,7 +99,8 @@ function init(lat, lng) {
$('#myModalLabel').text('Добавление новой точки');
$('#addPointModal').modal('show');
} else if (status == statusReHunting) {
} else if (status == statusReHunting)
{
resetStatus();
$('#addPointLat').val(e.latlng.lat);
@ -107,7 +109,8 @@ function init(lat, lng) {
$('#myModalLabel').text('Редактирование точки');
$('#addPointModal').modal('show');
}
} else {
}
else {
closePopup();
}
});
@ -118,13 +121,15 @@ function init(lat, lng) {
$("#extraParamsContainer").sortable();
myMap.on('moveend', function (e) {
if (!myMap._popup && status != statusMovingInHistory) {
if (!myMap._popup && $('#boxRoute').css('display') == 'none' && status != statusMovingInHistory)
{
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());
loadPointsInBounds();
}
if (status == statusMovingInHistory) {
if (status == statusMovingInHistory)
{
resetStatus();
}
});

3
public/js/suggest.js
View File

@ -40,9 +40,6 @@ function suggestKeyPress(key)
if ( $('div.hover','#suggestContainer').length > 0 ) {
link = $('a', $('div.hover','#suggestContainer')).attr('href');
window.location.href = link;
} else if ( $('div','#suggestContainer').length > 0 ) {
link = $('a', $('div','#suggestContainer')).attr('href');
window.location.href = link;
} else {
searchAdderess();
}

BIN
source/logo1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 48 KiB

BIN
source/logo2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 111 KiB

BIN
source/logo3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 115 KiB

BIN
source/logo4.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 62 KiB

1769
source/logoVideo.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 228 KiB

295
source/my4x4home.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 35 KiB

BIN
source/rectangleLogo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 43 KiB

17
views/article.php
View File

@ -6,23 +6,6 @@
<div class="coords-container">
Вернуться <a href="/">на карту</a>.
</div>
<?php if($article->status != 'system'): ?>
<div class="row">
<div class="col-md-12" style="text-align: center;">
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- Point-TOP -->
<ins class="adsbygoogle"
style="display:block"
data-ad-client="ca-pub-0069680015252793"
data-ad-slot="2373587563"
data-ad-format="auto"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
</div>
</div>
<br/>
<?php endif; ?>
<div class="mainTextBlock">
<?= $article->html; ?>

26
views/feed/index.php
View File

@ -2,18 +2,6 @@
<div class="container feed">
<div class="row elements">
<div class="col-md-12">
<br/>
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- Point-TOP -->
<ins class="adsbygoogle"
style="display:block"
data-ad-client="ca-pub-0069680015252793"
data-ad-slot="2373587563"
data-ad-format="auto"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
<br/>
<h4 class="top5authors">Самые активные авторы</h4>
<?php foreach ($authors as $author):?>
<div class="top5authors text-center">
@ -27,7 +15,17 @@
</div>
<hr class="onlySmallScreen"/>
<div class="row elements">
<div class="col-md-6">
<div class="col-md-2">
<h4 class="onlySmallScreen text-center">Новости</h4>
<?php foreach ($news as $item) : ?>
<div class="element news">
<h4><?= $item->title ?></h4>
<?= $item->text ?>
</div>
<?php endforeach;?>
</div>
<hr class="onlySmallScreen"/>
<div class="col-md-5">
<h4 class="onlySmallScreen text-center">Точки</h4>
<?php foreach ($points as $item) : ?>
<div class="element points">
@ -43,7 +41,7 @@
<a href="/page/points/"><h4 style="text-align: center;">У нас есть больше новых точек!</h4></a>
</div>
<hr class="onlySmallScreen"/>
<div class="col-md-6">
<div class="col-md-5">
<h4 class="onlySmallScreen text-center">Статьи</h4>
<?php foreach ($articles as $item) : ?>
<div class="element articles">

10
views/indexTemplate.php
View File

@ -10,10 +10,10 @@ if (App::$user) {
<div class="glyphicon glyphicon-plus big _t" title="Приблизить" onclick="myMap.zoomIn()"></div>
<div class="glyphicon glyphicon-minus big _b" title="Отдалить" onclick="myMap.zoomOut()"></div>
<div class="glyphicon _t boxButtonLayers" onclick="openBox('Layers')" title="Слои карты"><img src="/img/buttons/layers.png" style="margin-left: -5px; width: 30px;" /></div>
<div class="glyphicon _c boxButtonFilter" title="Фильтры и поиск" onclick="openBox('Filter')"><img src="/img/buttons/search.png" style="margin-left: -5px; width: 30px;" /></div>
<div class="glyphicon _c" id="showMeOnTheMap" title="Я на карте" onclick="showMeOnTheMap()"><img src="/img/buttons/myPosition.png" style="height: 21px;" /></div>
<div class="glyphicon _b boxButtonRoute" title="Маршрут" onclick="openBox('Route')"><img src="/img/buttons/route.png" style="margin-left: -5px; width: 30px;" /></div>
<div class="glyphicon _t boxButtonLayers" onclick="openBox('Layers')" title="Слои карты"><img src="/img/buttons/layers.png" style="margin-top: -10px; margin-left: -5px; width: 30px;" /></div>
<div class="glyphicon _c boxButtonFilter" title="Фильтры и поиск" onclick="openBox('Filter')"><img src="/img/buttons/search.png" style="margin-top: -10px; margin-left: -5px; width: 30px;" /></div>
<div class="glyphicon _c" id="showMeOnTheMap" title="Я на карте" onclick="showMeOnTheMap()"><img src="/img/buttons/myPosition.png" style="margin-top: -20px; height: 21px;" /></div>
<div class="glyphicon _b boxButtonRoute" title="Маршрут" onclick="openBox('Route')"><img src="/img/buttons/route.png" style="margin-top: -10px; margin-left: -5px; width: 30px;" /></div>
<?php if (App::$user): ?>
@ -22,7 +22,7 @@ if (App::$user) {
<div class="glyphicon _c glyphicon-cloud-download boxButtonRoutes" onclick="openBox('Routes')" title="Мои маршруты"></div>
<div class="glyphicon _b glyphicon-road boxButtonTracks" onclick="openBox('Tracks')" title="Мои треки"></div>
<?php else: ?>
<div class="glyphicon" id="addPointButton" onclick="$('#loginModal').modal('show');" title="Добавить точку"><img src="/img/buttons/addPoint.png" style="height: 30px;" /></div>
<div class="glyphicon" id="addPointButton" onclick="$('#loginModal').modal('show');" title="Добавить точку"><img src="/img/buttons/addPoint.png" style="margin-top: -10px; height: 30px;" /></div>
<?php endif; ?>
</div>
<div id="box">

4
views/layouts/default.php
View File

@ -6,8 +6,8 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="ru" prefix="og: http://ogp.me/ns#" xmlns:fb="http://ogp.me/ns/fb#" xmlns:og="http://ogp.me/ns#">
<head>
<title><?= App::getConfig('title') ?></title>
<meta name="description" content="<?= App::getConfig('description') ?>">
<meta name="keywords" content="путешествие, туризм, карта, достопримечательности, интересные места, на карте, адрес">
<meta name="Description" content="Карта, на которой отмечены достопримечательности разных стран. Создайте своё путешествие!">
<meta name="Keywords" content="путешествие, туризм, карта, достопримечательности, интересные места, на карте, адрес">
<link rel="shortcut icon" href="/favicon.ico"></link>
<link rel="icon" href="/favicon.ico"></link>

1
views/layouts/page.php
View File

@ -2,7 +2,6 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="ru" prefix="og: http://ogp.me/ns#" xmlns:fb="http://ogp.me/ns/fb#" xmlns:og="http://ogp.me/ns#">
<head>
<title><?= App::getConfig('title') ?></title>
<meta name="description" content="<?= App::getConfig('description') ?>">
<link rel="shortcut icon" href="/favicon.ico"></link>
<link rel="icon" href="/favicon.ico"></link>

4
views/lp/cafe.php
View File

@ -14,7 +14,7 @@
<a href="mailto:info@wikipoints.ru">info@wikipoints.ru</a>
</div>
<div class="header-middle">
<a href="tel:+79046106141">+7 (904) 610-6141</a>
<a href="tel:+78129814495">+7 (812) 981-4495</a>
</div>
</div>
</div>
@ -167,7 +167,7 @@
<a href="mailto:info@wikipoints.ru">info@wikipoints.ru</a>
</div>
<div class="header-small">
<a href="tel:+79046106141">+7 (904) 610-6141</a>
<a href="tel:+78129814495">+7 (812) 981-4495</a>
</div>
</div>
</div>

4
views/lp/excursion.php
View File

@ -14,7 +14,7 @@
<a href="mailto:info@wikipoints.ru">info@wikipoints.ru</a>
</div>
<div class="header-middle">
<a href="tel:+79046106141">+7 (904) 610-6141</a>
<a href="tel:+78129814495">+7 (812) 981-4495</a>
</div>
</div>
</div>
@ -167,7 +167,7 @@
<a href="mailto:info@wikipoints.ru">info@wikipoints.ru</a>
</div>
<div class="header-small">
<a href="tel:+79046106141">+7 (904) 610-6141</a>
<a href="tel:+78129814495">+7 (812) 981-4495</a>
</div>
</div>
</div>

4
views/lp/hotels.php
View File

@ -14,7 +14,7 @@
<a href="mailto:info@wikipoints.ru">info@wikipoints.ru</a>
</div>
<div class="header-middle">
<a href="tel:+79046106141">+7 (904) 610-6141</a>
<a href="tel:+78129814495">+7 (812) 981-4495</a>
</div>
</div>
</div>
@ -167,7 +167,7 @@
<a href="mailto:info@wikipoints.ru">info@wikipoints.ru</a>
</div>
<div class="header-small">
<a href="tel:+79046106141">+7 (904) 610-6141</a>
<a href="tel:+78129814495">+7 (812) 981-4495</a>
</div>
</div>
</div>

4
views/lp/index.php
View File

@ -13,7 +13,7 @@
<a href="mailto:info@wikipoints.ru">info@wikipoints.ru</a>
</div>
<div class="header-middle">
<a href="tel:+79046106141">+7 (904) 610-6141</a>
<a href="tel:+78129814495">+7 (812) 981-4495</a>
</div>
</div>
</div>
@ -195,7 +195,7 @@
<a href="mailto:info@wikipoints.ru">info@wikipoints.ru</a>
</div>
<div class="header-small">
<a href="tel:+79046106141">+7 (904) 610-6141</a>
<a href="tel:+78129814495">+7 (812) 981-4495</a>
</div>
</div>
</div>

7
views/page/darkFooter.php
View File

@ -1,17 +1,18 @@
<div class="row darkFooter">
<div class="col-md-4">
<h4 style="text-align: center;">Социальные сети</h4>
Присоединяйтеся к нам — это интересно!<br/>
Присоединяйтеся к нам - это интересно!<br/>
<a href="https://vk.com/wikipoints" target="_blank">ВКонтакте</a> и
<a href="https://instagram.com/wikipoints/" target="_blank">Instagram</a><br/>
</div>
<div class="col-md-4">
<h4 style="text-align: center;">Контакты</h4>
Телефон: <a href="tel:+79046106141">+7 (904) 610-6141</a><br/>
Телефон: +7 (812) 981-4495<br/>
EMail: info&#64;wikipoints.ru<br/>
Приглашение к <a href="/article/24">сотрудничеству</a>
</div>
<div class="col-md-4">
<h4 style="text-align: center;">Прочее</h4>
2014-<?= date('Y') ?> &copy; wikipoints.ru
2014-<?= date('Y') ?> &copy; wikipoints.ru - при любом использовании материалов ссылка на источник обязательна.
</div>
</div>

12
views/page/points.php
View File

@ -50,18 +50,6 @@ $oldIndex = $pagesCount+1;
$header = 'Список точек пользователя <a href="/user/'.$user->id.'">"' . $user->nick . '"</a>';
}
?>
<br/><br/>
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- Point-TOP -->
<ins class="adsbygoogle"
style="display:block"
data-ad-client="ca-pub-0069680015252793"
data-ad-slot="2373587563"
data-ad-format="auto"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
<br/>
<h3><?= $header ?></h3>
<div class="pointsWall">

12
views/point.php
View File

@ -46,18 +46,6 @@ if ($pointsAirport && $usersAirport && $pointsAirport->id != $usersAirport->id){
<?php endif; ?>
</div>
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- Point-TOP -->
<ins class="adsbygoogle"
style="display:block"
data-ad-client="ca-pub-0069680015252793"
data-ad-slot="2373587563"
data-ad-format="auto"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
<br/>
<div class="mainTextBlock">
<?php
if (count($text) > 4) {

13
views/topNavigation.php
View File

@ -42,6 +42,19 @@ if (App::$user && App::$user->id) {
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Сотрудничество <span class="caret"></span></a>
<ul class="dropdown-menu">
<!-- <li><a href="/article/24">Общая информация</a></li>-->
<!-- <li><a href="/lp/">HORECA</a></li>-->
<li><a href="/lp/hotels">Отели и хостелы</a></li>
<li><a href="/lp/cafe">Рестораны и кафе</a></li>
<li><a href="/lp/excursion">Организаторы экскурсий</a></li>
<li role="separator" class="divider"></li>
<li><a href="/article/22">Контакты</a></li>
</ul>
</li>
<?php if (App::$user): ?>
<li class="dropdown">