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

HTTPS - первая попытка

This commit is contained in:
Krivchikov Dmitry 2016-02-26 17:14:45 +03:00
parent 37e790c725
commit 11f7e27a1c
15 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/Helper.php
View File

@ -124,7 +124,7 @@ class Helper
$og['description'] = mb_substr($point->description, 0, 99, 'UTF-8') . '…'; $og['description'] = mb_substr($point->description, 0, 99, 'UTF-8') . '…';
$og['site_name'] = App::$defaultTitle; $og['site_name'] = App::$defaultTitle;
$og['type'] = 'website'; $og['type'] = 'website';
$og['url'] = 'http://wikipoints.ru/?point=' . $point->id; $og['url'] = 'https://wikipoints.ru/?point=' . $point->id;
$og['image'] = $point->getImg('middle'); $og['image'] = $point->getImg('middle');
return $og; return $og;
@ -138,7 +138,7 @@ class Helper
$og['description'] = mb_substr($article->text, 0, 99, 'UTF-8') . '…'; $og['description'] = mb_substr($article->text, 0, 99, 'UTF-8') . '…';
$og['site_name'] = App::$defaultTitle; $og['site_name'] = App::$defaultTitle;
$og['type'] = 'website'; $og['type'] = 'website';
$og['url'] = 'http://wikipoints.ru/article/' . $article->id; $og['url'] = 'https://wikipoints.ru/article/' . $article->id;
$og['image'] = $article->getImg('middle'); $og['image'] = $article->getImg('middle');
return $og; return $og;

8
controllers/ArticleController.php
View File

@ -13,13 +13,13 @@ class ArticleController extends Controller
self::addScript('/js/bootstrap.min.js'); self::addScript('/js/bootstrap.min.js');
self::addScript('/js/app.js?ver=' . App::getConfig('version')); self::addScript('/js/app.js?ver=' . App::getConfig('version'));
self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); self::addScript('/js/fotorama.js');
self::addStyle('/css/style.css?ver=' . App::getConfig('version')); self::addStyle('/css/style.css?ver=' . App::getConfig('version'));
self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version')); self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version'));
self::addStyle('/css/bootstrap.min.css'); self::addStyle('/css/bootstrap.min.css');
self::addStyle('/css/bootstrap-theme.min.css'); self::addStyle('/css/bootstrap-theme.min.css');
self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); self::addStyle('/css/fotorama.css');
$article = Article::model()->getByPK($articleId); $article = Article::model()->getByPK($articleId);
@ -79,12 +79,12 @@ class ArticleController extends Controller
self::addScript('/js/app.js?ver=' . App::getConfig('version')); self::addScript('/js/app.js?ver=' . App::getConfig('version'));
self::addScript('/js/jquery.cookie.js'); self::addScript('/js/jquery.cookie.js');
self::addScript('/js/articleEdit.js?ver=' . App::getConfig('version')); self::addScript('/js/articleEdit.js?ver=' . App::getConfig('version'));
self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); self::addScript('/js/fotorama.js');
self::addStyle('/css/style.css?ver=' . App::getConfig('version')); self::addStyle('/css/style.css?ver=' . App::getConfig('version'));
self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version')); self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version'));
self::addStyle('/css/bootstrap.min.css'); self::addStyle('/css/bootstrap.min.css');
self::addStyle('/css/bootstrap-theme.min.css'); self::addStyle('/css/bootstrap-theme.min.css');
self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); self::addStyle('/css/fotorama.css');
self::addStyle('/css/articleEdit.css?ver=' . App::getConfig('version')); self::addStyle('/css/articleEdit.css?ver=' . App::getConfig('version'));
$article = Article::model()->getByPK($articleId); $article = Article::model()->getByPK($articleId);

16
controllers/IndexController.php
View File

@ -13,7 +13,7 @@ class IndexController extends Controller
self::addScript('/js/bootstrap.min.js'); self::addScript('/js/bootstrap.min.js');
self::addScript('/js/leaflet.js'); self::addScript('/js/leaflet.js');
self::addScript('http://maps.google.com/maps/api/js?v=3'); self::addScript('https://maps.google.com/maps/api/js?v=3');
self::addScript('/js/tile/Google.js'); self::addScript('/js/tile/Google.js');
self::addScript('/js/api-maps-yandex-2.0.js'); self::addScript('/js/api-maps-yandex-2.0.js');
@ -82,7 +82,7 @@ class IndexController extends Controller
$point = Point::model()->getByPK($id); $point = Point::model()->getByPK($id);
$point->name = htmlspecialchars($point->name); $point->name = htmlspecialchars($point->name);
$point->descriptionHtml = htmlspecialchars($point->description); $point->descriptionHtml = htmlspecialchars($point->description);
$point->descriptionHtml .= ' Посмотреть на карте: http://wikipoints.ru/?point=' . $id; $point->descriptionHtml .= ' Посмотреть на карте: https://wikipoints.ru/?point=' . $id;
$point->descriptionHtml .= ' #wikipoints'; $point->descriptionHtml .= ' #wikipoints';
$og = Helper::buildOG($point); $og = Helper::buildOG($point);
@ -94,8 +94,8 @@ class IndexController extends Controller
$og['description'] = 'Случайная точка на карте — это лучший способ узнать что-то новое! – wikipoints.ru'; $og['description'] = 'Случайная точка на карте — это лучший способ узнать что-то новое! – wikipoints.ru';
$og['site_name'] = App::$defaultTitle; $og['site_name'] = App::$defaultTitle;
$og['type'] = 'article'; $og['type'] = 'article';
$og['url'] = 'http://wikipoints.ru/?point=random'; $og['url'] = 'https://wikipoints.ru/?point=random';
$og['image'] = 'http://wikipoints.ru/img/logo.png'; $og['image'] = 'https://wikipoints.ru/img/logo.png';
} }
self::render('indexTemplate.php', array( self::render('indexTemplate.php', array(
@ -116,7 +116,7 @@ class IndexController extends Controller
static function actionLogin() static function actionLogin()
{ {
$source = file_get_contents('http://ulogin.ru/token.php?token=' . $_POST['token'] . '&host=' . $_SERVER['HTTP_HOST']); $source = file_get_contents('https://ulogin.ru/token.php?token=' . $_POST['token'] . '&host=' . $_SERVER['HTTP_HOST']);
$uLoginUser = json_decode($source, true); $uLoginUser = json_decode($source, true);
$uLoginUser['identity'] = md5($uLoginUser['uid'] . $uLoginUser['network'] . '=P'); $uLoginUser['identity'] = md5($uLoginUser['uid'] . $uLoginUser['network'] . '=P');
@ -149,7 +149,7 @@ class IndexController extends Controller
$xml = new SimpleXMLElement('<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"/>'); $xml = new SimpleXMLElement('<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"/>');
$url = $xml->addChild('url'); $url = $xml->addChild('url');
$url->addChild('loc', 'http://wikipoints.ru/'); $url->addChild('loc', 'https://wikipoints.ru/');
$url->addChild('lastmod', date("Y-m-d")); $url->addChild('lastmod', date("Y-m-d"));
$url->addChild('changefreq', "daily"); $url->addChild('changefreq', "daily");
$url->addChild('priority', "0.9"); $url->addChild('priority', "0.9");
@ -157,7 +157,7 @@ class IndexController extends Controller
$articles = Article::model()->getAll(array('where'=>'`author` != 0 AND (`status` = "published" OR `status` = "system") ', 'order' => 'ID DESC', 'asArray' => true)); $articles = Article::model()->getAll(array('where'=>'`author` != 0 AND (`status` = "published" OR `status` = "system") ', 'order' => 'ID DESC', 'asArray' => true));
foreach ($articles as $article) { foreach ($articles as $article) {
$url = $xml->addChild('url'); $url = $xml->addChild('url');
$url->addChild('loc', 'http://wikipoints.ru/article/' . $article['id']); $url->addChild('loc', 'https://wikipoints.ru/article/' . $article['id']);
$url->addChild('lastmod', date("Y-m-d", strtotime('- 5 days'))); $url->addChild('lastmod', date("Y-m-d", strtotime('- 5 days')));
$url->addChild('changefreq', "weekly"); $url->addChild('changefreq', "weekly");
$url->addChild('priority', "0.8"); $url->addChild('priority', "0.8");
@ -166,7 +166,7 @@ class IndexController extends Controller
$points = Point::model()->getAll(array('order' => 'ID DESC', 'asArray' => true)); $points = Point::model()->getAll(array('order' => 'ID DESC', 'asArray' => true));
foreach ($points as $point) { foreach ($points as $point) {
$url = $xml->addChild('url'); $url = $xml->addChild('url');
$url->addChild('loc', 'http://wikipoints.ru/point/' . $point['id']); $url->addChild('loc', 'https://wikipoints.ru/point/' . $point['id']);
$url->addChild('lastmod', date("Y-m-d", $point['dateEdit'])); $url->addChild('lastmod', date("Y-m-d", $point['dateEdit']));
$url->addChild('changefreq', "weekly"); $url->addChild('changefreq', "weekly");
$url->addChild('priority', "0.8"); $url->addChild('priority', "0.8");

4
controllers/PointController.php
View File

@ -26,13 +26,13 @@ class PointController extends Controller
self::addScript('/js/app.js?ver=' . App::getConfig('version')); self::addScript('/js/app.js?ver=' . App::getConfig('version'));
self::addScript('/js/mapPoint.js?ver=' . App::getConfig('version')); self::addScript('/js/mapPoint.js?ver=' . App::getConfig('version'));
self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); self::addScript('/js/fotorama.js');
self::addStyle('/css/style.css?ver=' . App::getConfig('version')); self::addStyle('/css/style.css?ver=' . App::getConfig('version'));
self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version')); self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version'));
self::addStyle('/css/bootstrap.min.css'); self::addStyle('/css/bootstrap.min.css');
self::addStyle('/css/bootstrap-theme.min.css'); self::addStyle('/css/bootstrap-theme.min.css');
self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); self::addStyle('/css/fotorama.css');
self::addStyle('/css/leaflet.css'); self::addStyle('/css/leaflet.css');
self::addStyle('/css/MarkerCluster.css'); self::addStyle('/css/MarkerCluster.css');
self::addStyle('/css/MarkerCluster.Default.css'); self::addStyle('/css/MarkerCluster.Default.css');

4
controllers/UserController.php
View File

@ -8,14 +8,14 @@ class UserController extends Controller
self::addScript('/js/jquery-2.1.0.min.js'); self::addScript('/js/jquery-2.1.0.min.js');
self::addScript('/js/jquery-ui-1.10.4.custom.min.js'); self::addScript('/js/jquery-ui-1.10.4.custom.min.js');
self::addScript('/js/bootstrap.min.js'); self::addScript('/js/bootstrap.min.js');
self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js'); self::addScript('/js/fotorama.js');
self::addScript('/js/app.js?ver=' . App::getConfig('version')); self::addScript('/js/app.js?ver=' . App::getConfig('version'));
self::addStyle('/css/style.css?ver=' . App::getConfig('version')); self::addStyle('/css/style.css?ver=' . App::getConfig('version'));
self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version')); self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version'));
self::addStyle('/css/bootstrap.min.css'); self::addStyle('/css/bootstrap.min.css');
self::addStyle('/css/bootstrap-theme.min.css'); self::addStyle('/css/bootstrap-theme.min.css');
self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); self::addStyle('/css/fotorama.css');
} }
function actionIndex() function actionIndex()

4
public/js/map.js
View File

@ -60,8 +60,8 @@ function init(lat, lng) {
// layers['quest'] = L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com" target="_blank">Mapbox</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 18}); // layers['quest'] = L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com" target="_blank">Mapbox</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 18});
// layers['quest'] = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 18}); // layers['quest'] = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 18});
layers['osm'] = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 18}); layers['osm'] = L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 18});
layers['topo'] = L.tileLayer('http://topo.wikipoints.ru/?z={z}&x={x}&y={y}', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a>, Imagery © <a href="http://www.marshruty.ru/" target="_blank">Маршруты.ру</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 15}); layers['topo'] = L.tileLayer('//topo.wikipoints.ru/?z={z}&x={x}&y={y}', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a>, Imagery © <a href="http://www.marshruty.ru/" target="_blank">Маршруты.ру</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 15});
layers['google'] = new L.Google('HYBRID'); layers['google'] = new L.Google('HYBRID');
layers['yandexMap'] = new L.Yandex(); layers['yandexMap'] = new L.Yandex();
layers['yandex'] = new L.Yandex('hybrid'); layers['yandex'] = new L.Yandex('hybrid');

2
public/js/mapPoint.js
View File

@ -46,7 +46,7 @@ function init(lat, lng) {
markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 45}); markers = new L.MarkerClusterGroup({showCoverageOnHover: false, maxClusterRadius: 45});
// layers['quest'] = L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a> | <nobr>Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a></nobr>', maxZoom: 18}); // layers['quest'] = L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a> | <nobr>Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a></nobr>', maxZoom: 18});
layers['osm'] = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 18}); layers['osm'] = L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: 'Map data &copy; <a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a> | Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', maxZoom: 18});
setLayer('osm'); setLayer('osm');

2
public/js/tile/Google.js
View File

@ -13,7 +13,7 @@ L.Google = L.Class.extend({
tileSize: 256, tileSize: 256,
subdomains: 'abc', subdomains: 'abc',
errorTileUrl: '', errorTileUrl: '',
attribution: 'Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', attribution: 'Points data &copy; <a href="https://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>',
opacity: 1, opacity: 1,
continuousWorld: false, continuousWorld: false,
noWrap: false, noWrap: false,

2
public/js/tile/Yandex.js
View File

@ -11,7 +11,7 @@ L.Yandex = L.Class.extend({
options: { options: {
minZoom: 0, minZoom: 0,
maxZoom: 18, maxZoom: 18,
attribution: 'Points data &copy; <a href="http://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>', attribution: 'Points data &copy; <a href="https://wikipoints.ru" target="_blank">WIKIPOINTS.RU</a>',
opacity: 1, opacity: 1,
traffic: false traffic: false
}, },

2
views/indexTemplate.php
View File

@ -52,7 +52,7 @@ if (App::$user) {
<a href="/?point=random" onclick="showRandomPoint(); <a href="/?point=random" onclick="showRandomPoint();
return false;">Случайная точка</a> return false;">Случайная точка</a>
<br/><br/><br/> <br/><br/><br/>
<a href="http://vk.com/wikipoints" target="_blank"><img src="/img/vk-flat.png" width="24" height="24"/> Группа ВКонтакте</a> <a href="https://vk.com/wikipoints" target="_blank"><img src="/img/vk-flat.png" width="24" height="24"/> Группа ВКонтакте</a>
<br/><br/> <br/><br/>
<a href="https://instagram.com/wikipoints/" target="_blank"><img src="/img/instagram-flat.png" width="24" height="24"/> Instagram</a> <a href="https://instagram.com/wikipoints/" target="_blank"><img src="/img/instagram-flat.png" width="24" height="24"/> Instagram</a>
<br/><br/><br/> <br/><br/><br/>

6
views/modals/articleInfo.php
View File

@ -54,11 +54,11 @@
</tr> </tr>
<tr> <tr>
<td>[img|#19]</td> <td>[img|#19]</td>
<td><img src="http://wikipoints.ru/photos/articles/small/1_bdd27.jpg" title="" class="imageInArticle"><br/>(это картинка №19)</td> <td><img src="https://wikipoints.ru/photos/articles/small/1_bdd27.jpg" title="" class="imageInArticle"><br/>(это картинка №19)</td>
</tr> </tr>
<tr> <tr>
<td>http://wikipoints.ru</td> <td>https://wikipoints.ru</td>
<td><a href="http://wikipoints.ru" target="_blank">http://wikipoints.ru</a></td> <td><a href="https://wikipoints.ru" target="_blank">https://wikipoints.ru</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

2
views/page/instaPoint.php
View File

@ -6,7 +6,7 @@
<br> <br>
📍 <?= $point->description ?><br/> 📍 <?= $point->description ?><br/>
<br/> <br/>
Продолжить чтение и посмотреть на карте: http://wikipoints.ru/point/<?= $point->id ?><br/> Продолжить чтение и посмотреть на карте: https://wikipoints.ru/point/<?= $point->id ?><br/>
<br/> <br/>
#wikipoints #точки_wikipoints <?= Helper::getRandomTravelingTags(15)?> #wikipoints #точки_wikipoints <?= Helper::getRandomTravelingTags(15)?>
<br/> <br/>

4
views/page/vkPoint.php
View File

@ -1,12 +1,12 @@
<?php <?php
foreach ($photos as $photo) { foreach ($photos as $photo) {
print 'http://wikipoints.ru/photos/big/' . $photo->name . '</br>'; print 'https://wikipoints.ru/photos/big/' . $photo->name . '</br>';
} }
?> ?>
<?= $point->name ?> (, )<br/> <?= $point->name ?> (, )<br/>
<br> <br>
<?= $point->description ?><br/> <?= $point->description ?><br/>
<br/> <br/>
Продолжить чтение и посмотреть на карте: http://wikipoints.ru/point/<?= $point->id ?>?utm_source=vkDaly<br/> Продолжить чтение и посмотреть на карте: https://wikipoints.ru/point/<?= $point->id ?>?utm_source=vkDaly<br/>
<br/> <br/>
#wikipoints # # # # # <?= Helper::getRandomTravelingTags(15)?> #wikipoints # # # # # <?= Helper::getRandomTravelingTags(15)?>

2
views/rightNavigation.php
View File

@ -31,7 +31,7 @@ if (App::$user && App::$user->id) {
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<li><a href="/?point=random">Случайная точка</a></li> <li><a href="/?point=random">Случайная точка</a></li>
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<li><a href="http://vk.com/wikipoints" target="_blank">Группа в VK</a></li> <li><a href="https://vk.com/wikipoints" target="_blank">Группа в VK</a></li>
<li><a href="https://instagram.com/wikipoints/" target="_blank">Мы в Instargam</a></li> <li><a href="https://instagram.com/wikipoints/" target="_blank">Мы в Instargam</a></li>
</ul> </ul>
</li> </li>

2
views/route.php
View File

@ -8,7 +8,7 @@ foreach ($points as $point) {
<?= $point->description ?> <?= $point->description ?>
<div class="coords-container"> <div class="coords-container">
http://wikipoints.ru/?point=<?= $point->id ?> https://wikipoints.ru/?point=<?= $point->id ?>
&nbsp;&nbsp;/&nbsp;&nbsp; &nbsp;&nbsp;/&nbsp;&nbsp;
<nobr> <nobr>
<?= $point->lat > 0 ? 'N' : 'S' ?><?= number_format(abs($point->lat), 5, '.', '') ?>° <?= $point->lat > 0 ? 'N' : 'S' ?><?= number_format(abs($point->lat), 5, '.', '') ?>°