diff --git a/avocat/index.html b/avocat/index.html index fcb518a..3781a66 100644 --- a/avocat/index.html +++ b/avocat/index.html @@ -6,16 +6,14 @@ - - + + - - diff --git a/droits/affaire.html b/droits/affaire.html index 12646f1..f0c550c 100644 --- a/droits/affaire.html +++ b/droits/affaire.html @@ -14,8 +14,6 @@ - - diff --git a/droits/penal.html b/droits/penal.html index 1996f73..8de3ee7 100644 --- a/droits/penal.html +++ b/droits/penal.html @@ -14,8 +14,6 @@ - - diff --git a/index.html b/index.html index 0e0502c..74ab2cf 100644 --- a/index.html +++ b/index.html @@ -14,9 +14,6 @@ - - - diff --git a/join/contact.html b/join/contact.html index 7ed2afe..2ad2432 100644 --- a/join/contact.html +++ b/join/contact.html @@ -14,8 +14,6 @@ - - diff --git a/join/coordonees.html b/join/coordonees.html index b655f1c..fc7f0ae 100644 --- a/join/coordonees.html +++ b/join/coordonees.html @@ -14,8 +14,6 @@ - - diff --git a/js/base.js b/js/base.js index 38e3b07..fee843f 100644 --- a/js/base.js +++ b/js/base.js @@ -20,7 +20,7 @@ function load(urlHTML, elementHTML, urlJS, elementJS) { }) .catch( function (err) { - console.warn('Could not load the Navbar.', err) + console.warn('Could not load '+urlHTML+': Add the correct tag ?', err); } ); } @@ -32,7 +32,7 @@ function loadHTML(url, element) { element.innerHTML = htmltext; }).catch( function (err) { - console.warn('Could not load the Navbar.', err) + console.warn('Could not load '+url+': Add the correct tag ?', err); } ); } @@ -43,6 +43,13 @@ function loadJS(url, element) { element.appendChild(scriptTag); } +function loadCSS(url, element) { + var linkTag = document.createElement('link'); + linkTag.rel = "stylesheet"; + linkTag.href = url; + element.appendChild(linkTag); +} + function ready(callback) { // in case the document is already rendered if (document.readyState != 'loading') callback(); @@ -88,7 +95,11 @@ function concatPath(slashNum, basePath) /* main */ /****************************************/ +var headTag = document.getElementsByTagName("head")[0]; window.addEventListener('load', function () { - load(urlStr+"components/navbar.html", document.getElementsByTagName("Navbar")[0], urlStr+"js/navbar.js", this.document.getElementsByTagName("head")[0]); - load(urlStr+"components/footer.html", document.getElementsByTagName("Footer")[0], urlStr+"js/footer.js", this.document.getElementsByTagName("head")[0]); + loadCSS(urlStr+"css/base.css", headTag); + loadCSS(urlStr+"css/navbar.css", headTag); + load(urlStr+"components/navbar.html", document.getElementsByTagName("Navbar")[0], urlStr+"js/navbar.js", headTag); + loadCSS(urlStr+"css/footer.css", headTag); + load(urlStr+"components/footer.html", document.getElementsByTagName("Footer")[0], urlStr+"js/footer.js", headTag); }) \ No newline at end of file