From 8345e5029e517c3411eb5b69e399272d38f607db Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Fri, 8 Apr 2016 14:53:01 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D0=B5=D1=84=D0=B5=D0=B9?=
 =?UTF-8?q?=D1=81=D0=B0=20-=20=D0=B2=D0=B5=D1=80=D1=85=D0=BD=D0=B5=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D0=BC=D0=B5=D0=BD=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/style.css    |  6 +++++-
 views/indexTemplate.php |  2 +-
 views/topNavigation.php | 22 ++++++++++++++++++++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/public/css/style.css b/public/css/style.css
index c41fa92..f08e49a 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -73,7 +73,8 @@ body.openBox div#control {right: 250px;}
 div#control div {background-color: rgba(10, 10, 10, 0.8); border-radius: 8px 0 0 8px; width: auto; padding: 10px; margin-left: 10px; margin-bottom: 8px; cursor: pointer;}
 div#control div:before {cursor: pointer;}
 div#control div:hover {background-color: #000;}
-div#control div.active {background-color: rgb(255, 162, 0);}
+div#control div.active {background-color: rgb(255, 162, 0)!important;}
+div#control div.important {background-color: rgba(0, 145, 90, 0.8);}
 div#control div.big {font-size: 22px; padding: 14px; margin-left: 0;}
 div#control div._t {border-radius: 8px 0 0 0;border-bottom: solid 1px #666; margin-bottom: 0;}
 div#control div._c {border-radius: 0; border-bottom: solid 1px #666; margin-bottom: 0;}
@@ -84,6 +85,9 @@ div#control div#notify {position: absolute; background-color: red;color: white;b
 
 nav.navbar.navbar-inverse.navbar-fixed-top {opacity: 0.9}
 nav.navbar.navbar-inverse .navbar-nav>li>a {color: #ddd;}
+nav.navbar.navbar-inverse .navbar-nav>li.important {background-color: #3c3c3c;}
+
+span.notifications {font-weight: bolder; color: red;}
 
 /*BOX*/
 body.openBox div#box {display: block; z-index: 100; overflow-y: scroll;overflow-x: hidden;}
diff --git a/views/indexTemplate.php b/views/indexTemplate.php
index c01464b..9ae125c 100644
--- a/views/indexTemplate.php
+++ b/views/indexTemplate.php
@@ -15,7 +15,7 @@ if (App::$user) {
 	<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 ($user): ?>
+	<?php if (App::$user): ?>
 		<div class="glyphicon _t" id="addPointButton" title="Добавить точку" onclick="<?= $addWithoutConfirm ? 'activateAddPoint()' : 'showPointagreement()'; ?>"><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 _b glyphicon-cloud-download boxButtonRoutes" onclick="openBox('Routes')" title="Мои маршруты"></div>
diff --git a/views/topNavigation.php b/views/topNavigation.php
index af6b512..8d51b96 100644
--- a/views/topNavigation.php
+++ b/views/topNavigation.php
@@ -45,7 +45,7 @@ if (App::$user && App::$user->id) {
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
 							<?= App::$user->nick ?>
 							<?php if (Notifications::getUnreadedCount()): ?>
-								<span style="font-weight: bolder; color: red;">
+								<span class="notifications">
 									[<?= Notifications::getUnreadedCount(); ?>]
 								</span>
 							<?php endif; ?>
@@ -58,7 +58,11 @@ if (App::$user && App::$user->id) {
 							<li><a href="/user/favorites/">Избранное</a></li>
 							<li>
 								<a href="/user/notifications/">Уведомления
-									<?php if (Notifications::getUnreadedCount()): ?><span style="font-weight: bolder; color: red;">[<?= Notifications::getUnreadedCount(); ?>]</span><?php endif; ?>
+									<?php if (Notifications::getUnreadedCount()): ?>
+										<span class="notifications">
+										[<?= Notifications::getUnreadedCount(); ?>]
+										</span>
+									<?php endif; ?>
 								</a>
 							</li>
 							<li role="separator" class="divider"></li>
@@ -68,6 +72,20 @@ if (App::$user && App::$user->id) {
 				<?php else: ?>
 					<li><a href="#" onclick="$('#loginModal').modal('show');"><span class="glyphicon glyphicon-user"></span> Вход</a></li>
 				<?php endif; ?>
+
+				<?php if(App::ic('index')): ?>
+					<?php if (App::$user):
+						$addWithoutConfirm = Point::model()->getCountByUser(App::$user->id) > 0;
+						$addWithoutConfirm = false;
+						?>
+						<li class="important">
+							<a href="#" onclick="<?= $addWithoutConfirm ? 'activateAddPoint()' : 'showPointagreement()'; ?>">Добавить объект</a>
+						</li>
+					<?php else: ?>
+						<li class="important"><a href="#" onclick="$('#loginModal').modal('show');">Добавить объект</a></li>
+					<?php endif; ?>
+				<?php endif; ?>
+
 			</ul>
 		</div><!--/.nav-collapse -->
 	</div>