[locations] added warning if subnets are marked for deletion; locations now scroll into view; subnet list now sorted by startip;

1 files changed, 24 insertions, 0 deletions

diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html
index 238d6630..fb09a45e 100644
--- a/modules-available/locations/templates/locations.html
+++ b/modules-available/locations/templates/locations.html
@@ -157,6 +157,7 @@ function slxOpenLocation(e, lid) {
 			existing.show();
 			$(e).closest('tr').addClass('active slx-bold');
 			slxLastLocation = existing;
+			scollIntoView(existing);
 		}
 		return;
 	}
@@ -166,10 +167,24 @@ function slxOpenLocation(e, lid) {
 	$(e).closest('tr').addClass('active slx-bold').after(tr);
 	td.load('?do=Locations&action=showlocation&locationid=' + lid, function() {
 		slxAttachCidr();
+		scollIntoView(tr);
 	});
 	slxLastLocation = tr;
 }
 
+function scollIntoView(el) {
+	var offset = $(el).offset();
+	var win = $(window);
+	var h = $(el).height();
+	if (offset.top +  h > win.scrollTop() + win.height()) {
+		offset.top -= win.height();
+		offset.top += h;
+		$('html, body').animate({
+			scrollTop: offset.top
+		});
+	}
+}
+
 function slxAddSubnetRow(e, lid) {
 	var tr = $('#loc-sub-' + lid);
 	tr.before('<tr id="row' + slxAddCounter + '" class="cidrmagic">\
@@ -189,5 +204,14 @@ function removeNewSubnetRow(r) {
 function slxConfirm() {
 	return confirm('{{lang_areYouSureNoUndo}}');
 }
+
+function deleteSubnetWarning(locid) {
+	var form = $("#locationForm"+locid);
+	if (form.find("input[type=checkbox]:checked").length > 0) {
+		$("#saveWarningModal"+locid).modal();
+	} else {
+		form.submit();
+	}
+}
 	// -->
 </script>