From c378657c43d9c08832ca173464ac8b0d3faef466 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <krivchikovda@gmail.com>
Date: Sun, 14 Dec 2014 15:36:22 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BA=D0=B0=D0=B7=20=D0=BA=D0=B0?=
 =?UTF-8?q?=D1=80=D1=82=D0=BE=D1=87=D0=B5=D0=BA=20=D1=82=D0=BE=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BA=20=D0=BF=D1=80=D0=B8=20=D0=BA=D0=BB=D0=B8=D0=BA=D0=B5=20?=
 =?UTF-8?q?=D0=B2=20=D0=BC=D0=B0=D1=80=D1=88=D1=80=D1=83=D1=82=D0=B5.=20FI?=
 =?UTF-8?q?X=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=B2=D1=82=D0=BE=D1=80=D0=BD=D0=BE=D0=BC=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B8=20=D1=82=D0=BE?=
 =?UTF-8?q?=D1=87=D0=BA=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/style.css | 2 +-
 public/js/map.js     | 7 +------
 public/js/route.js   | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/public/css/style.css b/public/css/style.css
index 68bf02e..747c861 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -44,7 +44,7 @@ div.leaflet-popup-content button:hover span.label {display: inline;}
 
 #wayPoints {margin-bottom: 10px;}
 #wayPoints .wayPoint {cursor: pointer; border: solid 1px #999; padding: 2px 5px; margin-bottom: 3px; background-color: #fff;}
-#wayPoints .wayPoint span {font-weight: bold; color: red;}
+#wayPoints .wayPoint span.del {font-weight: bold; color: red;}
 
 #routes {margin-bottom: 10px; height: 200px;}
 #routes .route {cursor: pointer; border: solid 1px #999; padding: 2px 5px; margin-bottom: 3px;}
diff --git a/public/js/map.js b/public/js/map.js
index 44862fd..9d83920 100644
--- a/public/js/map.js
+++ b/public/js/map.js
@@ -203,14 +203,8 @@ function showInfo(id)
 				description += data.descriptionHtml;
 				description += '</div><div class="clear"></div>';
 				description += '<div class="btn-group control">';
-
-//				if (data.source.length > 11)
-//				{
-//					description += '<a type="button" class="btn btn-default" href="' + data.source + '" target="blank"><span class="glyphicon glyphicon-eye-open"></span> <span class="label">Подробнее</span></a>';
-//				}
 				description += '<a type="button" class="btn btn-default" href="/page/point/id/' + id + '"><span class="glyphicon glyphicon-eye-open"></span> <span class="label">Подробнее</span></a>';
 				description += '<button type="button" class="btn btn-default" onclick="addToRoute(' + id + ')"><span class="glyphicon glyphicon-map-marker"></span> <span class="label">В маршрут</span></button>';
-//				description += '<button type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> <span class="label">Был здесь</span></button>';
 				description += '<button type="button" class="btn btn-default" onclick="addRemoveLike(' + id + ')"><span id="myLikesButton" class="glyphicon glyphicon-' + (data.iLike ? 'ok' : 'thumbs-up') + '"></span> <span class="label">Нравится</span></button>';
 				description += '<button type="button" class="btn btn-default" onclick="addRemoveFavorite(' + id + ')"><span id="myFavoritesButton" class="glyphicon glyphicon-star' + (data.inFavorites ? '' : '-empty') + ' "></span> <span class="label">Хочу посетить</span></button>';
 
@@ -242,6 +236,7 @@ function showInfo(id)
 
 		history.pushState({pointId: id}, document.title, "/?point=" + id);
 		document.title = points[id].options.title;
+		marker.openPopup();
 	}
 }
 
diff --git a/public/js/route.js b/public/js/route.js
index f7d4bb3..3268436 100644
--- a/public/js/route.js
+++ b/public/js/route.js
@@ -151,7 +151,7 @@ function deleteRoute(id)
  */
 function addToRoute(id, build)
 {
-	$('#wayPoints').append('<div pointid="' + id + '" class="wayPoint"><span onclick="$(this).parent().remove();buildRoute();">&times;</span> ' + points[id].options.title + '</div>');
+	$('#wayPoints').append('<div pointid="' + id + '" class="wayPoint" onclick="showInfo('+ id +');"><span class="del" onclick="$(this).parent().remove();buildRoute();">&times;</span> '+ points[id].options.title + '</div>');
 	closePopup();
 	openBox('Route', true);