diff options
| -rw-r--r-- | package.json | 5 | ||||
| -rw-r--r-- | www/css/style.css | 5 | ||||
| -rw-r--r-- | www/templates/events.html | 9 |
3 files changed, 14 insertions, 5 deletions
diff --git a/package.json b/package.json index c56ffcad..f6423cde 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,10 @@ "ANDROID_GSON_VERSION": "2.8.6" }, "cordova-plugin-advanced-http": {}, - "cordova-plugin-media-pp-fork": {} + "cordova-plugin-media-pp-fork": {}, + "cordova-plugin-ionic-webview": { + "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" + } } }, "dependencies": { diff --git a/www/css/style.css b/www/css/style.css index b280383b..a0a19319 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -1918,7 +1918,10 @@ fill-opacity: 0.8; .smallThumbs { float:right; - display:block; + +} +.no-padding { + padding: 0px !important; } @media (min-width:600px) { diff --git a/www/templates/events.html b/www/templates/events.html index 9112f7a1..088c0b2d 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -54,7 +54,7 @@ <!--row--> <!--<div class="row" style="font-size:80%; color:rgb(110,110,110)">--> <!-- <div class="col">--> - <div class="col"> + <div class="col no-padding"> <div class="item-text-wrap"> <!-- this ngswitch displays different icons depending on the cause of the event --> @@ -86,12 +86,12 @@ <br/><i class="ion-ios-pricetags-outline"></i> {{event.Event.Name}} - <br/><i class="ion-clipboard"></i> {{event.Event.Notes}} + <!-- <br/> Default video:{{event.Event.relativePath}}{{event.Event.DefaultVideo}}--> </div> </div> <!-- col--> - <div class="col"> + <div class="col no-padding"> <div ng-if="loginData.eventViewThumbs!='none'" ng-class="::{'largeThumbs': thumbClass=='large', 'smallThumbs': thumbClass=='small'}"> <img bg-color="#6C7A89" ng-src="{{constructThumbnail(event)}}" on-tap="closeIfOpen(event);openModalWithSnapshot(event)" width="{{event.Event.thumbWidth}}px" height="{{event.Event.thumbHeight}}px" fallback-src="img/noimage.png" /> @@ -99,6 +99,9 @@ </div> <!--</div>--> </div> + <div ng-if="event.Event.Notes" class="row" style="font-size:80%; color:rgb(110,110,110)"> + <i class="ion-clipboard"></i> {{event.Event.Notes}} + </div> <div class="row" style="float:right; margin-right: 10px; display: block;"> <span style="float:right"> <div ng-if="event.Event.EndTime || 1"> |