Merge pull request #108 from midas-isg/front-end-updates

Front end updates
midas-isg · Mar 5, 2018 · badf9f7 · badf9f7
2 parents d9ba5a2 + eb23d05
commit badf9f7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/app/views/country_selector.scala.html b/app/views/country_selector.scala.html
@@ -1,6 +1,6 @@
 <div class="form-group horizontal-padding">
 	<label for="country">Country</label>
-	<button hidden class="btn btn-sm btn-default" id="get-all-countries">Get All Countries</button>
+	<button disabled class="btn btn-sm btn-default" id="get-all-countries">Get All Countries</button>
 
 	<select id="country" class="form-control">
 		<option disabled selected value="-1">(not selected)</option>

diff --git a/app/views/create.scala.html b/app/views/create.scala.html
@@ -75,7 +75,7 @@
 						<input type="text" id="au-name" class="form-control" placeholder="Name" aria-describedby="name-label">
 					</div>
 
-					<div class="extra-bottom-space" hidden>
+					<div id="code-types" class="extra-bottom-space" hidden>
 						<div class="half-block">
 							<div class="input-group">
 								<span id="code-label" class="input-group-addon">Code:</span>

diff --git a/public/javascripts/create-map.js b/public/javascripts/create-map.js
@@ -58,6 +58,12 @@ $(document).ready(function() {
 
 			if(tildeKey && altKey) {
 				$("#au-create").show();
+				$("#code-types").show();
+				$("#update-button").show();
+				$("#download-button").show();
+
+				// are we still using this one...?
+				$("#au-list").show();
 			}
 
 			return;

diff --git a/public/javascripts/map-driver.js b/public/javascripts/map-driver.js
@@ -529,6 +529,8 @@ MapDriver.prototype.formatGeoJSON = function(geoJSON) {
 		auParentGID = this.parent,
 		description = $("#description").val(),
 		dateTokens = HELPERS.validDate(startDate),
+		gisSourceID,
+		gisSourceURL,
 		useParent,
 		properties;
 
@@ -646,7 +648,9 @@ MapDriver.prototype.formatGeoJSON = function(geoJSON) {
 	properties["startDate"] = startDate;
 	properties["endDate"] = endDate;
 	properties["kml"] = this.kml;
-
+	properties["gisSourceURL"] = gisSourceURL;
+	properties["gisSourceId"] = gisSourceID;
+
 	return geoJSON;
 }