coopgo-apps
/
parcoursmob-default-theme
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: coopgo-apps:main
Branches Tags
coopgo-apps:main
coopgo-apps:spie06
coopgo-apps:solidarity-transport-dev
coopgo-apps:diags
coopgo-apps:silvermobi
coopgo-apps:dev
coopgo-apps:AddDiagDate
coopgo-apps:addKilometersOnVehicle
coopgo-apps:showPiecesInReservation
coopgo-apps:addDocsInEvent
coopgo-apps:mika
coopgo-apps:deleteVehicleReservation
coopgo-apps:modifyVehicle
coopgo-apps:FixAddressBeneficiary
coopgo-apps:fixMultipleReservationV
coopgo-apps:addStatistiques
coopgo-apps:vehicleList
coopgo-apps:modifyAnEvent
coopgo-apps:deleteMembersInAnAgenda
coopgo-apps:addInfoInCovoiturage
coopgo-apps:themeCovoiturage
..
compare: coopgo-apps:solidarity-transport-dev
Branches Tags
coopgo-apps:spie06
coopgo-apps:main
coopgo-apps:solidarity-transport-dev
coopgo-apps:diags
coopgo-apps:silvermobi
coopgo-apps:dev
coopgo-apps:AddDiagDate
coopgo-apps:addKilometersOnVehicle
coopgo-apps:showPiecesInReservation
coopgo-apps:addDocsInEvent
coopgo-apps:mika
coopgo-apps:deleteVehicleReservation
coopgo-apps:modifyVehicle
coopgo-apps:FixAddressBeneficiary
coopgo-apps:fixMultipleReservationV
coopgo-apps:addStatistiques
coopgo-apps:vehicleList
coopgo-apps:modifyAnEvent
coopgo-apps:deleteMembersInAnAgenda
coopgo-apps:addInfoInCovoiturage
coopgo-apps:themeCovoiturage

No commits in common. "main" and "solidarity-transport-dev" have entirely different histories.
main ... solidarity

5 changed files with 35 additions and 11 deletions
Show Stats Expand all files Collapse all files

2
web/layouts/administration/bookings_stats.html
View File

@ -8,7 +8,7 @@
</div>
<div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
<a href="/exports/fleets/bookings">
<a href="/app/administration/stats/bookings/export">
<button type="button"
class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
Export

5
web/layouts/beneficiaries/display.html
View File

@ -40,7 +40,6 @@
</div>
<div class="border-t border-gray-200 px-4 py-5 sm:px-6">
<dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
{{if moduleAvailable "solidarity_transport"}}
<div class="sm:col-span-1">
<dt class="text-sm font-medium text-gray-500">Profil validé</dt>
<dd class="mt-1 text-sm text-gray-900">
@ -51,7 +50,6 @@
{{end}}
</dd>
</div>
{{end}}
{{if .ViewState.beneficiary.Data.email}}
<div class="sm:col-span-1">
<dt class="text-sm font-medium text-gray-500">Email</dt>
@ -177,13 +175,12 @@
:class="tab == 'documents' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
Documents </a>
{{if moduleAvailable "solidarity_transport"}}
<a href="#" @click="tab = 'wallet'"
class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
:class="tab == 'wallet' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
Compte mobilité </a>
<a href="#" @click="tab = 'solidarity_transport'"
{{if moduleAvailable "solidarity_transport"}}<a href="#" @click="tab = 'solidarity_transport'"
class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
:class="tab == 'solidarity_transport' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
Transport solidaire </a>

7
web/layouts/dashboard/_partials/bookings-widget.html
View File

@ -1,9 +1,12 @@
{{define "bookings_widget"}}
<!--<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
<div class="-ml-4 -mt-2 px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
<div class="ml-4 mt-2">
<h3 class="text-lg leading-6 font-medium text-gray-900">Prochaines réservations</h3>
</div>
<!-- <div class="ml-4 mt-2 flex-shrink-0">
<button type="button" class="relative inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Voir</button>
</div> -->
</div>
<ul role="list" class="divide-y divide-gray-200 flex-1">
{{range .}}
@ -25,5 +28,5 @@
Reservation des véhicules
</button>
</a>
</div>-->
</div>
{{end}}

4
web/layouts/vehicles_management/booking-display.html
View File

@ -189,11 +189,11 @@
<dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
{{.ViewState.vehicle.Data.licence_plate}}</dd>
</div>
<!--<div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
<div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
<dt class="text-sm font-medium text-gray-500">Kilométrage</dt>
<dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
{{.ViewState.vehicle.Data.kilometers}} km</dd>
</div>-->
</div>
<div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
<dt class="text-sm font-medium text-gray-500">Type</dt>
<dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">

24
web/public/css/main.css
View File

@ -454,6 +454,9 @@
.mx-auto {
margin-inline: auto;
}
.-my-1 {
margin-block: calc(var(--spacing) * -1);
}
.-my-1\.5 {
margin-block: calc(var(--spacing) * -1.5);
}
@ -502,6 +505,9 @@
.mt-10 {
margin-top: calc(var(--spacing) * 10);
}
.-mr-1 {
margin-right: calc(var(--spacing) * -1);
}
.-mr-1\.5 {
margin-right: calc(var(--spacing) * -1.5);
}
@ -697,15 +703,27 @@
.max-h-screen {
max-height: 100vh;
}
.min-h-10 {
min-height: calc(var(--spacing) * 10);
}
.min-h-50 {
min-height: calc(var(--spacing) * 50);
}
.min-h-full {
min-height: 100%;
}
.min-h-screen {
min-height: 100vh;
}
.w-0 {
width: calc(var(--spacing) * 0);
}
.w-0\.5 {
width: calc(var(--spacing) * 0.5);
}
.w-1 {
width: calc(var(--spacing) * 1);
}
.w-1\/2 {
width: calc(1/2 * 100%);
}
@ -742,6 +760,9 @@
.w-48 {
width: calc(var(--spacing) * 48);
}
.w-50 {
width: calc(var(--spacing) * 50);
}
.w-100 {
width: calc(var(--spacing) * 100);
}
@ -1940,6 +1961,9 @@
.py-12 {
padding-block: calc(var(--spacing) * 12);
}
.pt-1 {
padding-top: calc(var(--spacing) * 1);
}
.pt-1\.5 {
padding-top: calc(var(--spacing) * 1.5);
}