diff options
| -rw-r--r-- | www/css/style.css | 5 | ||||
| -rw-r--r-- | www/js/MomentCtrl.js | 4 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 2 | ||||
| -rw-r--r-- | www/templates/image-modal.html | 2 | ||||
| -rw-r--r-- | www/templates/moment.html | 7 |
5 files changed, 10 insertions, 10 deletions
diff --git a/www/css/style.css b/www/css/style.css index f7dd5511..d1902a73 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -259,13 +259,12 @@ figcaption { font-size: 80%; } + .normal-subfigcaption { - background: rgba(0, 0, 0, 0.2); color: #FFF; position: absolute; bottom: 20px; - left: 0; - right: 0; + right: 0; opacity: 1; font-size: 80%; } diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js index 2b7d6f40..c6e84953 100644 --- a/www/js/MomentCtrl.js +++ b/www/js/MomentCtrl.js @@ -265,7 +265,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ $scope.isChecked=function(val) { //console.log ("COMPARE"); return $translate.instant(val) == $scope.type; - } + }; $scope.showPopover = function($event) { @@ -276,7 +276,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ popover.show($event); }); - } + }; //---------------------------------------------------------------- // Pinning a thumbnail means don't collapse it. Useful to drill diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index e8324463..60277461 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -210,7 +210,7 @@ "kMinVersion" :"Minimum Required Version", "kMinimumIntervals" :"minimum interval", "kMode" :"Mode", - "kMoment24Heading" :"24hr", + "kMoment24Heading" :"24hr Preview", "kMomentLoadError" :"Error retrieving moments", "kMomentMenuByMonitor" :"by camera", "kMomentMenuByTime" :"by time", diff --git a/www/templates/image-modal.html b/www/templates/image-modal.html index a682a8e6..2ac07f40 100644 --- a/www/templates/image-modal.html +++ b/www/templates/image-modal.html @@ -5,7 +5,7 @@ <div id="imagecontainer"> <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%;" overflow-scroll="false"> - <img style="width:100vw; height:100vh;" on-double-tap="closeModal();" ng-src="{{thumbnailLarge}}" style="display:block; width:100%" /> + <img on-double-tap="closeModal();" ng-src="{{thumbnailLarge}}" style="display:block; width:100%;" /> </ion-scroll> </div> diff --git a/www/templates/moment.html b/www/templates/moment.html index d2bbe8d8..c00bf35e 100644 --- a/www/templates/moment.html +++ b/www/templates/moment.html @@ -98,12 +98,13 @@ img-spinner-w="{{moment.Event.width}}" img-spinner-h="{{moment.Event.height}}" image-spinner-loader="lines" on-tap="playEvent(moment)" /> - <figcaption ng-if="showIcons" class="normal-subfigcaption"> - <span style="float:right"> + <div ng-if="showIcons" class="normal-subfigcaption" > + <button ng-class="moment.Event.pinned? 'button button-small button-icon icon ion-ios-flag assertive': 'button button-small button-icon icon ion-pin'" ng-click="togglePin(moment.Event.Id)"></button> - </figcaption> + + </div> <!--on-tap="showThumbnail(moment.Event.baseURL,moment.Event.MaxScoreFrameId)"--> <figcaption ng-if="showIcons" class="normal-figcaption"> {{moment.Event.humanizeTime}} <span style="float:right">{{hourmin(moment.Event.StartTime)}} </span> |