sora/OTM
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

dev #160

Merged
sora merged 97 commits from dev into master 2025-03-02 01:09:30 +01:00
Conversation 0 Commits 97 Files Changed 67 +13 -13
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b3867d42b3 - Show all commits

26
template/module/map.pug
View File

@ -1,6 +1,6 @@
l-map( l-map(
:zoom.sync="journey_data.main[idx].map.zoom", :zoom.sync="journey.data.main[idx].map.zoom",
:center.sync="journey_data.main[idx].map.center", :center.sync="journey.data.main[idx].map.center",
style="padding-top: 100%" style="padding-top: 100%"
) )
l-tile-layer( l-tile-layer(
@ -9,30 +9,30 @@ l-map(
) )
l-control-scale(position="topright", :imperial="false", :metric="true") l-control-scale(position="topright", :imperial="false", :metric="true")
l-marker( l-marker(
v-if="journey_data.main[idx].hotel", v-if="journey.data.main[idx].hotel",
:lat-lng="journey_data.main[idx].hotel.latlon" :lat-lng="journey.data.main[idx].hotel.latlon"
) )
l-icon l-icon
div(v-html="generate_icon(journey_data.main[idx].hotel, 'darkblue')") div(v-html="generate_icon(journey.data.main[idx].hotel, 'darkblue')")
l-popup l-popup
h1.row.text-medium.text-center {{ journey_data.main[idx].hotel.sname }} h1.row.text-medium.text-center {{ journey.data.main[idx].hotel.sname }}
span.row.text-small.text-gray {{ journey_data.main[idx].hotel.display_name }} span.row.text-small.text-gray {{ journey.data.main[idx].hotel.display_name }}
span(v-if="journey_edit") span(v-if="journey_edit")
.row.input .row.input
textarea-autosize.col-12.col-sm-12.text-small( textarea-autosize.col-12.col-sm-12.text-small(
placeholder="Notes", placeholder="Notes",
v-model="journey_data.main[idx].hotel.notes", v-model="journey.data.main[idx].hotel.notes",
:min-height="30", :min-height="30",
:max-height="350" :max-height="350"
) )
span.row.text-small.text-white(v-else) {{ journey_data.main[idx].hotel.notes }} span.row.text-small.text-white(v-else) {{ journey.data.main[idx].hotel.notes }}
l-marker( l-marker(
v-for="place in journey_data.main[idx].places.activities", v-for="place in journey.data.main[idx].places.activities",
:lat-lng="place.latlon" :lat-lng="place.latlon"
) )
l-icon l-icon
div( div(
v-if="place.step == journey_step_data.day", v-if="place.step == journey.sel_day",
v-html="generate_icon(place)" v-html="generate_icon(place)"
) )
div( div(
@ -60,12 +60,12 @@ l-map(
a.leaflet-popup-close-button.text-gray( a.leaflet-popup-close-button.text-gray(
style="right: 16px; visibility: visible", style="right: 16px; visibility: visible",
href="#ad", href="#ad",
v-on:click.prevent="place.step = journey_step_data.day" v-on:click.prevent="place.step = journey.sel_day"
) + ) +
span.row.text-small.text-dark(v-else) {{ place.notes }} span.row.text-small.text-dark(v-else) {{ place.notes }}
l-marker( l-marker(
v-for="place in journey_data.main[idx].places.restaurants", v-for="place in journey.data.main[idx].places.restaurants",
:lat-lng.sync="place.latlon" :lat-lng.sync="place.latlon"
) )
l-icon l-icon