diff options
Diffstat (limited to 'www/templates/montage-history.html')
| -rw-r--r-- | www/templates/montage-history.html | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html index 35a8948b..7c57a9df 100644 --- a/www/templates/montage-history.html +++ b/www/templates/montage-history.html @@ -25,12 +25,12 @@ - <div class="timeline_text" ion-datetime-picker title="From" am-pm ng-model="datetimeValueFrom.value" ng-change="dateChanged()"> - <b>From: </b>{{datetimeValueFrom.value | date: "yyyy-MMM-dd hh:mma"}} + <div class="timeline_text" ion-datetime-picker title="From" ng-attr-am-pm="!loginData.use24hr" ng-model="datetimeValueFrom.value" ng-change="dateChanged()"> + <b>From: </b>{{datetimeValueFrom.value | date: timeFormat}} </div> - <div class="timeline_text" ion-datetime-picker am-pm ng-model="datetimeValueTo.value" ng-change="dateChanged()"> - <b>To: </b>{{datetimeValueTo.value | date: "yyyy-MMM-dd hh:mma"}} @ {{sliderVal.rate}}x + <div class="timeline_text" ion-datetime-picker ng-attr-am-pm="!loginData.use24hr" ng-model="datetimeValueTo.value" ng-change="dateChanged()"> + <b>To: </b>{{datetimeValueTo.value | date: timeFormat}} @ {{sliderVal.rate}}x <div ng-if="$root.platformOS != 'ios'">(max of 5 monitors - chrome limit)</div> </div> @@ -178,14 +178,14 @@ <div class="item item-divider">Timeline</div> <ion-item> - <div ion-datetime-picker title="From" am-pm ng-model="datetimeValueFrom.value"> - <b>From: </b>{{datetimeValueFrom.value | date: "MMM-dd-yyyy hh:mma"}} + <div ion-datetime-picker title="From" ng-attr-am-pm="!loginData.use24hr" ng-model="datetimeValueFrom.value"> + <b>From: </b>{{datetimeValueFrom.value | date: timeFormat}} </div> </ion-item> <ion-item> - <div ion-datetime-picker am-pm ng-model="datetimeValueTo.value"> - <b>To: </b>{{datetimeValueTo.value | date: "MMM-dd-yyyy hh:mma"}} + <div ion-datetime-picker ng-attr-am-pm="!loginData.use24hr" ng-model="datetimeValueTo.value"> + <b>To: </b>{{datetimeValueTo.value | date: timeFormat}} </div> </ion-item> |