add picture comment on lightbox fullscreen

This commit is contained in:
2021-11-07 11:00:24 +01:00
parent 3e981ae634
commit af901f3c77
7 changed files with 59 additions and 32 deletions

View File

@@ -177,7 +177,7 @@ function initPage(asHash) {
fadeDuration: 300, fadeDuration: 300,
imageFadeDuration: 400, imageFadeDuration: 400,
positionFromTop: 0, positionFromTop: 0,
resizeDuration: 600, resizeDuration: 400,
hasVideo: true hasVideo: true
}); });
@@ -954,6 +954,11 @@ function getWmtsApiUrl(sMapId, iLat, iLng, iZoom) {
function getMediaLink(asData, sType) { function getMediaLink(asData, sType) {
var bTimeDiff = (asData.posted_on_formatted && asData.posted_on_formatted_local != asData.posted_on_formatted); var bTimeDiff = (asData.posted_on_formatted && asData.posted_on_formatted_local != asData.posted_on_formatted);
var $Comment = (!asData.comment || asData.comment == '')?'':
$('<span>', {'class': 'lb-caption-line comment', 'title': asData.comment})
.addIcon('fa-post fa-lg fa-fw', true)
.append(asData.comment);
var $PostedOn = var $PostedOn =
$('<span>', {'class': 'lb-caption-line', title: bTimeDiff?oSpot.lang('local_time', asData.posted_on_formatted_local):''}) $('<span>', {'class': 'lb-caption-line', title: bTimeDiff?oSpot.lang('local_time', asData.posted_on_formatted_local):''})
.addIcon('fa-upload fa-lg fa-fw', true) .addIcon('fa-upload fa-lg fa-fw', true)
@@ -964,7 +969,7 @@ function getMediaLink(asData, sType) {
.addIcon('fa-'+asData.subtype+'-shot fa-lg fa-fw', true) .addIcon('fa-'+asData.subtype+'-shot fa-lg fa-fw', true)
.append(asData.taken_on_formatted); .append(asData.taken_on_formatted);
var $Title = $('<div>').append(sType=='marker'?$TakenOn:$PostedOn).append(sType=='marker'?$PostedOn:$TakenOn); var $Title = $('<div>').append($Comment).append(sType=='marker'?$TakenOn:$PostedOn).append(sType=='marker'?$PostedOn:$TakenOn);
var $Link = var $Link =
$('<a>', { $('<a>', {
'class': 'drill', 'class': 'drill',

View File

@@ -41,6 +41,12 @@
-webkit-filter: drop-shadow(1px 0px 0px rgba(0, 0, 0, $opacity)); -webkit-filter: drop-shadow(1px 0px 0px rgba(0, 0, 0, $opacity));
} }
@mixin no-text-overflow() {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
@keyframes spotlogo { @keyframes spotlogo {
0% { 0% {
transform: scale(1); transform: scale(1);

View File

@@ -19,7 +19,7 @@
justify-content: center; justify-content: center;
width: 100%; width: 100%;
height: 100%; height: 100%;
&.vertical { &.vertical {
flex-direction: column; flex-direction: column;
@@ -29,16 +29,24 @@
.lb-data { .lb-data {
.lb-details { .lb-details {
display: inline; display: inline-block;
width: calc(100% - 1.25rem);
.lb-caption-line { .lb-caption {
padding-right: 1em; .lb-caption-line {
display: inline-block;
padding-right: 1em;
line-height: 1.33333333333em; //icon height
overflow: hidden;
&.comment {
max-width: 50%;
}
}
} }
} }
.lb-closeContainer { .lb-closeContainer {
display: inline;
.lb-close { .lb-close {
text-align: right; text-align: right;
} }
@@ -57,16 +65,20 @@
.lb-caption-line { .lb-caption-line {
display: block; display: block;
margin-top: 1em; margin-top: 1em;
line-height: 1.33333333em;
} }
.lb-closeContainer .lb-close { .lb-closeContainer .lb-close {
margin-top: 1em; margin-top: 1em;
float: none; float: none;
text-align: left;
} }
} }
} }
} }
/* Image */
.lb-outerContainer { .lb-outerContainer {
margin: 0; margin: 0;
border-radius:0; border-radius:0;
@@ -124,7 +136,8 @@
} }
} }
} }
/* Titles */
.lb-dataContainer { .lb-dataContainer {
margin: 0; margin: 0;
padding: 0; padding: 0;
@@ -133,27 +146,34 @@
.lb-data { .lb-data {
text-align: left; text-align: left;
padding: 0.5em; padding: 0.5rem 0.5rem 0 0.5rem;
.lb-details { .lb-details {
float: none; float: none;
.lb-caption-line { .lb-caption-line {
cursor: default; cursor: default;
&:first-child {
margin-top: 0;
}
&.comment {
@include no-text-overflow();
}
} }
.lb-caption-line:first-child {
margin-top: 0;
}
.lb-number { .lb-number {
display: none !important; display: none !important;
} }
} }
.lb-closeContainer { .lb-closeContainer {
color: white; color: white;
font-size: 13px; font-size: 1em;
line-height: 1em; line-height: 1em;
width: 1.25em;
vertical-align: top;
display: inline-block;
.lb-close { .lb-close {
@include lightbox-icon(close); @include lightbox-icon(close);
@@ -161,7 +181,7 @@
width: 1.25em; width: 1.25em;
height: auto; height: auto;
font-size: 1.3333333333em; font-size: 1.3333333333em;
text-align: center; line-height: 1em;
} }
} }
} }

View File

@@ -213,9 +213,7 @@ $legend-color: $post-color;
} }
h1, .description { h1, .description {
text-overflow: ellipsis; @include no-text-overflow();
overflow: hidden;
white-space: nowrap;
} }
.body { .body {
padding-left: calc(1.25em*1.4 + #{$elem-spacing} ); padding-left: calc(1.25em*1.4 + #{$elem-spacing} );
@@ -303,9 +301,7 @@ $legend-color: $post-color;
} }
#title { #title {
text-overflow: ellipsis; @include no-text-overflow();
overflow: hidden;
white-space: nowrap;
line-height: $button-width; line-height: $button-width;
height: $button-width; height: $button-width;
padding: 0 $block-spacing; padding: 0 $block-spacing;
@@ -491,9 +487,7 @@ $legend-color: $post-color;
display: inline-block; display: inline-block;
cursor: default; cursor: default;
font-size: 0.8em; font-size: 0.8em;
text-overflow: ellipsis; @include no-text-overflow();
overflow: visible;
white-space: nowrap;
padding: $elem-spacing 0px; padding: $elem-spacing 0px;
&.index { &.index {
@@ -790,9 +784,7 @@ $legend-color: $post-color;
cursor: pointer; cursor: pointer;
& > div { & > div {
text-overflow: ellipsis; @include no-text-overflow();
overflow: hidden;
white-space: nowrap;
} }
} }

View File

@@ -3,7 +3,7 @@
$panel-width: "100vw - #{$button-width} - 2 * #{$block-spacing}"; $panel-width: "100vw - #{$button-width} - 2 * #{$block-spacing}";
.desktop { .desktop {
display: none; display: none !important;
} }
#projects { #projects {
@@ -67,10 +67,14 @@
text-align: center; text-align: center;
} }
} }
.lightbox.vertical .lb-dataContainer .lb-data .lb-details .lb-caption-line.comment {
display: none;
}
} }
@media only screen and (min-width: 801px) { @media only screen and (min-width: 801px) {
.mobile { .mobile {
display: none; display: none !important;
} }
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long