Commit a263baa9 authored by Naoeltanuki's avatar Naoeltanuki
Browse files

modifications goldman

parent 8bb7ebdf
......@@ -37,6 +37,7 @@ div.column {
.row{
margin:10px;
}
a {
color: #bc1c03;
}
......@@ -94,7 +95,9 @@ a:hover{
background-color: #f6d6bf; /*rose*/
opacity: 100%;
}
#navbar_petit_prince {
height: 30px;
}
.site-header .navbar-nav .nav-link {
color: #bc1c03; /*rose*/
......@@ -109,9 +112,6 @@ a:hover{
font-weight: 500;
}
.footer-copyright{ /*ici rose plus foncé mais on pourrait mettre même couleur partout?*/
background-color: #f4c6a5; /*rose*/
}
.content-section {
background: #ffffff;
......
{% extends "layout.html" %}
{% block content %}
<h1>Carte</h1>
<!--leaflet-->
......@@ -119,9 +119,9 @@
legend.onAdd = function (mymap) {
var div = L.DomUtil.create('div', 'info-legend'),
types = ['sans enregistrement sonore', 'langue', 'variante de prononciation', 'dialecte'],
types = [ 'langue', 'variante de prononciation', 'dialecte','sans enregistrement sonore'],
markers = ['{{ url_for('static', filename='img/marker/blue.png')}}', '{{ url_for('static', filename='img/marker/prince_pink.png')}}','{{ url_for('static', filename='img/marker/prince_yellow.png')}}', '{{ url_for('static', filename='img/marker/prince_green.png')}}'];
markers = [ '{{ url_for('static', filename='img/marker/prince_pink.png')}}','{{ url_for('static', filename='img/marker/prince_yellow.png')}}', '{{ url_for('static', filename='img/marker/prince_green.png')}}', '{{ url_for('static', filename='img/marker/blue.png')}}'];
for (var i = 0; i < types.length; i++) {
div.innerHTML +=
......
{% extends "layout.html" %}
{% block content %}
<h1>Langue : {{title}}</h1>
<!-<h1>Langue : {{title}}</h1>
<!-- Printing the name of the language with the first letter capitalized -->
<p>{{langue.english|capitalize|safe}}<br>
......@@ -88,16 +88,16 @@
// les langues sans enregistrements en gris
{icon: blueIcon}
{% endif %}
).addTo(mymap).bindPopup( '{{langue.french}}');
).addTo(mymap);
var legend = L.control({position: 'bottomleft'});
legend.onAdd = function (mymap) {
var div = L.DomUtil.create('div', 'info-legend'),
types = ['sans enregistrement sonore', 'langue', 'variante de prononciation', 'dialecte'],
types = ['langue', 'variante de prononciation', 'dialecte','sans enregistrement sonore'],
markers = ['{{ url_for('static', filename='img/marker/blue.png')}}', '{{ url_for('static', filename='img/marker/prince_pink.png')}}','{{ url_for('static', filename='img/marker/prince_yellow.png')}}', '{{ url_for('static', filename='img/marker/prince_green.png')}}'];
markers = ['{{ url_for('static', filename='img/marker/prince_pink.png')}}','{{ url_for('static', filename='img/marker/prince_yellow.png')}}', '{{ url_for('static', filename='img/marker/prince_green.png')}}', '{{ url_for('static', filename='img/marker/blue.png')}}'];
for (var i = 0; i < types.length; i++) {
......
......@@ -8,8 +8,8 @@
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.css" />
<!--thumbnail petit prince-->
<link rel="icon" href="static/img/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="static/img/favicon.ico" type="image/x-icon" />
<link rel="icon" href='{{ url_for('static', filename='img/prince_transparent.png')}}' type="image/x-icon" />
<link rel="shortcut icon" href='{{ url_for('static', filename='img/prince_transparent.png')}}' type="image/x-icon" />
<!-- leaflet pour carte, marqueurs etc-->
<script src="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.js"></script>
......@@ -24,14 +24,16 @@
<header class="site-header">
<nav class="navbar navbar-expand-md navbar-dark bg-steel fixed-top">
<div class="container">
<a class="navbar-brand mr-4" id="header" href="/projet_19-20/petit_prince/">Petit Prince</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggle" aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarToggle">
<!-- Navbar Right Side -->
<div class="nav navbar-nav ml-auto">
<a class="nav-item nav-link" href="/projet_19-20/petit_prince/home">Accueil</a>
<div class="nav navbar-nav mr-auto">
<a class="nav-item nav-link" href="/projet_19-20/petit_prince/home">
<img id="navbar_petit_prince"
src= '{{ url_for('static', filename='img/prince_transparent.png')}}' alt="petit_prince">Accueil</a>
<a class="nav-item nav-link" href="/projet_19-20/petit_prince/liste_langues">Liste des langues</a>
<a class="nav-item nav-link" href="/projet_19-20/petit_prince/carte">Carte</a>
</div>
......@@ -62,6 +64,11 @@
<br>
<a class="text-my-own-color" href="/projet_19-20/petit_prince/enregistrement">(Visitez d'abord cette page qui offre quelques trucs pour bien enregistrer)</a><br>
<br>
<!-- Copyright -->
<a style="color: #333333;" href="https://mdbootstrap.com/"> © 2020 Copyright: MDBootstrap.com</a>
</div>
<!-- Grid column -->
<br />
......@@ -96,11 +103,8 @@
</div>
<!-- Footer Links -->
<!-- Copyright -->
<div class="footer-copyright text-center py-3">© 2020 Copyright:
<a style="color: #333333;" href="https://mdbootstrap.com/"> MDBootstrap.com</a>
</div>
<!-- Copyright -->
</footer>
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment