From 40e9f7b75928728a00eb9ce63eb470f9f4ea0f85 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Mon, 23 Nov 2015 00:00:21 +0300
Subject: [PATCH] =?UTF-8?q?FIX=20-=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B0?=
 =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D1=80=D1=86=D0=B8=D1=8F=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BE=D0=BA=20=D0=BF=D0=BE=20=D0=B2=D1=91=D1=80?=
 =?UTF-8?q?=D1=81=D1=82=D0=BA=D0=B5.=20=D0=9F=D1=80=D1=8F=D1=87=D1=83=20?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B5=20=D0=BA?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20=D0=B8=D0=B7=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BE=D0=B9=20=D0=BD=D0=B0=D0=B2=D0=B8=D0=B3=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D0=B8=20=D0=BD=D0=B0=20=D0=BC=D0=B5=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8C=D0=BA=D0=B8=D1=85=20=D1=80=D0=B0=D0=B7=D1=80=D0=B5=D1=88?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=D1=85,=20=D0=BF=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BA=D0=BD=D0=BE=D0=BF?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=BC=D0=B5=D1=81=D1=82=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ground/controllers/IndexController.php |  1 +
 ground/controllers/PageController.php  |  1 +
 ground/views/indexTemplate.php         | 35 ++++++++++++++------------
 ground/views/rightNavigation.php       | 20 +++++++++------
 public/css/indexMap.css                | 27 ++++++++++++++++++++
 public/css/style.css                   | 23 +++--------------
 6 files changed, 63 insertions(+), 44 deletions(-)
 create mode 100644 public/css/indexMap.css

diff --git a/ground/controllers/IndexController.php b/ground/controllers/IndexController.php
index 268a895..fb8b38b 100644
--- a/ground/controllers/IndexController.php
+++ b/ground/controllers/IndexController.php
@@ -37,6 +37,7 @@ class IndexController extends Controller
 		self::addStyle('/css/MarkerCluster.css');
 		self::addStyle('/css/MarkerCluster.Default.css');
 		self::addStyle('/css/fotorama.css');
+		self::addStyle('/css/indexMap.css');
 
 		if (!App::$user)
 			self::addScript('//ulogin.ru/js/ulogin.js');
diff --git a/ground/controllers/PageController.php b/ground/controllers/PageController.php
index 482b60e..71e85e6 100644
--- a/ground/controllers/PageController.php
+++ b/ground/controllers/PageController.php
@@ -12,6 +12,7 @@ class PageController extends Controller
 		self::addScript('/js/jquery-2.1.0.min.js');
 		self::addScript('/js/jquery-ui-1.10.4.custom.min.js');
 		self::addScript('/js/bootstrap.min.js');
+		self::addScript('/js/app.js');
 		self::addStyle('/css/bootstrap.min.css');
 		self::addStyle('/css/bootstrap-theme.min.css');
 
diff --git a/ground/views/indexTemplate.php b/ground/views/indexTemplate.php
index 09580f8..96b7609 100644
--- a/ground/views/indexTemplate.php
+++ b/ground/views/indexTemplate.php
@@ -7,32 +7,35 @@ if (App::$user) {
 <div id="map"></div>
 <div id="control">
 	<div class="glyphicon _t glyphicon-info-sign boxButtonInfo" title="Информация" onclick="openBox('Info')"></div>
-	<div class="glyphicon _b glyphicon-font boxButtonArticles" 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>
-
-	<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 _b" id="showMeOnTheMap" title="Я на карте" onclick="showMeOnTheMap(false)"><img src="/img/buttons/myPosition.png" style="margin-top: -20px; height: 21px;" /></div>
-	<div class="glyphicon boxButtonRoute" title="Маршрут" onclick="openBox('Route')"><img src="/img/buttons/route.png" style="margin-top: -10px; margin-left: -5px; width: 30px;" /></div>
-
-
+	<div class="glyphicon _c glyphicon-font boxButtonArticles onlyBigScreen" title="Лента статей" onclick="location.href='/feed/'"></div>
 	<?php if ($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 glyphicon-cloud-download _c boxButtonRoutes" onclick="openBox('Routes')" title="Мои маршруты"></div>
 		<div class="glyphicon glyphicon-user _b boxButtonUser" onclick="location.href='/user/'" title="Профиль">
 			<?php if(Notifications::getUnreadedCount()): ?>
 				<div id="notify"><?= Notifications::getUnreadedCount(); ?></div>
 			<?php endif; ?>
 		</div>
 	<?php else: ?>
-		<div class="glyphicon _t" id="addPointButton" onclick="$('#loginModal').modal('show');" title="Добавить точку"><img src="/img/buttons/addPoint.png" style="margin-top: -10px; height: 30px;" /></div>
 		<div class="glyphicon glyphicon-user _b" id="loginButton" onclick="$('#loginModal').modal('show');" title="Войти для добавления точки"></div>
 	<?php endif; ?>
 
-	<a href="https://vk.com/wikipoints" target="_blank"><img src="/img/vkBigLogo.png?2" usemap="#vkbutton" style="margin-left: 285px; margin-top: 0px; position: absolute; display: none;" id="vkBigLogo" /><div class="glyphicon" style="line-height: 0;" title="WikiPoints вКонтакте"><img src="/img/b.png?v=2" style="margin-left: -5px; margin-top: 0px; height: 20px;" /></div></a>
+	<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-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(false)"><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 ($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 _c boxButtonRoutes" onclick="openBox('Routes')" title="Мои маршруты"></div>
+	<?php else: ?>
+		<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; ?>
+
+	<a href="https://vk.com/wikipoints" target="_blank" class="onlyBigScreen"><img src="/img/vkBigLogo.png?2" usemap="#vkbutton" style="margin-left: 285px; margin-top: 0px; position: absolute; display: none;" id="vkBigLogo" /><div class="glyphicon" style="line-height: 0;" title="WikiPoints вКонтакте"><img src="/img/b.png?v=2" style="margin-left: -5px; margin-top: 0px; height: 20px;" /></div></a>
 </div>
 <div id="box">
 	<span id="boxClose" onclick="closeBox();">&times;</span>
diff --git a/ground/views/rightNavigation.php b/ground/views/rightNavigation.php
index 3102786..dfc13c2 100644
--- a/ground/views/rightNavigation.php
+++ b/ground/views/rightNavigation.php
@@ -8,17 +8,21 @@ if (App::$user && App::$user->id) {
 }
 
 ?>
-<div id="control">
+<div id="control" class="onlyBigScreen">
 	<div class="glyphicon _t glyphicon-info-sign boxButtonInfo" title="Информация" onclick="openBox('Info')"></div>
-	<div class="glyphicon _b glyphicon-font" title="Лента статей" onclick="location.href='/feed/'"></div>
+	<div class="glyphicon _c glyphicon-font" title="Лента статей" onclick="location.href='/feed/'"></div>
+	<?php if ($user): ?>
+		<div class="glyphicon glyphicon-user _b boxButtonUser" onclick="location.href='/user/'" title="Профиль">
+			<?php if(Notifications::getUnreadedCount()): ?>
+				<div id="notify"><?= Notifications::getUnreadedCount(); ?></div>
+			<?php endif; ?>
+		</div>
+	<?php else: ?>
+		<div class="glyphicon glyphicon-user _b" id="loginButton" onclick="$('#loginModal').modal('show');" title="Войти для добавления точки"></div>
+	<?php endif; ?>
 
 	<?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-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>
-		<div class="glyphicon glyphicon-user _b" id="loginButton" onclick="$('#loginModal').modal('show');" title="Войти для добавления точки"></div>
+		<div class="glyphicon glyphicon-star boxButtonFavorites" onclick="openBox('Favorites')" title="Хочу посетить"></div>
 	<?php endif; ?>
 
 	<a href="https://vk.com/wikipoints" target="_blank"><img src="/img/vkBigLogo.png?2" usemap="#vkbutton" style="margin-left: 285px; margin-top: 0px; position: absolute; display: none;" id="vkBigLogo" /><div class="glyphicon" style="line-height: 0;" title="WikiPoints вКонтакте"><img src="/img/b.png?v=2" style="margin-left: -5px; margin-top: 0px; height: 20px;" /></div></a>
diff --git a/public/css/indexMap.css b/public/css/indexMap.css
new file mode 100644
index 0000000..3d8f4f2
--- /dev/null
+++ b/public/css/indexMap.css
@@ -0,0 +1,27 @@
+@media screen and (max-width:815px) {
+	.onlyBigScreen {
+		display: none;
+	}
+
+    div.header{
+        padding: 5px 7px;
+        left: 20px;
+    }
+
+    div.header a img {
+        margin-bottom: 5px;
+    }
+}
+
+@media screen and (max-width:500px) {
+	div.header{
+		padding: 2px 5px;
+		left: 10px;
+	}
+
+	div.header a img {
+		width: 70px;
+		height: 42px;
+		margin-bottom: 2px;
+	}
+}
diff --git a/public/css/style.css b/public/css/style.css
index 6b07214..f177bc0 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -142,6 +142,8 @@ img.imageInArticle {border: solid 3px white;}
 }
 
 @media screen and (max-width:815px) {
+	.onlyBigScreen {display: none;}
+
     body {
         padding: 0!important;
     }
@@ -154,28 +156,9 @@ img.imageInArticle {border: solid 3px white;}
         padding: 50px 5px;
     }
 
-    div.header{
-        padding: 5px 7px;
-        left: 20px;
-    }
-
     div.header a img {
         width: 115px;
         height: 69px;
-        margin-bottom: 5px;
+        margin-bottom: 10px;
     }
 }
-
-@media screen and (max-width:500px) {
-	div.header{
-		padding: 2px 5px;
-		left: 10px;
-	}
-
-	div.header a img {
-		width: 70px;
-		height: 42px;
-		margin-bottom: 2px;
-	}
-}
-