diff --git a/css/crep.css b/css/crep.css index c4eb32a..8a8d3b1 100755 --- a/css/crep.css +++ b/css/crep.css @@ -1,127 +1,104 @@ -body -{ - background: #C5C5ED url('../img/mainBgPattern.png'); - overflow-y: scroll; +body { + background: #C5C5ED url('../img/mainBgPattern.png'); + overflow-y: scroll; } -.navbar-lower -{ - margin-top: 50px; - width: 100%; +.navbar-lower { + margin-top: 50px; + width: 100%; } -.panel-default -{ - border-color: #89B3D1; +.panel-default { + border-color: #89B3D1; } -.panel -{ - background-color: #749BD1; +.panel { + background-color: #749BD1; } -.panel-default > .panel-heading -{ - background-color: #89B3D1; - border-color: #89B3D1; +.panel-default > .panel-heading { + background-color: #89B3D1; + border-color: #89B3D1; } -.panel-footer -{ - background-color: #89B3D1; - border-color: #89B3D1; +.panel-footer { + background-color: #89B3D1; + border-color: #89B3D1; } -.navbar-default .navbar-brand -{ - color: #FFF; - font-family: brandFont; - font-size: 30px; +.navbar-default .navbar-brand { + color: #FFF; + font-family: brandFont; + font-size: 30px; } -.navbar-default .navbar-nav > li > a -{ - color: #CCC; - font-family: linkFont; +.navbar-default .navbar-nav > li > a { + color: #CCC; + font-family: linkFont; } -.navbar-default .navbar-toggle .icon-bar -{ - background-color: #fff; +.navbar-default .navbar-toggle .icon-bar { + background-color: #fff; } -.navbar-default -{ - background-color: #749BD1; - border-color: #5276A8; +.navbar-default { + background-color: #749BD1; + border-color: #5276A8; } -@font-face -{ - font-family: brandFont; - src: url(../fonts/robotech-gp.ttf); +@font-face { + font-family: brandFont; + src: url(../fonts/robotech-gp.ttf); } -@font-face -{ - font-family: linkFont; - src: url(../fonts/robotaur.ttf); +@font-face { + font-family: linkFont; + src: url(../fonts/robotaur.ttf); } -#mainContainer -{ - overflow-x: auto; +#mainContainer { + overflow-x: auto; } -.carousel-inner > .item > img, .carousel-inner > .item > a > img -{ - max-height: 600px; +.carousel-inner > .item > img, .carousel-inner > .item > a > img { + max-height: 600px; } -.jumbotron, #map-canvas -{ - margin: 30px inherit; +.jumbotron, #map-canvas { + margin: 30px inherit; } -.jumbotron -{ - padding: 30px; +.jumbotron { + padding: 30px; } -#description img -{ - float:left; - width:200px; - height:200px; - margin-right:10px; +#description img { + float: left; + width: 200px; + height: 200px; + margin-right: 10px; } -video -{ - max-width: 100%; +video { + max-width: 100%; } -#map-canvas -{ - width: 100%; - height: 400px; +#map-canvas { + width: 100%; + height: 400px; } -#map-canvas img -{ - max-height: 400px; - max-width: 100%; +#map-canvas img { + max-height: 400px; + max-width: 100%; } -#footer -{ - - margin-top: 30px; - margin-bottom: 30px; +#footer { + margin-top: 30px; + margin-bottom: 30px; } -#footer img, .logo -{ - max-height: 100px; - max-width: 100%; +#footer img, .logo { + max-height: 100px; + max-width: 100%; } diff --git a/js/crep.js b/js/crep.js index 878df21..d96d9d3 100755 --- a/js/crep.js +++ b/js/crep.js @@ -1,146 +1,146 @@ function removeAfter(string, pattern) { - var n = string.indexOf(pattern); - return string.substring(0, n != -1 ? n : string.length); + 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 + 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) + history.state.scrollTop = $(document.body).scrollTop(); + history.replaceState(history.state); } function pageSpecific(location) { - if (pageName(location) == 'contact') { - initializeMap() - } - $(document).scroll(updateScrollData) + if (pageName(location) == 'contact') { + initializeMap(); + } + $(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 - } + 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) + $("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() + 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() - }) - } + 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(location + '?c', function (data) { - html = data - events() - }) - mainContainer.height(oldHeight) - mainContainer.animate({ - opacity: 0 - }, 'fast', events) + $(document).off('scroll', updateScrollData); + $(document.body).animate({ + scrollTop: $('.navbar-lower').height() + }, 'fast'); + $.get(location + '?c', 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') - } - }) + 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 - }) - }) -}) +$(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: "Polytech Lille
Lieux des évènements de la Coupe de Robotique des Écoles Primaires" - }) - marker.addListener('click', function () { - infowindow.open(map, this) - }) -} \ No newline at end of file + 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: "Polytech Lille
Lieux des évènements de la Coupe de Robotique des Écoles Primaires" + }); + marker.addListener('click', function() { + infowindow.open(map, this); + }); +} diff --git a/pages/contact.php b/pages/contact.php index cc2d275..67a13fd 100755 --- a/pages/contact.php +++ b/pages/contact.php @@ -7,7 +7,6 @@

Polytech Lille

2, Bd Langevin

59655 Villeneuve d'Ascq Cedex

-
diff --git a/pages/schools.php b/pages/schools.php index 56d4409..2571161 100755 --- a/pages/schools.php +++ b/pages/schools.php @@ -3,13 +3,13 @@ require_once ("creds.php"); try { - + $link = @mysql_connect(__MYSQL_HOSTNAME__, __MYSQL_USERNAME__, __MYSQL_PASSWORD__); if (!$link) { throw new Exception('Impossible de se connecter : ' . mysql_error()); } - + if (!mysql_select_db('crep', $link)) { throw new Exception('Selection de la base de donnees impossible'); } @@ -29,7 +29,7 @@ try {
- + @@ -39,7 +39,7 @@ try { '; echo '
Nom de l'école Circonscription Adresse
'; -- libgit2 0.21.2