|
|
@@ -5,7 +5,7 @@
|
|
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
|
|
|
<head>
|
|
|
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
|
|
|
- <title>{% block title %}{% endblock title %}</title>
|
|
|
+ <title>{% block title %}Celutz, a panorama viewer{% endblock title %}</title>
|
|
|
|
|
|
<link type="image/x-icon" rel="shortcut icon" href="{% static "panorama/img/tsf.png" %}"/>
|
|
|
|
|
|
@@ -33,7 +33,7 @@
|
|
|
<span class="icon-bar"></span>
|
|
|
<span class="icon-bar"></span>
|
|
|
</button>
|
|
|
- <a class="navbar-brand" href="index.html">Celutz</a>
|
|
|
+ <a class="navbar-brand" href="{% url 'panorama:main' %}">Celutz</a>
|
|
|
</div>
|
|
|
<!-- Top Menu Items -->
|
|
|
<ul class="nav navbar-right top-nav">
|
|
|
@@ -129,20 +129,33 @@
|
|
|
</ul>
|
|
|
<!-- Sidebar Menu Items - These collapse to the responsive navigation menu on small screens -->
|
|
|
<div class="collapse navbar-collapse navbar-ex1-collapse">
|
|
|
- <ul class="nav navbar-nav side-nav">
|
|
|
- <li class="active">
|
|
|
- {% block list %}{% endblock list %}
|
|
|
+ <ul class="nav navbar-nav side-nav">
|
|
|
+ <li>
|
|
|
+ <a href="{% url 'panorama:main' %}"><i class="fa fa-fw fa-home"></i> Map</a>
|
|
|
+ </li>
|
|
|
+ <li>
|
|
|
+ <a href="javascript:;" data-toggle="collapse" data-target="#panos"><i class="fa fa-fw fa-arrows-v"></i> Panoramas<i class="fa fa-fw fa-caret-down"></i></a>
|
|
|
+ <ul id="panos" class="collapse">
|
|
|
+ {% for pano in panoramas %}
|
|
|
+ <li><a href="{% url 'panorama:view_pano' pano.id %}"><i class="fa fa-fw fa-eye"></i> {{ pano.name }}</a></li>
|
|
|
+ {% endfor %}
|
|
|
+ </ul>
|
|
|
</li>
|
|
|
<li>
|
|
|
- <!--<a href="{% url 'panorama:new' %}"><i class="fa fa-fw fa-bar-chart-o"></i> Add new panorama</a>-->
|
|
|
- <a href="javascript:;" data-toggle="collapse" data-target="#new"><i class="fa fa-fw fa-arrows-v"></i> Locate a point<i class="fa fa-fw fa-caret-down"></i></a>
|
|
|
- <ul id="new" class="collapse">
|
|
|
+ <a href="javascript:;" data-toggle="collapse" data-target="#locate-existing"><i class="fa fa-fw fa-arrows-v"></i> Locate existing point<i class="fa fa-fw fa-caret-down"></i></a>
|
|
|
+ <ul id="locate-existing" class="collapse">
|
|
|
<li>
|
|
|
<form action="{% url 'panorama:locate_refpoint' %}" enctype="multipart/form-data" method="post">{% csrf_token %}
|
|
|
{{ refpoints_form.as_p }}
|
|
|
<input type="submit" value="Locate" />
|
|
|
</form>
|
|
|
- <p><strong>OR</strong></p>
|
|
|
+ </li>
|
|
|
+ </ul>
|
|
|
+ </li>
|
|
|
+ <li>
|
|
|
+ <a href="javascript:;" data-toggle="collapse" data-target="#locate-gps"><i class="fa fa-fw fa-arrows-v"></i> Locate GPS point<i class="fa fa-fw fa-caret-down"></i></a>
|
|
|
+ <ul id="locate-gps" class="collapse">
|
|
|
+ <li>
|
|
|
<form action="{% url 'panorama:locate_custompoint' %}" enctype="multipart/form-data" method="post">{% csrf_token %}
|
|
|
{{ custom_point_form.as_p }}
|
|
|
<input type="submit" value="Locate" />
|
|
|
@@ -151,86 +164,14 @@
|
|
|
</ul>
|
|
|
</li>
|
|
|
<li>
|
|
|
- <a href="tables.html"><i class="fa fa-fw fa-table"></i> Tables</a>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <a href="forms.html"><i class="fa fa-fw fa-edit"></i> Forms</a>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <a href="bootstrap-elements.html"><i class="fa fa-fw fa-desktop"></i> Bootstrap Elements</a>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <a href="bootstrap-grid.html"><i class="fa fa-fw fa-wrench"></i> Bootstrap Grid</a>
|
|
|
- </li>
|
|
|
-
|
|
|
- <li>
|
|
|
- <a href="blank-page.html"><i class="fa fa-fw fa-file"></i> Blank Page</a>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <a href="index-rtl.html"><i class="fa fa-fw fa-dashboard"></i> RTL Dashboard</a>
|
|
|
+ <a href="{% url 'panorama:new' %}"><i class="fa fa-fw fa-edit"></i> Add new panorama</a>
|
|
|
</li>
|
|
|
</ul>
|
|
|
</div>
|
|
|
<!-- /.navbar-collapse -->
|
|
|
</nav>
|
|
|
<div id="page-wrapper">
|
|
|
-
|
|
|
- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.css" />
|
|
|
- <div id="map" style="height: 400px; "></div>
|
|
|
- <style>
|
|
|
- body{overflow : scroll;}
|
|
|
- </style>
|
|
|
- <script src="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.js"></script>
|
|
|
- <script src="https://code.jquery.com/jquery-3.0.0.min.js"></script>
|
|
|
- <script>
|
|
|
- var map;
|
|
|
- var ajaxRequest;
|
|
|
- var plotlist;
|
|
|
- var plotlayers=[];
|
|
|
-
|
|
|
- function initmap() {
|
|
|
- // set up the map
|
|
|
- map = new L.Map('map');
|
|
|
-
|
|
|
- // create the tile layer with correct attribution
|
|
|
- var osmUrl='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
|
|
|
- var osmAttrib='Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors';
|
|
|
- var osm = new L.TileLayer(osmUrl, {attribution: osmAttrib});
|
|
|
- // start the map in Grenoble
|
|
|
- map.setView(new L.LatLng(45.1842, 5.7218),13);
|
|
|
- map.addLayer(osm);
|
|
|
-
|
|
|
- // Add in a crosshair for the map
|
|
|
- var crosshairIcon = L.icon({
|
|
|
- iconUrl: 'images/crosshair.png',
|
|
|
- iconSize: [20, 20], // size of the icon
|
|
|
- iconAnchor: [10, 10], // point of the icon which will correspond to marker's location
|
|
|
- });
|
|
|
- crosshair = new L.marker(map.getCenter(), {clickable:false});
|
|
|
- crosshair.addTo(map);
|
|
|
-
|
|
|
- // Move the crosshair to the center of the map when the user pans
|
|
|
- map.on('move', function(e) {
|
|
|
- crosshair.setLatLng(map.getCenter());
|
|
|
- });
|
|
|
-
|
|
|
- map.on('moveend', function(e) {
|
|
|
- var lat = map.getCenter().lat;
|
|
|
- var lng = map.getCenter().lng;
|
|
|
- $('#id_latitude').val(lat);
|
|
|
- $('#id_longitude').val(lng);
|
|
|
- $.get("http://api.geonames.org/astergdem?lat="+lat+"&lng="+lng+"&username=celutz&style=full" ).done(
|
|
|
- function(data) {
|
|
|
- $('#id_altitude').val(parseInt(data));
|
|
|
- });
|
|
|
- });
|
|
|
- }
|
|
|
- initmap();
|
|
|
- </script>
|
|
|
-
|
|
|
- {% block content %}{% endblock content %}
|
|
|
- {% block result %}{% endblock result %}
|
|
|
-
|
|
|
+ {% block content %}{% endblock content %}
|
|
|
</div>
|
|
|
<!-- /#page-wrapper -->
|
|
|
</div>
|
Baptiste Jonglez