WIP

cliqz-oss · Feb 26, 2016 · a028812 · a028812
1 parent 3216a37
commit a028812
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/src/server.py b/src/server.py
@@ -58,8 +58,8 @@ def any(path):
         if path == 'frame':
             context = {}
             context['tracker_host'] = TRACKER_HOST
-            context['site4'] = VALID_HOSTS[3]
-            context['site5'] = VALID_HOSTS[4]
+            for v, i in zip(VALID_HOSTS, range(0, len(VALID_HOSTS))):
+                context['site{}'.format(i+1)] = v
             if ACCELERATE > 1:
                 context['accelerate'] = {'speed': ACCELERATE, 'start_time': start_time}
             return render_template('/template_frame.html', context=context)

diff --git a/src/static/style.css b/src/static/style.css
@@ -39,6 +39,15 @@ div#desc {
     text-shadow: none;
 }
 
+.rr {
+    height: 100px;
+}
+
+.fill {
+    min-height: 100%;
+    height: 100%;
+}
+
 .description {
     text-shadow: none;
     text-align: left;
@@ -47,7 +56,6 @@ div#desc {
     font-weight: normal;
     font-size: 14px;
     color: #000;
-
 }
 
 .links {

diff --git a/src/templates/template_frame.html b/src/templates/template_frame.html
@@ -19,6 +19,13 @@
     var timestamp_by_hour = timestamp.slice(0,10);
     var timestamp_by_day = timestamp.slice(0,8);
 
+    var o = localStorage.getItem('gt:count')
+    if (!o) o = 0;
+    else o = parseInt(o);
+    o+=1;
+    localStorage.setItem('gt:count', o)
+    console.log('>>>>>' , o, localStorage.length);
+
     var tmp = url.replace('http://','').split('/');
     var site = tmp[0], page = '/'+tmp.splice(1,tmp.length).join('/');
 
@@ -411,7 +418,7 @@
     // drains the battery. With the client-side aggregation proposed by Green-tracker, beacons are
     // no longer necessary as we will see in the following example.
     //
-    var monitoringSites = ['site1.com'];
+    var monitoringSites = ['{{ context.site1 }}'];
 
     if (monitoringSites.indexOf(site)!=-1) {
         // The user is at site1.com, the only site for which we want aggregated statistics per user.

diff --git a/src/templates/template_log.html b/src/templates/template_log.html
@@ -19,7 +19,7 @@
   </head>
 
   <body>
-    <div class="row container-fluid">
+    <div class="row container-fluid rr">
         <h1>Green-tracker Privacy Preserving Analytics Report</h1>
 
         {% if context.canned_report %}

diff --git a/src/templates/template_sites.html b/src/templates/template_sites.html
@@ -77,10 +77,10 @@ <h3>Privacy Preserving Tracking</h3>
                 <ul>
                 <li>Unique visits and page loads.
                 <li>Returning customers.
-                <li>Goal conversion, to track campaigns.
+                <li>Goal conversion to track campaigns.
                 <li>Cross site correlations.
                 <li>In-site click-throughs.
-                <li>Average time on page by user.
+                <li>Visits and time in page per user (without beacons).
                 </ul>
 
             <p> Feel free to click around to simulate you are browsing the Web, you can use
@@ -101,7 +101,6 @@ <h3>Privacy Preserving Tracking</h3>
                     <li><a href="http://{{context.tracker_host}}/introspect/localstorage">Your footprint of green-tracker localStorage</a>
                 </ul>
 
-            </ul>
             </div>
         </div>