From 923c3457cb353e69454446e4cbd4fca602bf9a4a Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Sat, 31 Oct 2015 23:25:34 +0300
Subject: [PATCH] FIX

---
 ground/controllers/FeedController.php  |  4 ++++
 ground/controllers/PageController.php  |  4 ++++
 ground/controllers/PointController.php |  1 +
 ground/controllers/UserController.php  |  5 +++++
 ground/views/rightNavigation.php       | 19 ++-----------------
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/ground/controllers/FeedController.php b/ground/controllers/FeedController.php
index 7c4137f..90e4212 100644
--- a/ground/controllers/FeedController.php
+++ b/ground/controllers/FeedController.php
@@ -66,6 +66,10 @@ class FeedController extends Controller
 		self::addStyle('/css/bootstrap.min.css');
 		self::addStyle('/css/bootstrap-theme.min.css');
 
+		if (!App::$user) {
+			self::addScript('//ulogin.ru/js/ulogin.js');
+		}
+
 		self::render('feed/index.php', array(
 			'news' => $news,
 			'articles' => $articles,
diff --git a/ground/controllers/PageController.php b/ground/controllers/PageController.php
index f3fe032..482b60e 100644
--- a/ground/controllers/PageController.php
+++ b/ground/controllers/PageController.php
@@ -15,6 +15,10 @@ class PageController extends Controller
 		self::addStyle('/css/bootstrap.min.css');
 		self::addStyle('/css/bootstrap-theme.min.css');
 
+		if (!App::$user) {
+			self::addScript('//ulogin.ru/js/ulogin.js');
+		}
+
 		$notModeratedPoints = $result = array();
 
 		// On moderation
diff --git a/ground/controllers/PointController.php b/ground/controllers/PointController.php
index 44aaee3..93c6a6a 100644
--- a/ground/controllers/PointController.php
+++ b/ground/controllers/PointController.php
@@ -32,6 +32,7 @@ class PointController extends Controller
 				self::addVar('user', App::$user->id);
 			} else {
 				self::addVar('user', '0');
+				self::addScript('//ulogin.ru/js/ulogin.js');
 			}
 
 			$point = Point::model()->getByPK($pointId);
diff --git a/ground/controllers/UserController.php b/ground/controllers/UserController.php
index b237691..85e3d24 100644
--- a/ground/controllers/UserController.php
+++ b/ground/controllers/UserController.php
@@ -25,6 +25,7 @@ class UserController extends Controller
 		self::addScript('/js/bootstrap.min.js');
 		self::addScript('/js/leaflet-0.7.3.js');
 		self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js');
+		self::addScript('/js/app.js?ver=' . App::getConfig('version'));
 
 		self::addStyle('/css/style.css?ver=' . App::getConfig('version'));
 		self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version'));
@@ -33,6 +34,10 @@ class UserController extends Controller
 		self::addStyle('/css/bootstrap-theme.min.css');
 		self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css');
 
+		if (!App::$user) {
+			self::addScript('//ulogin.ru/js/ulogin.js');
+		}
+
 		if (App::$user && App::$user->id == $id) {
 			$articles = Article::model()->getAll(array('where'=>'`author`='.(int)$user->id.' AND `status` != "del"', 'order' => '`pubDate` DESC'));
 		} else {
diff --git a/ground/views/rightNavigation.php b/ground/views/rightNavigation.php
index 2f37933..e0c3143 100644
--- a/ground/views/rightNavigation.php
+++ b/ground/views/rightNavigation.php
@@ -4,7 +4,6 @@ $routes = array();
 $favorites = array();
 if (App::$user && App::$user->id) {
 	self::addVar('user', App::$user->id);
-	$routes = Route::model()->getByAuthor(App::$user->id);
 	$favorites = Favorite::model()->getAllMy();
 }
 
@@ -16,7 +15,6 @@ if (App::$user && App::$user->id) {
 	<?php if (App::$user): ?>
 		<div class="glyphicon _t" id="addPointButton" title="Добавить точку" onclick="location.href='/'"><img src="/img/buttons/addPoint.png" style="margin-top: -10px; height: 30px;" /></div>
 		<div class="glyphicon glyphicon-star _c boxButtonFavorites" onclick="openBox('Favorites')" title="Хочу посетить"></div>
-		<div class="glyphicon glyphicon-cloud-download _c boxButtonRoutes" onclick="openBox('Routes')" title="Мои маршруты"></div>
 		<div class="glyphicon glyphicon-user _b boxButtonUser" onclick="location.href='/user/'" title="Профиль"></div>
 	<?php else: ?>
 		<div class="glyphicon _t" id="addPointButton" onclick="location.href='/'" title="Добавить точку"><img src="/img/buttons/addPoint.png" style="margin-top: -10px; height: 30px;" /></div>
@@ -48,26 +46,13 @@ if (App::$user && App::$user->id) {
 			<div id="favorites">
 				<?php if ($favorites): ?>
 					<?php foreach ($favorites as $favorite) : ?>
-						<a onclick="showInfo(<?= $favorite->pointId ?>)" class="btn btn-link"><?= $favorite->point->name ?></a><br/>
+						<a href="/point/<?= $favorite->pointId ?>" class="btn btn-link"><?= $favorite->point->name ?></a><br/>
 					<?php endforeach; ?>
 				<?php else: ?>
 					Ваши закладки пока пусты.
 				<?php endif; ?>
 			</div>
 		</div>
-		<div id="boxRoutes">
-			<h3>Мои маршруты</h3>
-			<div id="routes">
-				<?php if ($routes): ?>
-					<?php foreach ($routes as $route) : ?>
-						<div class="route" onclick="loadRoute(<?= $route->id ?>)"><span onclick="deleteRoute(<?= $route->id ?>);
-								$(this).parent().remove();
-								event.stopPropagation();">&times;</span> <?= $route->name ?></div>
-						<?php endforeach; ?>
-					<?php else: ?>
-					У вас пока нет сохраненных маршрутов.
-				<?php endif; ?>
-			</div>
-		</div>
 	<?php endif; ?>
 </div>
+<?= $user ? '' : self::renderPartial('modals/login.php', null, true) ?>