up styles

This commit is contained in:
Tykayn 2025-06-04 00:46:46 +02:00 committed by tykayn
parent b1f6433b7d
commit 0169b9a1a4
7 changed files with 78 additions and 57 deletions

View file

@ -269,7 +269,7 @@ document.addEventListener('DOMContentLoaded', () => {
const checkboxLabel = document.createElement('label');
checkboxLabel.htmlFor = `${prefix}-active`;
checkboxLabel.classList.add('form-check-label');
checkboxLabel.textContent = 'Activer cette plage';
checkboxLabel.textContent = '';
checkboxContainer.appendChild(checkbox);
checkboxContainer.appendChild(checkboxLabel);
@ -543,7 +543,7 @@ document.addEventListener('DOMContentLoaded', () => {
form.addEventListener('submit', check_validity);
updateCompletionProgress()
}
document.addEventListener('DOMContentLoaded', updateCompletionProgress);
updateCompletionProgress();
// Focus sur le premier champ texte au chargement
const firstTextInput = document.querySelector('input.form-control');

View file

@ -1,5 +1,6 @@
body {
background-color: rgb(236, 236, 236);
transition: background-color ease 0.5s;
}
.body-landing .container {
@ -9,8 +10,13 @@ body {
}
.main-footer {
padding-bottom: 10rem;
padding-bottom: 20rem;
background-color: #dfe5eb;
}
#qrcode {
margin-bottom: 8rem;
}
.filled {
@ -33,7 +39,16 @@ table.js-sort-table th:active {
background-color: #e0e0e0;
}
#mapLoader {
/*// formulaire de temps d'ouverture */
.form-check-input {
margin-right: 2rem;
}
.jour-container {
border: solid #dedede 1px;
}
#maploader {
position: relative;
top: 200px;
left: 50%;

View file

@ -25,7 +25,7 @@
{{ stats.getCompletionPercent() }} % complété sur les critères donnés.
</div>
<div class="col-md-3 col-12">
<i class="bi bi-building"></i> {{ stats.getPlacesCount() }} commerces dans la zone.
<i class="bi bi-building"></i> {{ stats.places | length}} commerces dans la zone.
</div>
<div class="col-md-3 col-12">
<i class="bi bi-clock"></i> {{ stats.getAvecHoraires() }} commerces avec horaires.
@ -51,7 +51,7 @@
<span class="visually-hidden">Chargement de la carte...</span>
</div>
</div>
<div id="map" style="height: 400px;"></div>
<div id="map" class="mt-4" style="height: 400px;"></div>
</div>
<div class="card mt-4">
@ -61,7 +61,7 @@
<h1 class="card-title p-4">Tableau des {{ stats.places |length }} lieux</h1>
</div>
<div class="col-md-6 col-12">
<a class="btn btn-primary pull-right" href="{{ path('app_admin_export_csv', {'zip_code': stats.zone}) }}" class="btn btn-primary">
<a class="btn btn-primary pull-right mt-4" href="{{ path('app_admin_export_csv', {'zip_code': stats.zone}) }}" class="btn btn-primary">
<i class="bi bi-filetype-csv"></i>
Exporter en CSV
</a>
@ -150,6 +150,8 @@ out skel qt;`;
}
});
}
}else{
console.log('pas de contour administratif trouvé');
}
console.log('map chargé',data.elements);

View file

@ -1,26 +1,25 @@
<thead>
<tr>
<th>Nom ({{ stats.getPlacesCount() }})</th>
<th>Nom ({{ stats.places|length }})</th>
<th>
<i class="bi bi-tags"></i>
Type
</th>
<th>
<i class="bi bi-geo-alt"></i>
Adresse ({{ stats.getAvecAdresse() }} / {{ stats.getPlacesCount() }})</th>
Adresse ({{ stats.getAvecAdresse() }} / {{ stats.places|length }})</th>
<th>
<i class="bi bi-globe"></i>
Site web ({{ stats.getAvecSite() }} / {{ stats.getPlacesCount() }})</th>
Site web ({{ stats.getAvecSite() }} / {{ stats.places|length }})</th>
<th>
<i class="bi bi-wheelchair"></i>
<i class="bi bi-person-fill-slash"></i>
Accès
PMR
({{ stats.getAvecAccessibilite() }} / {{ stats.getPlacesCount() }})</th>
({{ stats.getAvecAccessibilite() }} / {{ stats.places|length }})</th>
<th>
<i class="bi bi-pencil-square"></i>
Note ? ({{ stats.getAvecNote() }} / {{ stats.getPlacesCount() }})</th>
Note ? ({{ stats.getAvecNote() }} / {{ stats.places|length }})</th>
<th>
<i class="bi bi-pencil-square"></i>
Texte de la note</th>

View file

@ -66,36 +66,46 @@
<div class="row">
<div class="col-12">
<p class="mb-2">OpenStreetMap Mon Commerce</p>
<p class="mb-2">
</div>
<div class="col-md-4 col-12">
<p class="mb-2">
Licence AGPLv3+, fait par
<a href="https://mastodon.cipherbliss.com/@tykayn">Tykayn</a> de
<a href="https://www.cipherbliss.com">CipherBliss EI</a>,
membre de la fédération des professionels d'OpenStreetMap
</p>
<p class="mb-2">
Sources des données : <a href="https://www.openstreetmap.org/">OpenStreetMap</a>
</p>
<p class="mb-2">
<a href="https://www.openstreetmap.org/copyright">OpenStreetMap France</a>
</p>
<p class="mb-0">
<a href="https://www.openstreetmap.org/copyright">Sources du logiciel</a>
</p>
</div>
<div class="col-md-4 col-12">
<div id="userChangesHistory"></div>
<div id="qr-share">
</div>
<div class="col-md-4 col-12">
<div id="qr-share" class="mb-12">
partagez cette page :
<br>
<div id="qrcode"></div>
</div>
</div>
<div class="col-md-4 col-12">
<p class="mb-0">
<a href="https://www.openstreetmap.org/copyright">Sources du logiciel</a>
</p>
<p class="mb-2">
Sources des données : <a href="https://www.openstreetmap.org/">OpenStreetMap</a>
</p>
</div>
</div>
</div>
</div>
</footer>
{% block javascripts %}
{{ encore_entry_script_tags('app') }}
{# <script src="{{ asset('js/main.js') }}"></script> #}
<!-- JavaScript Bootstrap avec Popper.js -->
{{ encore_entry_script_tags('app') }}
<script src="{{ asset('js/bootstrap/bootstrap.bundle.min.js') }}"></script>
<script src="{{ asset('js/sort-table/sort-table.js') }}"></script>

View file

@ -3,38 +3,33 @@
<fieldset >
<h2>{{ 'display.ask_angela'|trans }}</h2>
<div class="p-4">
<div class="row mb-3">
<div class="col-4">
<img src="https://i0.wp.com/askforangela.co.uk/wp-content/uploads/2022/10/Ask-for-Angela-primary.png?fit=300%2C300&ssl=1" class="img-fluid img-thumbnail mb-3" alt="Image du lieu">
<p class="more-info">
<a href="https://arretonslesviolences.gouv.fr/focus/plan-angela" target="_blank">{{ 'display.ask_angela_more_info'|trans }}</a>
</p>
</div>
<div class="col-6">
<p class="description"><label for="custom__ask_angela">{{ 'display.ask_angela_description'|trans }} </label></p>
<div class="form-check">
<input class="form-check-input" type="radio" name="custom__ask_angela" id="ask_angela_yes" value="ask_angela" {% if commerce_overpass.tags_converted.harassment_prevention is defined and commerce_overpass.tags_converted.harassment_prevention == 'ask_angela' %}checked{% endif %}>
<label class="form-check-label" for="ask_angela_yes">
{{ 'display.ask_angela_yes'|trans }}
</label>
<div class="row mb-3">
<div class="col-2 col-md-3">
<img src="https://i0.wp.com/askforangela.co.uk/wp-content/uploads/2022/10/Ask-for-Angela-primary.png?fit=300%2C300&ssl=1" class="img-fluid img-thumbnail mb-3" alt="Image du lieu">
<p class="more-info">
<a href="https://arretonslesviolences.gouv.fr/focus/plan-angela" target="_blank">{{ 'display.ask_angela_more_info'|trans }}</a>
</p>
</div>
<div class="col-6">
<p class="description">
<label for="custom__ask_angela">
{{ 'display.ask_angela_description'|trans }}
</label>
</p>
<div class="form-check">
<input class="form-check-input" type="radio" name="custom__ask_angela" id="ask_angela_yes" value="ask_angela" {% if commerce_overpass.tags_converted.harassment_prevention is defined and commerce_overpass.tags_converted.harassment_prevention == 'ask_angela' %}checked{% endif %}>
<label class="form-check-label" for="ask_angela_yes">
{{ 'display.ask_angela_yes'|trans }}
</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="custom__ask_angela" id="ask_angela_no" value="" {% if commerce_overpass.tags_converted.harassment_prevention is not defined or commerce_overpass.tags_converted.harassment_prevention == 'no' %}checked{% endif %}>
<label class="form-check-label" for="ask_angela_no">
{{ 'display.ask_angela_no'|trans }}
</label>
</div>
</div>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="custom__ask_angela" id="ask_angela_no" value="" {% if commerce_overpass.tags_converted.harassment_prevention is not defined or commerce_overpass.tags_converted.harassment_prevention == 'no' %}checked{% endif %}>
<label class="form-check-label" for="ask_angela_no">
{{ 'display.ask_angela_no'|trans }}
</label>
</div>
</div>
</div>
</div>
</fieldset>

View file

@ -2,7 +2,7 @@ display:
title: "OSM Mon Commerce"
home: "Accueil"
stats: "Statistiques"
contact_humans: "Contacter les membres d'OSM France pour m'aider"
contact_humans: "Trouver de l'aide"
modify: "Modifier"
welcome: "Modifier ce lieu:"
modify_commerce: "Modifier votre commerce"