diff --git a/view-webapp/src/main/sass/main.scss b/view-webapp/src/main/sass/main.scss index cfe16a7..b94f51f 100644 --- a/view-webapp/src/main/sass/main.scss +++ b/view-webapp/src/main/sass/main.scss @@ -223,7 +223,7 @@ transition: all 0.5s ease-out; &.active { padding: 0.5em 1em 0.5em 2em; - max-height: 600px; + max-height: 150vh; } } @@ -385,7 +385,6 @@ align-items: stretch; justify-content: start; text-align: justify; - max-height: inherit; } .popup-footer { margin-top: 1em; diff --git a/view-webapp/src/main/webapp/index.html b/view-webapp/src/main/webapp/index.html index e1155e8..eec2302 100644 --- a/view-webapp/src/main/webapp/index.html +++ b/view-webapp/src/main/webapp/index.html @@ -9,11 +9,27 @@
-#foreach($tour in $api.get('tour').entrySet()) +#set($files = $api.get('tour')) +$log.info("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@") +$log.info($files) +#if($files.containsKey('error')) + #set($error = $files.error) +#elseif($files.containsKey('message')) + #set($error = $files.message) +#end +#if($error) + +#else + #foreach($tour in $files.entrySet()) $tour.value + #end #end