summaryrefslogtreecommitdiff
path: root/www/templates
diff options
context:
space:
mode:
Diffstat (limited to 'www/templates')
-rw-r--r--www/templates/montage.html6
-rw-r--r--www/templates/timeline.html2
2 files changed, 4 insertions, 4 deletions
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 6a877936..139799e7 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -18,13 +18,13 @@
<button class="button button-icon button-clear ion-monitor" ng-click="cast();">&nbsp;
</button>
-->
- <!--<button class="button button-icon button-clear ion-loop" ng-click="resetSizes();">&nbsp;
- </button>-->
+ <button class="button button-icon button-clear ion-loop" ng-click="resetSizes();">&nbsp;
+ </button>
<button class="button button-icon button-clear ion-android-contract" ng-click="switchMinimal()">
</button>
</ion-nav-buttons>
<ion-content ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" overflow-scroll="false">
- <!--<ion-content scroll-sista ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" overflow-scroll="false">-->
+
<div ng-if="areImagesLoading" class="screen-note">&nbsp;{{ 'kArrangingImages' | translate }}...&nbsp;</div>
diff --git a/www/templates/timeline.html b/www/templates/timeline.html
index 87785fe8..80f83e8a 100644
--- a/www/templates/timeline.html
+++ b/www/templates/timeline.html
@@ -17,7 +17,7 @@
<button class="button button-icon button-clear ion-log-out" ng-click="zoom(0.2)"></button>&nbsp;-->
</ion-nav-buttons>
<!--<ion-content data-tap-disabled="true">-->
- <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
+ <ion-content delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
<div style="padding-left:15px; font-size:10px; color:grey">
{{prettify(fromDate)}} - {{prettify(toDate)}} &nbsp;{{tzAbbr}}&nbsp; ({{'kTimelineOnlyDisplaying1' | translate:translationData}})
<strong>