diff options
39 files changed, 57 insertions, 57 deletions
| Binary files differ @@ -17,7 +17,7 @@ "tests" ], "devDependencies": { - "ionic": "driftyco/ionic-bower#1.2.4" + "ionic": "driftyco/ionic-bower#1.3.5" }, "dependencies": { "angular-animate": "1.4.3", @@ -8,15 +8,8 @@ Pliable Pixels </author> <content src="index.html" /> - <allow-intent href="*" /> - <access origin="*" /> - <allow-navigation href="http://ionic.local/*" /> - <allow-intent href="http://*/*" /> - <allow-intent href="https://*/*" /> - <allow-intent href="tel:*" /> - <allow-intent href="sms:*" /> + <access launch-external="yes" origin="mailto:*" /> <allow-intent href="mailto:*" /> - <allow-intent href="geo:*" /> <allow-navigation href="*" /> <preference name="AndroidPersistentFileLocation" value="Compatibility" /> <preference name="iosPersistentFileLocation" value="Library" /> @@ -103,7 +96,7 @@ <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" /> </platform> <icon src="resources/android/icon/drawable-xhdpi-icon.png" /> - <preference name="SplashShowOnlyFirstTime" value="true" /> + <preference name="SplashShowOnlyFirstTime" value="false" /> <engine name="android" spec="^6.2.3" /> <engine name="ios" spec="^4.4.0" /> <plugin name="com.telerik.plugins.nativepagetransitions" spec="^0.6.5" /> diff --git a/package-lock.json b/package-lock.json index fba6ff28..91216f3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -775,7 +775,7 @@ "integrity": "sha1-dzzRNjwfO6y5kBZj6eN5PdPgoZ0=" }, "cordova-plugin-statusbar": { - "version": "git+https://github.com/apache/cordova-plugin-statusbar.git#fff289c0b8a7d0eb5b94f06d8ace9733054185bd" + "version": "git+https://github.com/apache/cordova-plugin-statusbar.git#4642be07a60503341ea0cd4f7e865fde8c57d4f8" }, "cordova-plugin-touchid": { "version": "0.4.0", diff --git a/package.json b/package.json index c1e390d2..2b65f7a4 100644 --- a/package.json +++ b/package.json @@ -49,11 +49,11 @@ "phonegap-plugin-push": { "SENDER_ID": "710936220256" }, - "cordova-plugin-statusbar": {}, "cordova-custom-config": {}, "cordova.plugins.diagnostic": {}, "cordova-plugin-email": {}, - "cordova-plugin-certificates": {} + "cordova-plugin-certificates": {}, + "cordova-plugin-statusbar": {} } }, "dependencies": { diff --git a/resources/ios/icon/icon-1024.png b/resources/ios/icon/icon-1024.png Binary files differindex aec06d7b..ec6a5cf1 100644 --- a/resources/ios/icon/icon-1024.png +++ b/resources/ios/icon/icon-1024.png diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png Binary files differindex b0fd082b..0610fd0e 100644 --- a/resources/ios/icon/icon-40.png +++ b/resources/ios/icon/icon-40.png diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png Binary files differindex c5dc13d8..eead7eb2 100644 --- a/resources/ios/icon/icon-40@2x.png +++ b/resources/ios/icon/icon-40@2x.png diff --git a/resources/ios/icon/icon-40@3x.png b/resources/ios/icon/icon-40@3x.png Binary files differindex 75c4c8fa..3094ec35 100644 --- a/resources/ios/icon/icon-40@3x.png +++ b/resources/ios/icon/icon-40@3x.png diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png Binary files differindex 511f7305..2563113b 100644 --- a/resources/ios/icon/icon-50.png +++ b/resources/ios/icon/icon-50.png diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png Binary files differindex 959f0cef..d0ecfa47 100644 --- a/resources/ios/icon/icon-50@2x.png +++ b/resources/ios/icon/icon-50@2x.png diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png Binary files differindex 7bc0bc73..65776c24 100644 --- a/resources/ios/icon/icon-60.png +++ b/resources/ios/icon/icon-60.png diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png Binary files differindex 1da94e49..3094ec35 100644 --- a/resources/ios/icon/icon-60@2x.png +++ b/resources/ios/icon/icon-60@2x.png diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png Binary files differindex 2ec1cfd4..7752b8e1 100644 --- a/resources/ios/icon/icon-60@3x.png +++ b/resources/ios/icon/icon-60@3x.png diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png Binary files differindex 28fa247e..7177c403 100644 --- a/resources/ios/icon/icon-72.png +++ b/resources/ios/icon/icon-72.png diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png Binary files differindex 749fa727..4f2c6104 100644 --- a/resources/ios/icon/icon-72@2x.png +++ b/resources/ios/icon/icon-72@2x.png diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png Binary files differindex f38f2247..864e6959 100644 --- a/resources/ios/icon/icon-76.png +++ b/resources/ios/icon/icon-76.png diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png Binary files differindex 48422372..c40bfe17 100644 --- a/resources/ios/icon/icon-76@2x.png +++ b/resources/ios/icon/icon-76@2x.png diff --git a/resources/ios/icon/icon-83.5@2x.png b/resources/ios/icon/icon-83.5@2x.png Binary files differindex 22a664c3..731b4b31 100644 --- a/resources/ios/icon/icon-83.5@2x.png +++ b/resources/ios/icon/icon-83.5@2x.png diff --git a/resources/ios/icon/icon-small.png b/resources/ios/icon/icon-small.png Binary files differindex 90a3d039..20881f75 100644 --- a/resources/ios/icon/icon-small.png +++ b/resources/ios/icon/icon-small.png diff --git a/resources/ios/icon/icon-small@2x.png b/resources/ios/icon/icon-small@2x.png Binary files differindex 11816540..c6e43a43 100644 --- a/resources/ios/icon/icon-small@2x.png +++ b/resources/ios/icon/icon-small@2x.png diff --git a/resources/ios/icon/icon-small@3x.png b/resources/ios/icon/icon-small@3x.png Binary files differindex dba05652..adf5cf69 100644 --- a/resources/ios/icon/icon-small@3x.png +++ b/resources/ios/icon/icon-small@3x.png diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png Binary files differindex 30605b9f..5281e723 100644 --- a/resources/ios/icon/icon.png +++ b/resources/ios/icon/icon.png diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png Binary files differindex 8305ef11..20c405d6 100644 --- a/resources/ios/icon/icon@2x.png +++ b/resources/ios/icon/icon@2x.png diff --git a/resources/ios/splash/Default-568h@2x~iphone.png b/resources/ios/splash/Default-568h@2x~iphone.png Binary files differindex b0727669..819bb7c0 100644 --- a/resources/ios/splash/Default-568h@2x~iphone.png +++ b/resources/ios/splash/Default-568h@2x~iphone.png diff --git a/resources/ios/splash/Default-667h.png b/resources/ios/splash/Default-667h.png Binary files differindex b562fc8b..53867214 100644 --- a/resources/ios/splash/Default-667h.png +++ b/resources/ios/splash/Default-667h.png diff --git a/resources/ios/splash/Default-736h.png b/resources/ios/splash/Default-736h.png Binary files differindex f1e2380d..b87e53bf 100644 --- a/resources/ios/splash/Default-736h.png +++ b/resources/ios/splash/Default-736h.png diff --git a/resources/ios/splash/Default-Landscape-736h.png b/resources/ios/splash/Default-Landscape-736h.png Binary files differindex e2f862bc..f2c6d7d8 100644 --- a/resources/ios/splash/Default-Landscape-736h.png +++ b/resources/ios/splash/Default-Landscape-736h.png diff --git a/resources/ios/splash/Default-Landscape@2x~ipad.png b/resources/ios/splash/Default-Landscape@2x~ipad.png Binary files differindex 763300bb..dd38d972 100644 --- a/resources/ios/splash/Default-Landscape@2x~ipad.png +++ b/resources/ios/splash/Default-Landscape@2x~ipad.png diff --git a/resources/ios/splash/Default-Landscape@~ipadpro.png b/resources/ios/splash/Default-Landscape@~ipadpro.png Binary files differindex 58fc8c07..16bdfc51 100644 --- a/resources/ios/splash/Default-Landscape@~ipadpro.png +++ b/resources/ios/splash/Default-Landscape@~ipadpro.png diff --git a/resources/ios/splash/Default-Landscape~ipad.png b/resources/ios/splash/Default-Landscape~ipad.png Binary files differindex b376d505..78c62a72 100644 --- a/resources/ios/splash/Default-Landscape~ipad.png +++ b/resources/ios/splash/Default-Landscape~ipad.png diff --git a/resources/ios/splash/Default-Portrait@2x~ipad.png b/resources/ios/splash/Default-Portrait@2x~ipad.png Binary files differindex bdb89e9d..47f78157 100644 --- a/resources/ios/splash/Default-Portrait@2x~ipad.png +++ b/resources/ios/splash/Default-Portrait@2x~ipad.png diff --git a/resources/ios/splash/Default-Portrait@~ipadpro.png b/resources/ios/splash/Default-Portrait@~ipadpro.png Binary files differindex 4bc7385e..4c9b85e6 100644 --- a/resources/ios/splash/Default-Portrait@~ipadpro.png +++ b/resources/ios/splash/Default-Portrait@~ipadpro.png diff --git a/resources/ios/splash/Default-Portrait~ipad.png b/resources/ios/splash/Default-Portrait~ipad.png Binary files differindex f8736254..1c03f4c3 100644 --- a/resources/ios/splash/Default-Portrait~ipad.png +++ b/resources/ios/splash/Default-Portrait~ipad.png diff --git a/resources/ios/splash/Default@2x~iphone.png b/resources/ios/splash/Default@2x~iphone.png Binary files differindex 2e6a396c..db211c4d 100644 --- a/resources/ios/splash/Default@2x~iphone.png +++ b/resources/ios/splash/Default@2x~iphone.png diff --git a/resources/ios/splash/Default@2x~universal~anyany.png b/resources/ios/splash/Default@2x~universal~anyany.png Binary files differindex f5f83028..aa2e46ec 100644 --- a/resources/ios/splash/Default@2x~universal~anyany.png +++ b/resources/ios/splash/Default@2x~universal~anyany.png diff --git a/resources/ios/splash/Default~iphone.png b/resources/ios/splash/Default~iphone.png Binary files differindex 6b655c61..d88055c7 100644 --- a/resources/ios/splash/Default~iphone.png +++ b/resources/ios/splash/Default~iphone.png diff --git a/www/index.html b/www/index.html index 90fd465c..604f6e9e 100644 --- a/www/index.html +++ b/www/index.html @@ -30,6 +30,7 @@ <!-- unmanaged external styles --> <link rel="stylesheet" href="external/ionic.content.banner.min.css"> <link rel="stylesheet" href="external/radio.css"> + @@ -37,6 +38,7 @@ <script src="lib/ngCordova/dist/ng-cordova.min.js"></script> <script src="cordova.js"></script> + <script src="lib/filelogger/dist/filelogger.min.js"></script> <script src="lib/localforage/dist/localforage.js"></script> @@ -59,7 +61,7 @@ <script src="lib/moment/min/moment-with-locales.min.js"></script> <script src="lib/ng-mfb/src/mfb-directive.js"></script> <script src="lib/angular-touch/angular-touch.min.js"></script> - <script src="lib/filelogger/dist/filelogger.min.js"></script> + <!-- unmanaged externals --> @@ -87,6 +89,7 @@ + <!-- app related JS --> <script src="js/app.js"></script> <script src="js/controllers.js"></script> diff --git a/www/templates/timeline.html b/www/templates/timeline.html index 02bf0eb4..eb15aca3 100644 --- a/www/templates/timeline.html +++ b/www/templates/timeline.html @@ -1,57 +1,61 @@ -<meta name="format-detection" content="telephone=no" /> -<ion-view title="{{'kTimeline' | translate}}" cache-view="false"> +<div> + <meta name="format-detection" content="telephone=no" /> + <ion-view title="{{'kTimeline' | translate}}" cache-view="false"> <ion-nav-buttons side="left"> - <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button> - - <button class="button button-icon button-clear ion-arrow-left-c" ng-click="moveDays(-1);"></button> - <button class="button button-icon button-clear ion-arrow-right-c" ng-click="moveDays(1);"></button> - <button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button> + <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button> + + <button class="button button-icon button-clear ion-arrow-left-c" ng-click="moveDays(-1);"></button> + <button class="button button-icon button-clear ion-arrow-right-c" ng-click="moveDays(1);"></button> + <button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" + ng-click="handleAlarms();" ng-if="$root.isAlarm"></button> </ion-nav-buttons> <ion-nav-buttons side="right"> - <button class="button button-icon button-clear ion-android-more-vertical" ng-click="popover.show($event); "> </button> - <button class="button button-icon button-clear ion-arrow-move" ng-click="toggleNav();"></button> - <!-- + <button class="button button-icon button-clear ion-android-more-vertical" ng-click="popover.show($event); "> </button> + <button class="button button-icon button-clear ion-arrow-move" ng-click="toggleNav();"></button> + <!-- <button class="button button-icon button-clear ion-log-in" ng-click="zoom(-0.2)"></button> <button class="button button-icon button-clear ion-log-out" ng-click="zoom(0.2)"></button> --> </ion-nav-buttons> <!--<ion-content data-tap-disabled="true">--> <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll> - <div style="padding-left:15px; font-size:10px; color:grey"> - {{prettify(fromDate)}} - {{prettify(toDate)}} {{tzAbbr}} ({{'kTimelineOnlyDisplaying1' | translate:translationData}}) - <strong><br/>{{'kTimelineControlDisplay'|translate}}</strong> - </div> - <ion-spinner icon="spiral" style="position:absolute; top:50%;left:50%" ng-if="!graphLoaded"></ion-spinner> - <div ng-if="!graphLoaded"> - <br/> - <br/> - <center> - <p>{{'kWorkingOnGraph' | translate}}...</p> - </center> - </div> - <div style="padding-left:15px; padding-right:15px;"> - <div id="visualization"> - </div> - </div> + <div style="padding-left:15px; font-size:10px; color:grey"> + {{prettify(fromDate)}} - {{prettify(toDate)}} {{tzAbbr}} ({{'kTimelineOnlyDisplaying1' | translate:translationData}}) + <strong> + <br/>{{'kTimelineControlDisplay'|translate}}</strong> + </div> + <ion-spinner icon="spiral" style="position:absolute; top:50%;left:50%" ng-if="!graphLoaded"></ion-spinner> + <div ng-if="!graphLoaded"> + <br/> <br/> - <div style="padding-left:15px; font-size:10px; color:grey"> - <button ng-click="toggleFollowTime()" ng-class="follow.time? 'button button-small button-balanced':'button button-small button-assertive'"> - {{'kUpdateTimeline' | translate}}: {{follow.time? ('kTrue' | translate) : ('kFalse' | translate)}} - </button> - <button ng-click="gotoNow()" class="button button-small button-balanced"> - {{'kNow' | translate}} - </button> - <div ng-if="follow.time"> - <p>{{newEvents}}</p> - </div> + <center> + <p>{{'kWorkingOnGraph' | translate}}...</p> + </center> + </div> + <div style="padding-left:15px; padding-right:15px;"> + <div id="visualization"> </div> + </div> + <br/> + <div style="padding-left:15px; font-size:10px; color:grey"> + <button ng-click="toggleFollowTime()" ng-class="follow.time? 'button button-small button-balanced':'button button-small button-assertive'"> + {{'kUpdateTimeline' | translate}}: {{follow.time? ('kTrue' | translate) : ('kFalse' | translate)}} + </button> + <button ng-click="gotoNow()" class="button button-small button-balanced"> + {{'kNow' | translate}} + </button> + <div ng-if="follow.time"> + <p>{{newEvents}}</p> + </div> + </div> </ion-content> -</ion-view> -<div ng-show="graphLoaded && navControls"> + </ion-view> + <div ng-show="graphLoaded && navControls"> <div class="timelinebuttons"> - <circular id="timeline-ctrl" options="radialMenuOptions" class="animated bounceInRight"> - <!----> - </circular> - <!-- --> + <circular id="timeline-ctrl" options="radialMenuOptions" class="animated bounceInRight"> + <!----> + </circular> + <!-- --> </div> -</div> + </div> +</div> |
