Merge branch 'dev' of https://bitbucket.org/Stigmat/chrome_extension into release

Author: hai-altx-soft

manifest.json

@@ -3,7 +3,7 @@
 
         "name": "Web Activity Time Tracker",
         "short_name": "Web Activity",
-        "version": "0.7.2",
+        "version": "0.7.3",
         "minimum_chrome_version": "26",
 
         "description": "Track your activity in the browser.",

scripts/chart/chart-core.js

@@ -74,7 +74,7 @@ function donutChart() {
                 .data(pie(data))
                 .enter().append("g")
                 .attr("transform", function (d, i) {
-                    return "translate(" + (130) + "," + (i * 20 - 40) + ")"; // place each legend on the right and bump each one down 15 pixels
+                    return "translate(" + (130) + "," + (i * 20 - 80) + ")"; // place each legend on the right and bump each one down 15 pixels
                 })
                 .attr("class", "legend");
 

scripts/common.js

@@ -91,24 +91,32 @@ function zeroAppend(time) {
     else return time;
 }
 
-function isDateInRange(dateStr, range){
+function isDateInRange(dateStr, range) {
     var arr = dateStr.split('.');
-    var date = new Date(arr[2], arr[1]-1, arr[0]);
-    var arrFrom = range.from.split('.');
-    var from = new Date(arrFrom[2], arrFrom[1]-1, arrFrom[0]);
-    var arrTo = range.to.split('.');
-    var to = new Date(arrTo[2], arrTo[1]-1, arrTo[0]);
+    var date = new Date(arr[2], arr[1] - 1, arr[0]);
+    var from = getValueFromArrayRange(range.from);
+    var to = getValueFromArrayRange(range.to);
     return date >= from && date <= to;
 }
 
-function convertToDate(date){
+function getValueFromArrayRange(value){
+    var arr;
+    if (value.indexOf('.') !== -1){
+        arr = value.split('.');
+        return new Date(arr[2], arr[1] - 1, arr[0]);
+    }
+    if (value.indexOf('/') !== -1)
+        arr = value.split('/');
+        return new Date(arr[2], arr[0] - 1, arr[1]);
+}
+
+function convertToDate(date) {
     var arr = date.split('.');
-    return new Date(arr[2], arr[1]-1, arr[0]);
+    return new Date(arr[2], arr[1] - 1, arr[0]);
 }
 
-function getDateFromRange(range){
-    switch (range)
-    {
+function getDateFromRange(range) {
+    switch (range) {
         case 'days2': return 2;
         case 'days3': return 3;
         case 'days4': return 4;

scripts/webact.js

@@ -107,7 +107,7 @@ function getTabsFromStorage(tabs) {
 
         ui.addLineToTableOfSite(targetTabs[i], currentTab, summaryTime);
 
-        if (i <= 5)
+        if (i <= 8)
             addTabForChart(tabsForChart, targetTabs[i].url, summaryTime);
         else addTabOthersForChart(tabsForChart, summaryTime);
     }

style/webact.css

@@ -80,9 +80,9 @@ hr {
 }
 
 .title{
-    font-size: 15px;
+    font-size: 12px;
     font-weight: 650;
-    margin: 5px;
+    margin: 2px;
     text-align: center;
 }
 
@@ -121,7 +121,7 @@ input[type="date"]{
 
 .btn-block{
     width: 500px;
-    margin-bottom: 7px;
+    margin-bottom: 5px;
 }
 
 .no-data{