Skip to content

Commit 45b10b8

Browse files
author
Tim Geyssens
committed
Try to have same headers on all views
1 parent cbe84a0 commit 45b10b8

File tree

20 files changed

+89
-27
lines changed

20 files changed

+89
-27
lines changed

‎Analytics.Site/App_Data/Logs/UmbracoTraceLog.txt

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2668,3 +2668,71 @@
26682668
2014-01-03 17:41:03,615 [43] INFO Umbraco.Core.PluginManager - [Thread 42] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)
26692669
2014-01-03 17:41:04,802 [43] INFO Umbraco.Core.PluginManager - [Thread 27] Starting resolution types of umbraco.interfaces.ITree
26702670
2014-01-03 17:41:04,820 [43] INFO Umbraco.Core.PluginManager - [Thread 27] Completed resolution of types of umbraco.interfaces.ITree, found 35 (took 18ms)
2671+
2014-01-03 17:47:04,626 [43] INFO umbraco.BusinessLogic.Log - [Thread 42] Log scrubbed. Removed all items older than 2013-11-04 17:47:04
2672+
2014-01-03 17:47:04,628 [43] INFO Umbraco.Core.UmbracoApplicationBase - [Thread 42] Application shutdown. Reason: BinDirChangeOrDirectoryRename
2673+
2014-01-03 17:47:17,655 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Determining hash of code files on disk
2674+
2014-01-03 17:47:17,676 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Hash determined (took 9ms)
2675+
2014-01-03 17:47:17,690 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Starting resolution types of umbraco.interfaces.IApplicationStartupHandler
2676+
2014-01-03 17:47:17,900 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Completed resolution of types of umbraco.interfaces.IApplicationStartupHandler, found 30 (took 207ms)
2677+
2014-01-03 17:47:18,026 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Starting resolution types of Umbraco.Core.PropertyEditors.IPropertyEditorValueConverter
2678+
2014-01-03 17:47:18,032 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Completed resolution of types of Umbraco.Core.PropertyEditors.IPropertyEditorValueConverter, found 0 (took 6ms)
2679+
2014-01-03 17:47:18,035 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Starting resolution types of Umbraco.Core.PropertyEditors.IPropertyValueConverter
2680+
2014-01-03 17:47:18,041 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Completed resolution of types of Umbraco.Core.PropertyEditors.IPropertyValueConverter, found 14 (took 6ms)
2681+
2014-01-03 17:47:18,060 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Starting resolution types of Umbraco.Web.Mvc.SurfaceController
2682+
2014-01-03 17:47:18,064 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Completed resolution of types of Umbraco.Web.Mvc.SurfaceController, found 4 (took 4ms)
2683+
2014-01-03 17:47:18,065 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Starting resolution types of Umbraco.Web.WebApi.UmbracoApiController
2684+
2014-01-03 17:47:18,071 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Completed resolution of types of Umbraco.Web.WebApi.UmbracoApiController, found 32 (took 5ms)
2685+
2014-01-03 17:47:18,077 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Starting resolution types of Umbraco.Core.Media.IThumbnailProvider
2686+
2014-01-03 17:47:18,084 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Completed resolution of types of Umbraco.Core.Media.IThumbnailProvider, found 3 (took 6ms)
2687+
2014-01-03 17:47:18,085 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Starting resolution types of Umbraco.Core.Media.IImageUrlProvider
2688+
2014-01-03 17:47:18,091 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Completed resolution of types of Umbraco.Core.Media.IImageUrlProvider, found 1 (took 6ms)
2689+
2014-01-03 17:47:19,179 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Starting resolution types of umbraco.interfaces.IApplication
2690+
2014-01-03 17:47:19,190 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Completed resolution of types of umbraco.interfaces.IApplication, found 7 (took 11ms)
2691+
2014-01-03 17:47:19,302 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Starting resolution types of Umbraco.Web.Trees.TreeController
2692+
2014-01-03 17:47:19,307 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 5ms)
2693+
2014-01-03 17:47:19,322 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Starting resolution types of umbraco.interfaces.ITree
2694+
2014-01-03 17:47:19,329 [16] INFO Umbraco.Core.PluginManager - [Thread 23] Completed resolution of types of umbraco.interfaces.ITree, found 19 (took 6ms)
2695+
2014-01-03 17:47:19,341 [16] INFO Umbraco.Web.Search.ExamineEvents - [Thread 23] Initializing Examine and binding to business logic events
2696+
2014-01-03 17:47:19,603 [16] INFO Umbraco.Web.Search.ExamineEvents - [Thread 23] Adding examine event handlers for index providers: 3
2697+
2014-01-03 17:47:21,388 [16] INFO Umbraco.Core.PluginManager - [Thread 45] Starting resolution types of Umbraco.Web.Trees.TreeController
2698+
2014-01-03 17:47:21,388 [16] INFO Umbraco.Core.PluginManager - [Thread 45] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)
2699+
2014-01-03 17:47:22,572 [16] INFO Umbraco.Core.PluginManager - [Thread 45] Starting resolution types of umbraco.interfaces.ITree
2700+
2014-01-03 17:47:22,581 [16] INFO Umbraco.Core.PluginManager - [Thread 45] Completed resolution of types of umbraco.interfaces.ITree, found 35 (took 9ms)
2701+
2014-01-03 17:47:50,776 [16] INFO Umbraco.Core.PluginManager - [Thread 66] Starting resolution types of Umbraco.Web.Trees.TreeController
2702+
2014-01-03 17:47:50,776 [16] INFO Umbraco.Core.PluginManager - [Thread 66] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)
2703+
2014-01-03 17:47:54,003 [16] INFO Umbraco.Core.PluginManager - [Thread 65] Starting resolution types of Umbraco.Web.Trees.TreeController
2704+
2014-01-03 17:47:54,003 [16] INFO Umbraco.Core.PluginManager - [Thread 65] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)
2705+
2014-01-03 17:51:19,704 [16] INFO umbraco.BusinessLogic.Log - [Thread 52] Log scrubbed. Removed all items older than 2013-11-04 17:51:19
2706+
2014-01-03 17:51:19,705 [16] INFO Umbraco.Core.UmbracoApplicationBase - [Thread 52] Application shutdown. Reason: BinDirChangeOrDirectoryRename
2707+
2014-01-03 17:51:40,727 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Determining hash of code files on disk
2708+
2014-01-03 17:51:40,757 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Hash determined (took 13ms)
2709+
2014-01-03 17:51:40,769 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Starting resolution types of umbraco.interfaces.IApplicationStartupHandler
2710+
2014-01-03 17:51:40,975 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Completed resolution of types of umbraco.interfaces.IApplicationStartupHandler, found 30 (took 203ms)
2711+
2014-01-03 17:51:41,096 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Starting resolution types of Umbraco.Core.PropertyEditors.IPropertyEditorValueConverter
2712+
2014-01-03 17:51:41,100 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Completed resolution of types of Umbraco.Core.PropertyEditors.IPropertyEditorValueConverter, found 0 (took 4ms)
2713+
2014-01-03 17:51:41,101 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Starting resolution types of Umbraco.Core.PropertyEditors.IPropertyValueConverter
2714+
2014-01-03 17:51:41,107 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Completed resolution of types of Umbraco.Core.PropertyEditors.IPropertyValueConverter, found 14 (took 5ms)
2715+
2014-01-03 17:51:41,125 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Starting resolution types of Umbraco.Web.Mvc.SurfaceController
2716+
2014-01-03 17:51:41,129 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Completed resolution of types of Umbraco.Web.Mvc.SurfaceController, found 4 (took 3ms)
2717+
2014-01-03 17:51:41,130 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Starting resolution types of Umbraco.Web.WebApi.UmbracoApiController
2718+
2014-01-03 17:51:41,135 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Completed resolution of types of Umbraco.Web.WebApi.UmbracoApiController, found 32 (took 5ms)
2719+
2014-01-03 17:51:41,141 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Starting resolution types of Umbraco.Core.Media.IThumbnailProvider
2720+
2014-01-03 17:51:41,145 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Completed resolution of types of Umbraco.Core.Media.IThumbnailProvider, found 3 (took 3ms)
2721+
2014-01-03 17:51:41,145 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Starting resolution types of Umbraco.Core.Media.IImageUrlProvider
2722+
2014-01-03 17:51:41,151 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Completed resolution of types of Umbraco.Core.Media.IImageUrlProvider, found 1 (took 5ms)
2723+
2014-01-03 17:51:42,271 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Starting resolution types of Umbraco.Web.Trees.TreeController
2724+
2014-01-03 17:51:42,280 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 9ms)
2725+
2014-01-03 17:51:42,305 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Starting resolution types of umbraco.interfaces.ITree
2726+
2014-01-03 17:51:42,314 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Completed resolution of types of umbraco.interfaces.ITree, found 19 (took 8ms)
2727+
2014-01-03 17:51:42,332 [58] INFO Umbraco.Web.Search.ExamineEvents - [Thread 7] Initializing Examine and binding to business logic events
2728+
2014-01-03 17:51:42,600 [58] INFO Umbraco.Web.Search.ExamineEvents - [Thread 7] Adding examine event handlers for index providers: 3
2729+
2014-01-03 17:51:42,611 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Starting resolution types of umbraco.interfaces.IApplication
2730+
2014-01-03 17:51:42,620 [58] INFO Umbraco.Core.PluginManager - [Thread 7] Completed resolution of types of umbraco.interfaces.IApplication, found 7 (took 8ms)
2731+
2014-01-03 17:51:44,230 [58] INFO Umbraco.Core.PluginManager - [Thread 42] Starting resolution types of Umbraco.Web.Trees.TreeController
2732+
2014-01-03 17:51:44,230 [58] INFO Umbraco.Core.PluginManager - [Thread 42] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)
2733+
2014-01-03 17:51:45,366 [58] INFO Umbraco.Core.PluginManager - [Thread 42] Starting resolution types of umbraco.interfaces.ITree
2734+
2014-01-03 17:51:45,377 [58] INFO Umbraco.Core.PluginManager - [Thread 42] Completed resolution of types of umbraco.interfaces.ITree, found 35 (took 10ms)
2735+
2014-01-03 17:51:47,195 [58] INFO Umbraco.Core.PluginManager - [Thread 61] Starting resolution types of Umbraco.Web.Trees.TreeController
2736+
2014-01-03 17:51:47,195 [58] INFO Umbraco.Core.PluginManager - [Thread 61] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)
2737+
2014-01-03 17:51:49,558 [58] INFO Umbraco.Core.PluginManager - [Thread 42] Starting resolution types of Umbraco.Web.Trees.TreeController
2738+
2014-01-03 17:51:49,558 [58] INFO Umbraco.Core.PluginManager - [Thread 42] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)

‎Analytics.Site/App_Data/Umbraco.sdf

0 Bytes
Binary file not shown.

‎Analytics.Site/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Keyword.Controller.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
statsResource.getkeywords(profileID,$scope.dateFilter.startDate, $scope.dateFilter.endDate).then(function (response) {
1818
$scope.keywords = response.data.ApiResult;
1919

20-
var chartData = response.data.ChartData;
20+
//var chartData = response.data.ChartData;
2121

22-
//Create Bar Chart
23-
var ctx = document.getElementById("keywords").getContext("2d");
24-
var keywordsChart = new Chart(ctx).Bar(chartData);
22+
////Create Bar Chart
23+
//var ctx = document.getElementById("keywords").getContext("2d");
24+
//var keywordsChart = new Chart(ctx).Bar(chartData);
2525
});
2626

2727
});

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
</div>
66

77
<h4>Browser</h4>
8-
<h5>Showing stats for {{ profile.WebsiteUrl }} </h5>
98

109
<canvas id="browsers" width="650" height="450"></canvas>
1110

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ <h4>Loading data...</h4>
99
</div>
1010

1111
<div ng-show="!loadingViews">
12-
<h6>Showing stats for {{ profile.WebsiteUrl }} </h6>
12+
<h4>Country</h4>
1313

1414
<div id="countryChart"></div>
1515

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</div>
66

77
<h4>Device Types</h4>
8-
<h6>Showing stats for {{ profile.WebsiteUrl }} </h6>
8+
99

1010
<canvas id="deviceType" width="650" height="450"></canvas>
1111

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
<div ng-model="dateFilter" date-range-picker class="pull-right" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc">
55
</div>
66

7-
8-
<h6>Showing stats for {{ profile.WebsiteUrl }} </h6>
9-
10-
<canvas id="keywords" width="650" height="450"></canvas>
7+
<h4>Keywords</h4>
118

129
<table class="table table-striped">
1310
<thead>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div ng-model="dateFilter" date-range-picker class="pull-right" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc">
55
</div>
66

7-
<h6>Showing stats for {{ profile.WebsiteUrl }} </h6>
7+
<h4>Language</h4>
88

99
<table class="table table-striped">
1010
<thead>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</div>
66

77
<h4>OS</h4>
8-
<h6>Showing stats for {{ profile.WebsiteUrl }} </h6>
8+
99

1010
<canvas id="os" width="650" height="450"></canvas>
1111

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
<div ng-model="dateFilter" date-range-picker class="pull-right" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc">
55
</div>
6-
7-
<h6>Showing stats for {{ profile.WebsiteUrl }} </h6>
6+
<h4>Screen resolution</h4>
7+
88

99
<table class="table table-striped">
1010
<thead>

0 commit comments

Comments
 (0)