From d84458ae1316f5a64bfa3be5d54ae8040ab4c34b Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Sat, 19 Sep 2015 10:53:39 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=B4=D0=BE=D0=BF.=20=D0=BF=D0=B0=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ground/views/modals/addPoint.php | 6 +++---
 public/css/style.css             | 2 +-
 public/js/map.js                 | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ground/views/modals/addPoint.php b/ground/views/modals/addPoint.php
index f7df02a..a520144 100644
--- a/ground/views/modals/addPoint.php
+++ b/ground/views/modals/addPoint.php
@@ -25,8 +25,7 @@
                         <label class="control-label error" for="imgs">(Что-то не так с изображениями!)</label>
                         <span class="btn btn-sm add button" onclick="addNewImage()" title="Добавить ещё одно изображение"><span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-camera"></span></span>
                     </div>
-					<div id="imgsContainer">
-					</div>
+					<div id="imgsContainer"></div>
 					<div class="form-group extraImage asLink">
 						<label class="control-label" for="imgs">Дополнительные поля</label>
 						<span class="btn btn-sm add button" onclick="addNewExtraParam()" title="Добавить ещё одно изображение"><span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-bookmark"></span></span>
@@ -78,7 +77,8 @@
 			<div id="newExtraParam">
 				<div class="form-group extraParam" style="display: none;">
 					<div class="input-group">
-						<input type="text" name="extraParamNames[]" class="form-control names" placeholder="Название параметра (тел., сайт, ...)" />
+						<div class="input-group-addon type ico" title="Можно перетаскивать вверх и вних"><span class="glyphicon glyphicon-align-justify"></span></div>
+						<input type="text" name="extraParamNames[]" class="form-control names" placeholder="Имя параметра (тел., сайт, …)" />
 						<input type="text" name="extraParamValues[]" class="form-control values" placeholder="Значение параметра" />
 						<div class="input-group-addon remove button" onclick="removeInput($(this))" title="Удалить это поле"><span class="glyphicon glyphicon-trash"></span></div>
 					</div>
diff --git a/public/css/style.css b/public/css/style.css
index 4171e09..4d883bc 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -35,7 +35,7 @@ div.fotorama__caption div.fotorama__caption__wrap {padding: 0px 5px;}
 #addPointModal .extraParam .button {cursor: pointer; background-color: #eeeeee;}
 #addPointModal .extraParam .remove:hover {background-color: #f4bfbf;}
 #addPointModal .extraParam .add:hover {background-color: #bff4c8;}
-#addPointModal .extraParam .type.button:hover {background-color: #ddd;}
+#addPointModal .extraParam .input-group-addon.type.ico:hover {background-color: #ddd;cursor: move;}
 #addPointModal .extraParam .input-group-addon.type.button {border-left: 0px;}
 #addPointModal .extraParam input.form-control {width: 50%}
 
diff --git a/public/js/map.js b/public/js/map.js
index 8ccc8f5..0d81e2d 100644
--- a/public/js/map.js
+++ b/public/js/map.js
@@ -107,6 +107,7 @@ function init(lat, lng) {
 	$("#wayPoints").sortable();
 	$("#wayPoints").disableSelection();
 	$("#imgsContainer").sortable();
+	$("#extraParamsContainer").sortable();
 
 	myMap.on('moveend', function (e) {
 		if (!myMap._popup && $('#boxRoute').css('display') == 'none' && status != statusMovingInHistory)