verbessere Tracking

2 files changed, 8 insertions, 7 deletions

diff --git a/index.html b/index.html
index ff308ae..e226b7b 100644
--- a/index.html
+++ b/index.html
@@ -67,22 +67,17 @@
         <script type="text/javascript" src="js/jquery.mobile-1.4.2.min.js"></script>
         <script type="text/javascript" src="cordova.js"></script>
         <script type="text/javascript" src="js/pdf.js"></script>
-        <script type="text/javascript" src="js/piwik.js" defer async></script>
+        <script type="text/javascript" src="js/piwik.js"></script>
 
         <script type="text/javascript">
             /* Nutzungsstatistiken */
             var _paq = _paq || [];
 
-            _paq.push(['trackPageView', 'load']);
             _paq.push(['enableLinkTracking']);
             _paq.push(['setTrackerUrl', 'http://klimaag.***REMOVED***/piwik/piwik.php']); // TODO Https wäre schön.
             _paq.push(['setSiteId', 5]);
 
             console.log('Piwik initialisiert');
-
-            function track(what){
-                _paq.push(['trackPageView', what]);
-            }
         </script>
 
         <script type="text/javascript" src="js/index.js"></script>
diff --git a/js/index.js b/js/index.js
index 915942e..17ca007 100644
--- a/js/index.js
+++ b/js/index.js
@@ -16,11 +16,16 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+function track(what){
+    _paq.push(['trackPageView', what]);
+}
+
 // Login-Popup beim Start
 //$(document).bind('pageinit', function(){
 document.addEventListener('deviceready', function(){
     _paq.push(['setCustomVariable', 0, 'Modell', device.model, 'visit']);
     _paq.push(['setCustomVariable', 1, 'Version', device.version, 'visit']);
+    _paq.push(['trackPageView', 'load']);
 
     setTimeout(function(){
         fillform();
@@ -290,6 +295,8 @@ function removelogintab(){
 
     $('#login').remove();
     $('#vplantabs').tabs('refresh');
+
+    track('ui/tab/plan_' + Math.floor((vdate - (new Date())) / (1000 * 60 * 60 * 24)));
 }
 
 function replaceUmlauts(umlautstr){
@@ -342,7 +349,6 @@ function addplanattr(fileEntry, wasdownloaded){
 
         if($('#login').length && wasdownloaded){
             removelogintab();
-            track('ui/tab/plan_' + Math.floor((vdate - (new Date())) / (1000 * 60 * 60 * 24)));
         }
     }