keep flashy map icon in feed
This commit is contained in:
@@ -20,12 +20,14 @@ track_off-track = Off-track
|
|||||||
track_hitchhiking = Hitchhiking
|
track_hitchhiking = Hitchhiking
|
||||||
track_download = Download GPX Track
|
track_download = Download GPX Track
|
||||||
|
|
||||||
upload_title = Picture & Video Uploads
|
upload_media_title = Picture & Video Uploads
|
||||||
|
upload_pos_title = Additional Position
|
||||||
upload_mode_archived= Project "$0" is archived. No upload allowed
|
upload_mode_archived= Project "$0" is archived. No upload allowed
|
||||||
upload_success = $0 uploaded successfully
|
upload_success = $0 uploaded successfully
|
||||||
upload_media_exist = Picture $0 already exists
|
upload_media_exist = Picture $0 already exists
|
||||||
new_position = New Position
|
new_position = New Position
|
||||||
|
|
||||||
|
|
||||||
post_message = Message
|
post_message = Message
|
||||||
post_name = Name
|
post_name = Name
|
||||||
post_new_message = New message
|
post_new_message = New message
|
||||||
|
|||||||
@@ -20,7 +20,8 @@ track_off-track = Variante
|
|||||||
track_hitchhiking = Autostop
|
track_hitchhiking = Autostop
|
||||||
track_download = Descarga la ruta GPX
|
track_download = Descarga la ruta GPX
|
||||||
|
|
||||||
upload_title = Cargar fotos y videos
|
upload_media_title = Cargar fotos y videos
|
||||||
|
upload_pos_title = Subir posición
|
||||||
upload_mode_archived= El proyecto "$0" esta archivado. No se puede cargar
|
upload_mode_archived= El proyecto "$0" esta archivado. No se puede cargar
|
||||||
upload_success = $0 ha sido subido
|
upload_success = $0 ha sido subido
|
||||||
upload_media_exist = La imagen $0 ya existe
|
upload_media_exist = La imagen $0 ya existe
|
||||||
|
|||||||
@@ -20,7 +20,8 @@ track_off-track = Variante
|
|||||||
track_hitchhiking = Hors rando
|
track_hitchhiking = Hors rando
|
||||||
track_download = Télécharger la trace GPX
|
track_download = Télécharger la trace GPX
|
||||||
|
|
||||||
upload_title = Uploader photos & vidéos
|
upload_media_title = Uploader photos & vidéos
|
||||||
|
upload_pos_title = Position supplémentaire
|
||||||
upload_mode_archived= Le projet "$0" a été archivé. Aucun upload possible
|
upload_mode_archived= Le projet "$0" a été archivé. Aucun upload possible
|
||||||
upload_success = $0 a été uploadé
|
upload_success = $0 a été uploadé
|
||||||
upload_media_exist = l'image $0 existe déjà
|
upload_media_exist = l'image $0 existe déjà
|
||||||
|
|||||||
@@ -560,8 +560,9 @@ export default {
|
|||||||
+ window.pageYOffset
|
+ window.pageYOffset
|
||||||
- parseFloat(getComputedStyle(this.$refs.feedSimpleBar.$el).paddingTop)
|
- parseFloat(getComputedStyle(this.$refs.feedSimpleBar.$el).paddingTop)
|
||||||
);
|
);
|
||||||
bFound = true;
|
aoRefs[0].executeMainAction();
|
||||||
this.spot.flushHash(['post', 'message']);
|
this.spot.flushHash(['post', 'message']);
|
||||||
|
bFound = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return bFound;
|
return bFound;
|
||||||
|
|||||||
@@ -23,6 +23,11 @@ export default {
|
|||||||
this.$refs[this.type=='marker'?'takenon':'postedon'].outerHTML +
|
this.$refs[this.type=='marker'?'takenon':'postedon'].outerHTML +
|
||||||
this.$refs[this.type=='marker'?'postedon':'takenon'].outerHTML
|
this.$refs[this.type=='marker'?'postedon':'takenon'].outerHTML
|
||||||
;
|
;
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
openMedia() {
|
||||||
|
this.$refs.link.click();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@@ -36,6 +41,7 @@ export default {
|
|||||||
:data-id="options.id_media"
|
:data-id="options.id_media"
|
||||||
:data-title="title"
|
:data-title="title"
|
||||||
:data-orientation="options.rotate"
|
:data-orientation="options.rotate"
|
||||||
|
ref="link"
|
||||||
>
|
>
|
||||||
<img
|
<img
|
||||||
:src="options.thumb_path"
|
:src="options.thumb_path"
|
||||||
|
|||||||
@@ -109,6 +109,16 @@
|
|||||||
this.sending = false;
|
this.sending = false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
executeMainAction() {
|
||||||
|
switch(this.options.type) {
|
||||||
|
case 'message':
|
||||||
|
this.panMapToMessage();
|
||||||
|
break;
|
||||||
|
case 'media':
|
||||||
|
this.$refs.medialink.openMedia();
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
@@ -156,7 +166,7 @@
|
|||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div v-else-if="options.type == 'media'" class="body-box">
|
<div v-else-if="options.type == 'media'" class="body-box">
|
||||||
<projectMediaLink :options="options" :type="'post'" />
|
<projectMediaLink :options="options" :type="'post'" ref="medialink" />
|
||||||
</div>
|
</div>
|
||||||
<div v-else-if="options.type == 'post'">
|
<div v-else-if="options.type == 'post'">
|
||||||
<p class="message">{{ options.content }}</p>
|
<p class="message">{{ options.content }}</p>
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ export default {
|
|||||||
<template>
|
<template>
|
||||||
<div id="upload">
|
<div id="upload">
|
||||||
<a name="back" class="button" href="#project"><SpotIcon :icon="'back'" :text="spot.lang('nav_back')" /></a>
|
<a name="back" class="button" href="#project"><SpotIcon :icon="'back'" :text="spot.lang('nav_back')" /></a>
|
||||||
<h1>{{ spot.lang('upload_title') }}</h1>
|
<h1>{{ spot.lang('upload_media_title') }}</h1>
|
||||||
<h2>{{ this.project.name }}</h2>
|
<h2>{{ this.project.name }}</h2>
|
||||||
<div class="section" v-if="project.editable">
|
<div class="section" v-if="project.editable">
|
||||||
<input id="fileupload" type="file" name="files[]" :data-url="this.spot.getActionLink('upload')" multiple />
|
<input id="fileupload" type="file" name="files[]" :data-url="this.spot.getActionLink('upload')" multiple />
|
||||||
@@ -90,6 +90,7 @@ export default {
|
|||||||
<SpotButton :classes="'save'" :icon="'save'" :text="spot.lang('save')" @click="addComment(file)" />
|
<SpotButton :classes="'save'" :icon="'save'" :text="spot.lang('save')" @click="addComment(file)" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<h1>{{ spot.lang('upload_pos_title') }}</h1>
|
||||||
<div class="section location">
|
<div class="section location">
|
||||||
<SpotButton :icon="'message'" :text="spot.lang('new_position')" @click="addPosition()" />
|
<SpotButton :icon="'message'" :text="spot.lang('new_position')" @click="addPosition()" />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -38,10 +38,13 @@ $download-hover: #0078A8;
|
|||||||
|
|
||||||
//Legend colors
|
//Legend colors
|
||||||
$legend: $default;
|
$legend: $default;
|
||||||
|
$main-track: #00ff78;
|
||||||
|
$off-track: #0000ff;
|
||||||
|
$hitchhiking: #ff7814;
|
||||||
|
|
||||||
//Tracks
|
//Tracks
|
||||||
$track-start: $message;
|
$track-start: $main-track;
|
||||||
$track-end: #FF7814;
|
$track-end: $hitchhiking;
|
||||||
|
|
||||||
//Loader
|
//Loader
|
||||||
$loader: $default-bg;
|
$loader: $default-bg;
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
button[name=submit] {
|
button[name=submit] {
|
||||||
margin-left: 1em;
|
margin-left: 1em;
|
||||||
margin-bottom: 0.5em;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -146,8 +146,12 @@ $panel-actual-width: min($panel-width, #{$panel-width-max});
|
|||||||
color: color.$default;
|
color: color.$default;
|
||||||
}
|
}
|
||||||
|
|
||||||
&:hover .fa {
|
&:hover {
|
||||||
color: color.$default-hover;
|
background-color: color.$default-inv-bg;
|
||||||
|
|
||||||
|
.fa {
|
||||||
|
color: color.$default-inv;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,8 +38,8 @@
|
|||||||
.fa-stack {
|
.fa-stack {
|
||||||
.fa-message {
|
.fa-message {
|
||||||
font-size: 32px;
|
font-size: 32px;
|
||||||
text-shadow: rgba(0, 0, 0, 0.5) 3px 3px 3px;
|
text-shadow: color.$over-img-shadow 3px 3px 3px;
|
||||||
color: color.$message-bg;
|
color: color.$main-track;
|
||||||
}
|
}
|
||||||
.fa-message-in {
|
.fa-message-in {
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
|
|||||||
Reference in New Issue
Block a user