Accueil Explorer Aide
Connexion
Ninjatrappeur
/
ffdn-db
forké depuis FFDN/ffdn-db
1
0
Fork 0
Fichiers
Parcourir la source

New homepage with a map

Gu1 il y a 11 ans
Parent
a3dc75fee8
commit
034ead4423
4 fichiers modifiés avec 71 ajouts et 9 suppressions
Vue séparée Afficher les stats Diff
  1. 12 0
      static/css/style.css
  2. 39 0
      static/js/site.js
  3. 13 7
      templates/index.html
  4. 7 2
      templates/layout.html

+ 12 - 0
static/css/style.css
Voir le fichier 

@@ -9,6 +9,10 @@
 
     font-style: normal;
 
 }
 
 
+#homepage-body {
 
+    margin-top: 25px;
 
+}
 
+
 
 #ffdn-header {
 
     font-family: ffdn;
 
     font-size: 24px;
 
@@ -16,6 +20,10 @@
 
     display: inline-block;
 
 }
 
 
+#ffdn-header span {
 
+    display: inline-block;
 
+}
 
+
 
 .brand:hover #ffdn-header {
 
     animation-duration: 0.6s;
 
     animation-name: lulz;
 
@@ -31,6 +39,10 @@
 
     }
 
 }
 
 
+#map {
 
+    height: 600px;
 
+}
 
+
 
 .control-group.required label:before {
 
     content: '*';
 
     color: red;

+ 39 - 0
static/js/site.js
Voir le fichier 

@@ -15,8 +15,47 @@ $(function () {
 
         });
 
     });
 
     $('.selectpicker').selectpicker();
 
+    init_map();
 
 });
 
 
+function init_map() {
 
+    var mapquest=L.tileLayer('http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg', {
 
+        attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, '+
 
+                     'Tiles courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a>',
 
+        subdomains: '1234'
 
+    });
 
+    var mapquestsat=L.tileLayer('http://otile{s}.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg', {
 
+        attribution: '&copy; Tiles courtesy of <a href="http://www.mapquest.com/" target="_blank">MapQuest</a>, '+
 
+                     'Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency',
 
+        subdomains: '1234',
 
+        maxZoom: 11
 
+    });
 
+    var osm=L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
 
+        attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors',
 
+        subdomains: 'ab'
 
+    });
 
+    var hyb=L.tileLayer('http://otile{s}.mqcdn.com/tiles/1.0.0/hyb/{z}/{x}/{y}.jpg', {
 
+        subdomains: '1234',
 
+        maxZoom: 11
 
+    });
 
+
 
+    var map = L.map('map', {
 
+        center: new L.LatLng(46.603354, 10),
 
+        zoom: 4,
 
+        layers: [mapquest]
 
+    });
 
+    map.attributionControl.setPrefix('');
 
+    L.control.layers({'MapQuest': mapquest, 'OSM Mapnik': osm, 'MapQuest Aerial': mapquestsat}).addTo(map);
 
+    map.on('baselayerchange', function(a) {
 
+        if(a.name == 'MapQuest Aerial') {
 
+            map.addLayer(hyb);
 
+            hyb.bringToFront();
 
+        } else {
 
+            map.removeLayer(hyb);
 
+        }
 
+    });
 
+}
 
+
 
 function change_input_num(li, new_num, reset=false) {
 
     li.find('input,select').each(function() {
 
         var id = $(this).attr('id').replace(/^(.*)-\d{1,4}/, '$1-'+new_num);

Fichier diff supprimé car celui-ci est trop grand
+ 13 - 7
templates/index.html


+ 7 - 2
templates/layout.html
Voir le fichier 

@@ -8,8 +8,10 @@
 
     <link rel="shortcut icon" href="favicon.ico"> -->
 
     <!-- css -->
 
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/bootstrap.css') }}">
 
+    <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/bootstrap-responsive.css') }}">
 
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/jquery.ui.all.css') }}">
 
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/bootstrap-select.min.css') }}">
 
+    <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/leaflet.css') }}">
 
     <link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/style.css') }}">
 
   </head>
 
 <body>
 
@@ -22,13 +24,12 @@
 
         <span class="icon-bar"></span>
 
         <span class="icon-bar"></span>
 
       </a>
 
-      <a class="brand" href="/"><span id="ffdn-header">FFDN</span> Database</a>
 
+      <a class="brand" href="/"><span id="ffdn-header"><span>F</span><span>F</span><span>D</span><span>N</span></span> Database</a>
 
       <div class="nav-collapse collapse">
 
         <ul class="nav pull-right">
 
           <li class="active">
 
           <a href="/">Home</a>
 
           </li>
 
-          <li><a href="#">Add Project</a></li>
 
           <li><a href="#">Project List</a></li>
 
           <li><a href="#">Schema</a></li>
 
           <li><a href="#">API</a></li>
 
@@ -39,6 +40,7 @@
 
 </div>
 
 
 <div class="container">
 
+{% block container %}
 
 <h2 class="page-header">{% block subtitle %}{% endblock %}</h2>
 
 {% with messages = get_flashed_messages(with_categories="true") %}
 
   {% if messages %}
 
@@ -55,10 +57,13 @@
 
 {% block body %}{% endblock %}
 
 </div>
 
 
+{% endblock container%}
 
 </div> <!-- container -->   
+
 
   <script type="text/javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script>
 
   <script type="text/javascript" src="{{ url_for('static', filename='js/bootstrap.js') }}"></script>
 
   <script type="text/javascript" src="{{ url_for('static', filename='js/bootstrap-select.min.js') }}"></script>
 
+  <script type="text/javascript" src="{{ url_for('static', filename='js/leaflet.js') }}"></script>
 
   <script type="text/javascript" src="{{ url_for('static', filename='js/site.js') }}"></script>
 
   <script type="text/javascript">
 
     $(document).ready(function () {