Skip to content

Commit

Permalink
search fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@irenekhan7
irenekhan7 committed Jul 23, 2014
1 parent a4aeae8 commit 84bf609
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 14 deletions.
6 changes: 4 additions & 2 deletions static/css/base.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@

.summary-title
{
border-top: 1px solid;
border-top: 1px solid #ccc;
margin-top: 4px;
padding: 2px;

}

.clear-title
Expand All @@ -33,7 +36,6 @@
#instructions
{
width:100%;
border-bottom: 1px solid #ccc;
padding-bottom: 10px;
font-size: 12.5px;
margin: 0 auto;
Expand Down
1 change: 0 additions & 1 deletion templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<head>
<title></title>
<link rel="stylesheet" type="text/css" href="/static/css/base.css">

</head>
<body class="container">

Expand Down
2 changes: 2 additions & 0 deletions templates/sample.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ <h3>Sample {{sample.number}}</h3>
{% endblock %}

{% block body %}
<script src="/static/js/jquery-2.1.1.min.js"></script>

<div class = "table-responsive">
<table id="sampleview_table" class="table">

Expand Down
37 changes: 26 additions & 11 deletions templates/search_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div id = "search-options" class="panel panel-default">
<div id = "search-panel" class="panel-heading">
<h4 class="panel-title">
<a class='accordion-toggle' data-toggle="collapse" onclick="$('#collapseTwo').collapse('toggle');" data-parent="#accordion" href="#collapseOne">
<a class='accordion-toggle' data-toggle="collapse" onclick="$('#collapseOne').collapse('toggle'); $('#collapseTwo').collapse('toggle');" data-parent="#accordion" href="">
Search Options
</a>
</h4>
Expand Down Expand Up @@ -183,7 +183,7 @@ <h3>Provenance</h3>
<div id="search-summary" class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a class='accordion-toggle' data-toggle="collapse" onclick="$('#collapseOne').collapse('toggle');" data-parent="#accordion" href="#collapseTwo">
<a class='accordion-toggle' data-toggle="collapse" onclick="$('#collapseOne').collapse('toggle'); $('#collapseTwo').collapse('toggle');" data-parent="#accordion" href="">
Search Summary
</a>
</h4>
Expand Down Expand Up @@ -219,9 +219,9 @@ <h4 class="panel-title">

<link rel="stylesheet" href="//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css">
<link rel="stylesheet" href="/static/css/chosen.min.css">
<!-- <script src="//code.jquery.com/jquery-1.10.2.js"></script> -->
<script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
<script src="/static/js/chosen.jquery.min.js"></script>
<script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>


<link rel="stylesheet" href="/static/css/style.min.css">
<script src="/static/js/jstree.min.js"></script>
Expand Down Expand Up @@ -321,12 +321,21 @@ <h4 class="panel-title">
//GOOGLE MAP RENDERING
function initialize()
{
var mapCenter;

var map = new google.maps.Map(document.getElementById('map-canvas'), {
zoom: 11,
center: new google.maps.LatLng(40.710836, -74.019889),
center: new google.maps.LatLng(44, -74),
mapTypeId: google.maps.MapTypeId.ROADMAP
});

if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(function (position) {
initialLocation = new google.maps.LatLng(position.coords.latitude, position.coords.longitude);
map.setCenter(initialLocation);
});
}

google.maps.event.addListenerOnce(map, 'idle', function() {
google.maps.event.trigger(map, 'resize');
});
Expand Down Expand Up @@ -399,7 +408,7 @@ <h4 class="panel-title">
var searchOptions = document.getElementById("search-options-location");
searchOptions.innerHTML = "<div class='summary-title'><h4>Location</h4><a onclick='clearBounds()' class='clear-title'>Clear</a></div>";

searchOptions.innerHTML += "NE Lat: " + ne.lat().toString() + "<br>NE Long: " + ne.lng().toString() + "<br>SW Lat: " + sw.lat().toString() + "<br>SW Long: " + sw.lng().toString() + "<br>";
searchOptions.innerHTML += "<b>NE:</b> [" + ne.lat().toFixed(2).toString() + ", " + ne.lng().toFixed(2).toString() + "] <b>SW:</b> [" + sw.lat().toFixed(2).toString() + ", " + sw.lng().toFixed(2).toString() + "]<br>";

updateLocation();
});
Expand All @@ -416,7 +425,9 @@ <h4 class="panel-title">
var searchOptions = document.getElementById("search-options-location");
searchOptions.innerHTML = "";
searchOptions.innerHTML = "<div class='summary-title'><h4>Location</h4><a onclick='clearBounds()' class='clear-title'>Clear</a></div>";
searchOptions.innerHTML += "NE Lat: " + ne.lat().toString() + "<br>NE Long: " + ne.lng().toString() + "<br>SW Lat: " + sw.lat().toString() + "<br>SW Long: " + sw.lng().toString() + "<br>";


searchOptions.innerHTML += "<b>NE:</b> [" + ne.lat().toFixed(2).toString() + ", " + ne.lng().toFixed(2).toString() + "] <b>SW:</b> [" + sw.lat().toFixed(2).toString() + ", " + sw.lng().toFixed(2).toString() + "]<br>";

updateLocation();

Expand Down Expand Up @@ -533,6 +544,7 @@ <h4 class="panel-title">
return false;
}); //END ajax


}); //END READY FUNCTION

//UPDATE BOUNDS
Expand All @@ -552,10 +564,10 @@ <h4 class="panel-title">
searchOptions.innerHTML = "<div class='summary-title'><h4>Location</h4><a onclick='clearBounds()' class='clear-title'>Clear</a></div>";

//Update Location
if(currentOverlay.map !== null)
if(currentOverlay.map !== null && currentOverlay.bounds !== null)
{
console.log("HERE");
console.log("map is " + currentOverlay.map);
console.log("map is " + currentOverlay);
//Update POINT 4326 values to submit
//SRID=4326;POINT(-118.0488106 33.9346343)
//var upperbound = 'SRID=4326;POINT(' + nelat + ' ' + nelong + ')';
Expand All @@ -571,7 +583,7 @@ <h4 class="panel-title">

document.getElementById("location-bound").value = polygon;

searchOptions.innerHTML += "<b>NE Lat:</b> " + nelat + "<br><b>NE Long:</b> " + nelong + "<br><b>SW Lat:</b> " + swlat + "<br><b>SW Long:</b> " + swlong + "<br>";
searchOptions.innerHTML += "<b>NE:</b> [" + parseFloat(nelat).toFixed(2) + ", " + parseFloat(nelong).toFixed(2) + "] <b>SW:</b> [" + parseFloat(swlat).toFixed(2) + ", " + parseFloat(swlong).toFixed(2) + "]<br>";
}


Expand Down Expand Up @@ -697,7 +709,7 @@ <h4 class="panel-title">
$("#selected-reference option:selected").length ||
$("#selected-number option:selected").length ||
$("#selected-igsn option:selected").length ||
$('startdatevalue').val() || $('enddatevalue').val())
$('#startdatevalue').val() || $('#enddatevalue').val())
searchOptions.innerHTML += "<div class='summary-title'><h4>Provenance</h4><a onclick='clearProvenance()' class='clear-title'>Clear</a></div>";


Expand Down Expand Up @@ -823,6 +835,9 @@ <h4 class="panel-title">
$.datepicker._clearDate('#date-end');
$('#date-start').val('');
$('#date-end').val('');
$('#startdatevalue').attr('value', '');
$('#enddatevalue').attr('value', '');

$("input:radio[name='public_data']").each(function(i) { this.checked = false; });
document.getElementById("search-options-provenance").innerHTML = "";

Expand Down

0 comments on commit 84bf609

Please sign in to comment.