Merge branch 'master' of https://github.com/warrenbuckley/Analytics

Author: warrenbuckley

Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/browser.html

@@ -24,7 +24,7 @@ <h4><localize key="analytics_browser">Browser</localize></h4>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in items" ts-repeat>
+                <tr ng-repeat="item in items track by $id(item)" ts-repeat>
                     <td>{{ item.browser }}</td>
                     <td>{{ item.visits }}</td>
                     <td>{{ item.pageviews }}</td>
@@ -46,7 +46,7 @@ <h4><localize key="analytics_browserSpecific">Browser Specific</localize></h4>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in itemSpecs" ts-repeat>
+                <tr ng-repeat="item in itemSpecs track by $id(item)" ts-repeat>
                     <td>{{ item.bs_browser }}</td>
                     <td>{{ item.bs_version }}</td>
                     <td>{{ item.bs_visits }}</td>

Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/country.html

@@ -22,7 +22,7 @@ <h4><localize key="analytics_country">Country</localize></h4>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in items" ts-repeat>
+                <tr ng-repeat="item in items track by $id(item)" ts-repeat>
                     <td>{{ item.country }}</td>
                     <td>{{ item.visits }}</td>
                     <td>{{ item.pageviews }}</td>

Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/dashboard.html

@@ -11,7 +11,7 @@ <h4><localize key="analytics_views">Views</localize></h4>
                     <canvas id="viewMonths" width="400" height="400"></canvas>
                 </div>
             </div>
-            <div class="span6">
+            <div class="span6 col-right">
                 <table id="tbl-views" class="table table-striped" ts-wrapper>
                     <thead>
                         <tr>
@@ -20,9 +20,8 @@ <h4><localize key="analytics_views">Views</localize></h4>
                             <th id="pageviews" ts-criteria="pageviews | parseInt"><localize key="analytics_pageViews">Page Views</localize></th>
                         </tr>
                     </thead>
-                    
                     <tbody ng-show="!loadingViews">
-                        <tr ng-repeat="item in items | limitTo:10" ts-repeat>
+                        <tr ng-repeat="item in items | limitTo:10 track by $id(item)" ts-repeat>
                             <td><a href="{{ item.pagepath }}" target="_blank">{{ item.pagepath }}</a></td>
                             <td>{{ item.visits }}</td>
                             <td>{{ item.pageviews }}</td>
@@ -36,7 +35,7 @@ <h4><localize key="analytics_views">Views</localize></h4>
         <hr/>
 
         <div class="row-fluid">
-            <div class="span6">
+            <div class="span6 col-left">
                 <h4><localize key="analytics_sources">Sources</localize></h4>
                 <table id="tbl-sources" class="table table-striped" ts-wrapper>
                     <thead>
@@ -47,7 +46,7 @@ <h4><localize key="analytics_sources">Sources</localize></h4>
                         </tr>
                     </thead>
                     <tbody>
-                        <tr ng-repeat="item in itemsSources | limitTo:10" ts-repeat>
+                        <tr ng-repeat="item in itemsSources | limitTo:10 track by $id(item)" ts-repeat>
                             <td>{{ item.s_source }}</td>
                             <td>{{ item.s_visits }}</td>
                             <td>{{ item.s_pageviews }}</td>
@@ -56,7 +55,7 @@ <h4><localize key="analytics_sources">Sources</localize></h4>
                 </table>
                 <a href="/umbraco/#/analytics/analyticsTree/view/views" class="btn btn-primary"><localize key="analytics_viewMoreDetails">View more details</localize></a>
             </div>
-            <div class="span6">
+            <div class="span6 col-right">
                 <h4><localize key="analytics_keywords">Keywords</localize></h4>
                 <table id="tbl-keywords" class="table table-striped" ts-wrapper>
                     <thead>
@@ -67,7 +66,7 @@ <h4><localize key="analytics_keywords">Keywords</localize></h4>
                         </tr>
                     </thead>
                     <tbody>
-                        <tr ng-repeat="item in itemsKeywords | limitTo:10" ts-repeat>
+                        <tr ng-repeat="item in itemsKeywords | limitTo:10 track by $id(item)" ts-repeat>
                             <td>{{ item.k_keyword }}</td>
                             <td>{{ item.k_visits }}</td>
                             <td>{{ item.k_pageviews }}</td>

Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/devices.html

@@ -24,7 +24,7 @@ <h4><localize key="analytics_deviceTypes">Device Types</localize></h4>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in types" ts-repeat>
+                <tr ng-repeat="item in types track by $id(item)" ts-repeat>
                     <td>{{ item.dt_devicetype }}</td>
                     <td>{{ item.dt_visits }}</td>
                     <td>{{ item.dt_pageviews }}</td>
@@ -45,7 +45,7 @@ <h4><localize key="analytics_devices">Devices</localize></h4>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in items" ts-repeat>
+                <tr ng-repeat="item in items track by $id(item)" ts-repeat>
                     <td>{{ item.device }}</td>
                     <td>{{ item.model }}</td>
                     <td>{{ item.visits }}</td>

Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/ecommerce.html

@@ -34,7 +34,7 @@ <h5><localize key="analytics_transactions">Bestsellers</localize></h5>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in itemProducts" ts-repeat>
+                <tr ng-repeat="item in itemProducts track by $id(item)" ts-repeat>
                     <td>{{ item.productSku }}</td>
                     <td>{{ item.productName }}</td>
                     <td>{{ item.quantity }}</td>
@@ -54,7 +54,7 @@ <h5><localize key="analytics_revenuePerSource">Revenue Per Source</localize></h5
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in itemRevenuePerSource" ts-repeat>
+                <tr ng-repeat="item in itemRevenuePerSource track by $id(item)" ts-repeat>
                     <td>{{ item.r_source }}</td>
                     <td>{{ item.r_keyword }}</td>
                     <td>{{ item.r_transactions }}</td>

Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/keywords.html

@@ -16,11 +16,11 @@ <h4><localize key="analytics_keywords">Keywords</localize></h4>
                 <tr>
                     <th id="keyword" ts-criteria="keyword"><localize key="analytics_keyword">Keyword</localize></th>
                     <th id="visits" ts-criteria="visits | parseInt" ts-default="descending"><localize key="analytics_visits">Visits</localize></th>
-                    <th id="pageviews" ts-critera="pageviews | parseInt"><localize key="analytics_pageViews">Page Views</localize></th>
+                    <th id="pageviews" ts-criteria="pageviews | parseInt"><localize key="analytics_pageViews">Page Views</localize></th>
                 </tr> 
             </thead>
             <tbody>
-                <tr ng-repeat="item in items" ts-repeat>
+                <tr ng-repeat="item in items track by $id(item)" ts-repeat>
                     <td>{{ item.keyword }}</td>
                     <td>{{ item.visits }}</td>
                     <td>{{ item.pageviews }}</td>

Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/language.html

@@ -20,7 +20,7 @@ <h4><localize key="analytics_language">Language</localize></h4>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in items" ts-repeat>
+                <tr ng-repeat="item in items track by $id(item)" ts-repeat>
                     <td>{{ item.language }}</td>
                     <td>{{ item.visits }}</td>
                     <td>{{ item.pageviews }}</td>

Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/os.html

@@ -18,13 +18,13 @@ <h4><localize key="analytics_os">OS</localize></h4>
         <table id="tbl-os" class="table table-striped" ts-wrapper>
             <thead>
                 <tr>
-                    <th id="operatingsystem" ts-criteria="operatingsystem"><localize key="analytics_operatingsystem">Operating System</localize></th>
+                    <th id="operatingsystem" ts-criteria="operatingsystem"><localize key="analytics_operatingSystem">Operating System</localize></th>
                     <th id="visits" ts-criteria="visits | parseInt" ts-default="descending"><localize key="analytics_visits">Visits</localize></th>
                     <th id="pageviews" ts-criteria="pageviews | parseInt"><localize key="analytics_pageViews">Page Views</localize></th>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in items" ts-repeat>
+                <tr ng-repeat="item in items track by $id(item)" ts-repeat>
                     <td>{{ item.operatingsystem }}</td>
                     <td>{{ item.visits }}</td>
                     <td>{{ item.pageviews }}</td>
@@ -39,14 +39,14 @@ <h4><localize key="analytics_osVersions">OS Versions</localize></h4>
         <table id="tbl-osversions" class="table table-striped" ts-wrapper>
             <thead>
                 <tr>
-                    <th id="v_operatingsystem" ts-criteria="v_operatingsystem"><localize key=" analytics_operatingsystem">Operating System</localize></th>
+                    <th id="v_operatingsystem" ts-criteria="v_operatingsystem"><localize key=" analytics_operatingSystem">Operating System</localize></th>
                     <th id="v_version" ts-criteria="v_version"><localize key=" analytics_version">Version</localize></th>
                     <th id="v_visits" ts-criteria="v_visits | parseInt" ts-default="descending"><localize key="analytics_visits">Visits</localize></th>
                     <th id="v_pageviews" ts-criteria="v_pageviews | parseInt"><localize key="analytics_pageViews">Page Views</localize></th>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in itemsVersions" ts-repeat>
+                <tr ng-repeat="item in itemsVersions track by $id(item)" ts-repeat>
                     <td>{{ item.v_operatingsystem }}</td>
                     <td>{{ item.v_version }}</td>
                     <td>{{ item.v_visits }}</td>

Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/productperformance.html

@@ -19,16 +19,16 @@ <h5><localize key="analytics_uniquePurchases">Unique Purchases</localize></h5>
         <table id="tbl-productperformance" class="table table-striped" ts-wrapper>
             <thead>
                 <tr>
-                    <th id="productSku" ts-criteria="productSku"><localize key="analytics_productsku">Product SKU</localize></th>
-                    <th id="productName" ts-criteria="productName"><localize key="analytics_productname">Product Name</localize></th>
+                    <th id="productSku" ts-criteria="productSku"><localize key="analytics_productSku">Product SKU</localize></th>
+                    <th id="productName" ts-criteria="productName"><localize key="analytics_productName">Product Name</localize></th>
                     <th id="uniquePurchases" ts-criteria="uniquePurchases | parseInt"><localize key="analytics_uniquePurchases">Unique Purchases</localize></th>
                     <th id="revenue" ts-criteria="revenue | parseFloat" ts-default="descending"><localize key="analytics_revenue">Revenue</localize></th>
                     <th id="revenuePerItem" ts-criteria="revenuePerItem | parseFloat"><localize key="analytics_revenuePerItem">Revenue Per Item</localize></th>
                     <th id="itemsPerPurchase" ts-criteria="itemsPerPurchase | parseFloat"><localize key="analytics_itemsPerPurchase">Items Per Purchase</localize></th>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in itemProducts" ts-repeat>
+                <tr ng-repeat="item in itemProducts track by $id(item)" ts-repeat>
                     <td>{{ item.productSku }}</td>
                     <td>{{ item.productName }}</td>
                     <td>{{ item.uniquePurchases }}</td>

Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/salesperformance.html

@@ -25,7 +25,7 @@ <h5><localize key="analytics_revenue">Revenue</localize></h5>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in itemSales" ts-repeat>
+                <tr ng-repeat="item in itemSales track by $id(item)" ts-repeat>
                     <td>{{ item.date | date:'yyyy-MM-dd' }}</td>
                     <td>{{ item.uniquePurchases }}</td>
                     <td>{{ item.revenue | currency: currencyCode }}</td>

Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/screenres.html

@@ -19,7 +19,7 @@ <h4><localize key="analytics_screenResolution">Screen Resolution</localize></h4>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in items" ts-repeat>
+                <tr ng-repeat="item in items track by $id(item)" ts-repeat>
                     <td>{{ item.resolution }}</td>
                     <td>{{ item.visits }}</td>
                     <td>{{ item.pageviews }}</td>

Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/social.html

@@ -18,13 +18,13 @@ <h4><localize key="analytics_socialNetwork">Social Network</localize></h4>
         <table id="tbl-social" class="table table-striped" ts-wrapper>
             <thead>
                 <tr>
-                    <th id="socialnetwork" ts-criteria="socialnetwork"><localize key="analytics_socialnetwork">Social Network</localize></th>
+                    <th id="socialnetwork" ts-criteria="socialnetwork"><localize key="analytics_socialNetwork">Social Network</localize></th>
                     <th id="visits" ts-criteria="visits | parseInt" ts-default="descending"><localize key="analytics_visits">Visits</localize></th>
                     <th id="pageviews" ts-criteria="pageviews | parseInt"><localize key="analytics_pageViews">Page Views</localize></th>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in items" ts-repeat>
+                <tr ng-repeat="item in items track by $id(item)" ts-repeat>
                     <td>{{ item.socialnetwork }}</td>
                     <td>{{ item.visits }}</td>
                     <td>{{ item.pageviews }}</td>

Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/transactions.html

@@ -24,7 +24,7 @@ <h4><localize key="analytics_transactions">Transactions</localize></h4>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in itemTransactionsg" ts-repeat>
+                <tr ng-repeat="item in itemTransactionsg track by $id(item)" ts-repeat>
                     <td>{{ item.transactionId }}</td>
                     <td>{{ item.revenue | currency: currencyCode }}</td>
                     <td>{{ item.quantity }}</td>

Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/views.html

@@ -17,13 +17,13 @@ <h4><localize key="analytics_views">Views</localize></h4>
         <table id="tbl-views" class="table table-striped" ts-wrapper>
             <thead>
                 <tr>
-                    <th id="pagepath" ts-criteria="pagepath"><localize key="analytics_pagepath">Page Path</localize></th>
+                    <th id="pagepath" ts-criteria="pagepath"><localize key="analytics_pagePath">Page Path</localize></th>
                     <th id="visits" ts-criteria="visits | parseInt" ts-default="descending"><localize key="analytics_visits">Visits</localize></th>
                     <th id="pageviews" ts-criteria="pageviews | parseInt"><localize key="analytics_pageViews">Page Views</localize></th>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in items" ts-repeat>
+                <tr ng-repeat="item in items track by $id(item)" ts-repeat>
                     <td><a href="{{ item.pagepath }}" target="_blank">{{ item.pagepath }}</a></td>
                     <td>{{ item.visits }}</td>
                     <td>{{ item.pageviews }}</td>
@@ -38,13 +38,13 @@ <h4><localize key="analytics_sources">Sources</localize></h4>
         <table id="tbl-sources" class="table table-striped" ts-wrapper>
             <thead>
                 <tr>
-                    <th id="s_source" ts-criteria="s_source"><localize key=" analytics_source">Source</localize></th>
+                    <th id="s_source" ts-criteria="s_source"><localize key="analytics_source">Source</localize></th>
                     <th id="s_visits" ts-criteria="s_visits | parseInt" ts-default="descending"><localize key="analytics_visits">Visits</localize></th>
                     <th id="s_pageviews" ts-criteria="s_pageviews | parseInt"><localize key="analytics_pageViews">Page Views</localize></th>
                 </tr>
             </thead>
             <tbody>
-                <tr ng-repeat="item in itemSources" ts-repeat>
+                <tr ng-repeat="item in itemSources track by $id(item)" ts-repeat>
                     <td>{{ item.s_source }}</td>
                     <td>{{ item.s_visits }}</td>
                     <td>{{ item.s_pageviews }}</td>

Analytics/App_Plugins/Analytics/backOffice/OAuth.aspx.cs

@@ -21,7 +21,8 @@ protected void Page_Load(object sender, EventArgs e) {
             // The query string to send to the authentication site
             NameValueCollection nvc = new NameValueCollection {
                 {"clientcallback", callback},
-                {"clientstate", state}
+                {"clientstate", state},
+                {"lang", UmbracoContext.Security.CurrentUser.Language}
             };
 
             // Generate the URL for the authentication page

Analytics/App_Plugins/Analytics/css/analytics.css

@@ -7,17 +7,38 @@ table.table a {
 table.table a span:hover {
     text-decoration: underline;
 }
+.umb-dashboard-control a.btn {
+    text-decoration: none;
+}
+/* Visits */
+.umb-dashboard-control table th:nth-child(2),
+.umb-dashboard-control table td:nth-child(2) {
+    min-width: 60px;
+}
+/* Page Views */
+.umb-dashboard-control table th:nth-child(3),
+.umb-dashboard-control table td:nth-child(3) {
+    min-width: 110px;
+}
+
 .date-filter {
     background: #fff;
     cursor: pointer;
     padding: 5px 10px;
     border: 1px solid #ccc;
+    margin-bottom: 25px;
 }
 .loading-bar {
     overflow: hidden;
     margin-left: -20px;
     margin-right: -20px;
 }
+div.col-left { 
+    padding-right: 5px; 
+}
+div.col-right { 
+    padding-left: 5px;
+}
 .chart-container {
     position: relative;
 }