Suppression de la navigation JS

C'est pas sur ce genre de projet qu'on peut se permettre de perdre du temps à s'amuser à faire ce genre de trucs. Ça fonctionnerait encore, j'aurais laissé, mais là, c'était plutôt cassé de partout. Closes #5

Suppression de la navigation JS
C'est pas sur ce genre de projet qu'on peut se permettre de perdre du temps à s'amuser à faire ce genre de trucs. Ça fonctionnerait encore, j'aurais laissé, mais là, c'était plutôt cassé de partout. Closes #5
Geoffrey PREUD'HOMME
1 parent 710b8613
Showing 5 changed files with 49 additions and 169 deletions Show diff stats
index.php
js/contact.js
js/crep.js
pages/contact.php
pages/description.php
@@ -22,9 +22,6 @@ if (!file_exists($toLoad)) {
 	header('Status: 200 OK'); // FastCGI fix
 }
-if (isset($_GET['c'])) {
-	require_once("$toLoad");
-} else {
 ?>
     <!DOCTYPE html>
     <html>
@@ -42,8 +39,6 @@ if (isset($_GET[&#39;c&#39;])) {
         <link rel="stylesheet" href="css/crep.css">
         <script type="text/javascript" src="js/jquery.min.js"></script>
         <script type="text/javascript" src="js/bootstrap.min.js"></script>
-        <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3.exp"></script>
-        <script type="text/javascript" src="js/crep.js"></script>
         <script type="text/javascript" src="js/konami.js"></script>
     </head>
@@ -52,7 +47,7 @@ if (isset($_GET[&#39;c&#39;])) {
         <?php require_once("menu.php");?>
         <div class="col-md-12 center-block">
             <div class="col-md-12" id="mainContainer">
-                <?php
+<?php
 	require_once("$toLoad");
 ?>
             </div>
@@ -63,5 +58,4 @@ if (isset($_GET[&#39;c&#39;])) {
     </html>
     <?php
-}
 ?>
@@ -0,0 +1,45 @@
+$(document).ready(function() {
+// enhance tel-links (from http://stackoverflow.com/a/18921965/2766106)
+$("a[href^='tel:']").each(function () {
+  var target = "call-" + this.href.replace(/[^a-z0-9]*/gi, "");
+  var link = this;
+
+  // load in iframe to supress potential errors when protocol is not available
+  $("body").append("<iframe name=\"" + target + "\" style=\"display: none\"></iframe>");
+  link.target = target;
+
+  // replace tel with callto on desktop browsers for skype fallback
+  if (!navigator.userAgent.match(/(mobile)/gi)) {
+    link.href = link.href.replace(/^tel:/, "callto:");
+  }
+});
+
+  // Carte
+  var mapCanvas = document.getElementById('map-canvas');
+  mapCanvas.innerHTML = '';
+  var polytechPos = new google.maps.LatLng(50.6074998, 3.1373338);
+  var mapOptions = {
+    center: polytechPos,
+    zoom: 16,
+    mapTypeId: google.maps.MapTypeId.ROADMAP
+  };
+  var map = new google.maps.Map(mapCanvas, mapOptions);
+  var marker = new google.maps.Marker({
+    place: {
+      location: polytechPos,
+      query: "Polytech Lille"
+    },
+    attribution: {
+      source: "Coupe de Robotique des Écoles Primaires",
+      webUrl: window.location.host
+    },
+    map: map,
+    title: "Polytech Lille"
+  });
+  var infowindow = new google.maps.InfoWindow({
+    content: "<strong>Polytech Lille</strong><br/>Lieux des évènements de la Coupe de Robotique des Écoles Primaires"
+  });
+  marker.addListener('click', function () {
+    infowindow.open(map, this);
+  });
+});
@@ -1,161 +0,0 @@
-function removeAfter(string, pattern) {
-  var n = string.indexOf(pattern);
-  return string.substring(0, n != -1 ? n : string.length);
-}
-
-function pageName(href) {
-  if (href.indexOf(window.location.host) >= 0) {
-    href = removeAfter(removeAfter(href, '?'), '#');
-    hrefE = href.split('/');
-    return hrefE[hrefE.length - 1];
-  }
-  return false;
-}
-
-function updateScrollData() {
-  history.state.scrollTop = $(document.body).scrollTop();
-  history.replaceState(history.state);
-}
-
-function pageSpecific(location) {
-  if (pageName(location) == 'contact') {
-    initializeMap();
-
-    // enhance tel-links (from http://stackoverflow.com/a/18921965/2766106)
-    $("a[href^='tel:']").each(function () {
-      var target = "call-" + this.href.replace(/[^a-z0-9]*/gi, "");
-      var link = this;
-
-      // load in iframe to supress potential errors when protocol is not available
-      $("body").append("<iframe name=\"" + target + "\" style=\"display: none\"></iframe>");
-      link.target = target;
-
-      // replace tel with callto on desktop browsers for skype fallback
-      if (!navigator.userAgent.match(/(mobile)/gi)) {
-        link.href = link.href.replace(/^tel:/, "callto:");
-      }
-    });
-  }
-  $(document).scroll(updateScrollData);
-}
-
-
-
-function actLink(ev) {
-  var location = ev.currentTarget.href;
-  var page = pageName(location);
-  if (page && page != pageName(window.location.href)) {
-    loadDoc(location, function () {
-      history.pushState({
-        loc: location
-      }, document.title, location);
-    });
-    return false;
-  }
-}
-
-function dynamiseLinks(el) {
-  $("a", el).click(actLink);
-}
-
-function loadDoc(location, callback) {
-  if (!callback) {
-    callback = function () {
-      return undefined;
-    };
-  }
-  var eventsLeft = 2;
-  var html = '';
-  var mainContainer = $("#mainContainer");
-  var oldHeight = mainContainer.height();
-
-  function events() {
-      eventsLeft += -1;
-      if (eventsLeft <= 0) {
-        // In
-        //  Calculations
-        mainContainer.html(html);
-        mainContainer.height('auto');
-        newHeight = mainContainer.height();
-        mainContainer.height(oldHeight);
-        //  Transition
-        mainContainer.animate({
-          height: newHeight,
-          opacity: 1,
-        }, 'fast', function () {
-          mainContainer.height('auto');
-          dynamiseLinks(mainContainer);
-          pageSpecific(location);
-          callback();
-        });
-      }
-    }
-    // Out
-  $(document).off('scroll', updateScrollData);
-  $(document.body).animate({
-    scrollTop: $('.navbar-lower').height()
-  }, 'fast');
-  $.get('pages/' + pageName(location) + '.php', function (data) {
-    html = data;
-    events();
-  });
-  mainContainer.height(oldHeight);
-  mainContainer.animate({
-    opacity: 0
-  }, 'fast', events);
-}
-
-function historyChange(ev) {
-  loadDoc(ev.state.loc, function () {
-    if (ev.state.scrollTop > $('.navbar-lower').height()) {
-      $(document.body).animate({
-        scrollTop: ev.state.scrollTop
-      }, 'fast');
-    }
-  });
-}
-
-$(document).ready(function () {
-  dynamiseLinks(document.body);
-  var current = window.location.href;
-  pageSpecific(current);
-  history.replaceState({
-    loc: current
-  }, document.title, current);
-  window.onpopstate = historyChange;
-  $('.navbar-fixed-top .navbar-toggle').click(function () {
-    $(document.body).animate({
-      scrollTop: 0
-    });
-  });
-});
-
-function initializeMap() {
-  var mapCanvas = document.getElementById('map-canvas');
-  mapCanvas.innerHTML = '';
-  var polytechPos = new google.maps.LatLng(50.6074998, 3.1373338);
-  var mapOptions = {
-    center: polytechPos,
-    zoom: 16,
-    mapTypeId: google.maps.MapTypeId.ROADMAP
-  };
-  var map = new google.maps.Map(mapCanvas, mapOptions);
-  var marker = new google.maps.Marker({
-    place: {
-      location: polytechPos,
-      query: "Polytech Lille"
-    },
-    attribution: {
-      source: "Coupe de Robotique des Écoles Primaires",
-      webUrl: window.location.host
-    },
-    map: map,
-    title: "Polytech Lille"
-  });
-  var infowindow = new google.maps.InfoWindow({
-    content: "<strong>Polytech Lille</strong><br/>Lieux des évènements de la Coupe de Robotique des Écoles Primaires"
-  });
-  marker.addListener('click', function () {
-    infowindow.open(map, this);
-  });
-}
@@ -21,3 +21,5 @@
         <img src="img/polyMap.png" />
     </a>
 </div>
+<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3.exp"></script>
+<script type="text/javascript" src="js/contact.js"></script>
-v class="container" id="description">
+<div class="container" id="description">
 <h1>Descriptif détaillé</h1>
 <div class="row">
     <div class="col-md-12">