Chapril/mobilizon.chapril.org-mobilizon
Chapril
/
mobilizon.chapril.org-mobilizon
24
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'event-page-fixes' into 'master' 

Event page fixes

Closes #116, #117 et #118

See merge request framasoft/mobilizon!120
This commit is contained in:
Thomas Citharel 2019-04-24 14:28:33 +02:00
parent 639f726515 ff82cba575
commit bed9843539
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/components/Map.vue
View File

@ -6,7 +6,12 @@
class="leaflet-map" class="leaflet-map"
:center="[lat, lon]" :center="[lat, lon]"
> >
<l-tile-layer url="http://{s}.tile.osm.org/{z}/{x}/{y}.png"></l-tile-layer> <l-tile-layer
url="https://{s}.tile.osm.org/{z}/{x}/{y}.png"
attribution="© OpenStreetMap contributors"
>
</l-tile-layer>
<l-marker :lat-lng="[lat, lon]" > <l-marker :lat-lng="[lat, lon]" >
<l-popup v-if="popup">{{ popup }}</l-popup> <l-popup v-if="popup">{{ popup }}</l-popup>
</l-marker> </l-marker>

14
js/src/views/Event/Event.vue
View File

@ -75,17 +75,11 @@
<span>{{ event.physicalAddress.postal_code }} {{ event.physicalAddress.locality }}</span> <span>{{ event.physicalAddress.postal_code }} {{ event.physicalAddress.locality }}</span>
<!-- <span>{{ event.physicalAddress.region }} {{ event.physicalAddress.country }}</span>--> <!-- <span>{{ event.physicalAddress.region }} {{ event.physicalAddress.country }}</span>-->
</address> </address>
<span class="map-show-button" @click="showMap = !showMap"> <span class="map-show-button" @click="showMap = !showMap" v-if="event.physicalAddress && event.physicalAddress.geom">
<translate>Show map</translate> <translate>Show map</translate>
</span> </span>
</div> </div>
<!-- <div class="map" v-if="showMap">--> <b-modal v-if="event.physicalAddress && event.physicalAddress.geom" :active.sync="showMap" :width="800" scroll="keep">
<!-- <map-leaflet-->
<!-- :coords="event.physicalAddress.geom"-->
<!-- :popup="event.physicalAddress.description"-->
<!-- />-->
<!-- </div>-->
<b-modal v-if="event.physicalAddress" :active.sync="showMap" :width="800" scroll="keep">
<div class="map"> <div class="map">
<map-leaflet <map-leaflet
:coords="event.physicalAddress.geom" :coords="event.physicalAddress.geom"
@ -222,10 +216,10 @@
</div> </div>
</div> </div>
</section> </section>
<section class="more-events container"> <section class="more-events container" v-if="event.relatedEvents.length > 0">
<h3 class="title has-text-centered"><translate>These events may interest you</translate></h3> <h3 class="title has-text-centered"><translate>These events may interest you</translate></h3>
<div class="columns"> <div class="columns">
<div class="column" v-for="relatedEvent in event.relatedEvents" :key="relatedEvent.uuid"> <div class="column is-one-third-desktop" v-for="relatedEvent in event.relatedEvents" :key="relatedEvent.uuid">
<EventCard :event="relatedEvent" /> <EventCard :event="relatedEvent" />
</div> </div>
</div> </div>