From 822b7c035ff625206ce6794d3bf470aaf1c94327 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Sat, 31 Oct 2015 23:16:35 +0300
Subject: [PATCH] =?UTF-8?q?ADD=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BE=D0=B5=20?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B4=D0=BB=D1=8F=20=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B8=D1=86=20=D1=81=20=D1=82=D0=BE=D1=87?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=BC=D0=B8=20=D0=B8=20=D1=81=D1=82=D0=B0=D1=82?=
 =?UTF-8?q?=D1=8C=D1=8F=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ground/controllers/FeedController.php  |  1 +
 ground/controllers/IndexController.php | 11 ++++-------
 ground/views/indexTemplate.php         |  3 ++-
 ground/views/layouts/page.php          |  2 +-
 public/css/style.css                   |  2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ground/controllers/FeedController.php b/ground/controllers/FeedController.php
index 0aa11f3..7c4137f 100644
--- a/ground/controllers/FeedController.php
+++ b/ground/controllers/FeedController.php
@@ -59,6 +59,7 @@ class FeedController extends Controller
 		self::addScript('/js/jquery-ui-1.10.4.custom.min.js');
 		self::addScript('/js/bootstrap.min.js');
 		self::addScript('/js/jquery.cookie.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'));
 		self::addStyle('/css/feed.css?ver=' . App::getConfig('version'));
diff --git a/ground/controllers/IndexController.php b/ground/controllers/IndexController.php
index 8bc516e..268a895 100644
--- a/ground/controllers/IndexController.php
+++ b/ground/controllers/IndexController.php
@@ -44,16 +44,13 @@ class IndexController extends Controller
 		$category = Category::model()->getAll(array('order' => 'ord ASC'));
 
 		$routes = array();
-		if (App::$user && App::$user->id) {
-			$routes = Route::model()->getByAuthor(App::$user->id);
-			self::addVar('user', App::$user->id);
-		} else {
-			self::addVar('user', '0');
-		}
-
 		$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();
+		} else {
+			self::addVar('user', '0');
 		}
 
 		App::setConfig('title', App::$defaultTitle);
diff --git a/ground/views/indexTemplate.php b/ground/views/indexTemplate.php
index a827042..238cdc5 100644
--- a/ground/views/indexTemplate.php
+++ b/ground/views/indexTemplate.php
@@ -6,7 +6,8 @@ if (App::$user) {
 ?>
 <div id="map"></div>
 <div id="control">
-	<div class="glyphicon glyphicon-info-sign boxButtonInfo" title="Информация" onclick="openBox('Info')"></div>
+	<div class="glyphicon _t glyphicon-info-sign boxButtonInfo" title="Информация" onclick="openBox('Info')"></div>
+	<div class="glyphicon _b glyphicon-font boxButtonInfo" title="Лента статей" onclick="location.href='/feed/'"></div>
 
 	<div class="glyphicon glyphicon-plus big _t" title="Приблизить" onclick="myMap.zoomIn()"></div>
 	<div class="glyphicon glyphicon-minus big _b" title="Отдалить" onclick="myMap.zoomOut()"></div>
diff --git a/ground/views/layouts/page.php b/ground/views/layouts/page.php
index d3aadd4..c89a9a5 100644
--- a/ground/views/layouts/page.php
+++ b/ground/views/layouts/page.php
@@ -48,7 +48,7 @@
 		<div class="header">
 			<a href="/"><img src="/img/logo.png" title="Карта wikipoints" /></a>
 		</div>
-
+		<?= self::renderPartial('rightNavigation.php', array(), true) ?>
 		<?= isset($content) && !empty($content) ? $content : 'No content =(' ?>
 		<?= self::renderPartial('metrika.php', array(), true) ?>
 		<?= self::renderPartial('ganalytics.php', array(), true) ?>
diff --git a/public/css/style.css b/public/css/style.css
index 45aedac..5e0cf7a 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -79,7 +79,7 @@ div#control div.space {height: 10px; background-color: transparent; padding: 0;}
 div#control div._t2 {background-color: rgba(200, 200, 200, 0.65); border-radius: 8px 0 0 0;border-bottom: solid 1px #ddd; margin-bottom: 0;}
 
 /*BOX*/
-body.openBox div#box {display: block;}
+body.openBox div#box {display: block; z-index: 100;}
 div#box {width: 250px; display: none; position: absolute; top: 0; right: 0;bottom: 0px; border-left: 2px solid rgba(45, 45, 45, 0.8); padding: 0 7px;}
 div#box #boxClose {position: absolute; right: 7px; top: 7px; color: #999; font-size: 18px; font-weight: bolder; cursor: pointer;}
 div#box div {display: none;}