Skip to content

Commit 5767aeb

Browse files
author
Tim Geyssens
committed
Update to make settings page follow convention of all other pages
1 parent 556e8ab commit 5767aeb

File tree

9 files changed

+99
-8
lines changed

9 files changed

+99
-8
lines changed

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

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,3 +612,77 @@
612612
2014-01-06 14:53:37,513 [104] INFO Umbraco.Core.PluginManager - [Thread 6] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)
613613
2014-01-06 14:53:38,833 [104] INFO Umbraco.Core.PluginManager - [Thread 68] Starting resolution types of umbraco.interfaces.ITree
614614
2014-01-06 14:53:38,842 [104] INFO Umbraco.Core.PluginManager - [Thread 68] Completed resolution of types of umbraco.interfaces.ITree, found 35 (took 9ms)
615+
2014-01-06 15:07:36,359 [104] INFO umbraco.BusinessLogic.Log - [Thread 71] Log scrubbed. Removed all items older than 2013-11-07 15:07:36
616+
2014-01-06 15:07:36,360 [104] INFO Umbraco.Core.UmbracoApplicationBase - [Thread 71] Application shutdown. Reason: BinDirChangeOrDirectoryRename
617+
2014-01-06 15:07:53,230 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Determining hash of code files on disk
618+
2014-01-06 15:07:53,250 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Hash determined (took 9ms)
619+
2014-01-06 15:07:53,264 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Starting resolution types of umbraco.interfaces.IApplicationStartupHandler
620+
2014-01-06 15:07:53,467 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Completed resolution of types of umbraco.interfaces.IApplicationStartupHandler, found 30 (took 200ms)
621+
2014-01-06 15:07:53,586 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Starting resolution types of Umbraco.Core.PropertyEditors.IPropertyEditorValueConverter
622+
2014-01-06 15:07:53,590 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Completed resolution of types of Umbraco.Core.PropertyEditors.IPropertyEditorValueConverter, found 0 (took 4ms)
623+
2014-01-06 15:07:53,592 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Starting resolution types of Umbraco.Core.PropertyEditors.IPropertyValueConverter
624+
2014-01-06 15:07:53,597 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Completed resolution of types of Umbraco.Core.PropertyEditors.IPropertyValueConverter, found 14 (took 5ms)
625+
2014-01-06 15:07:53,615 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Starting resolution types of Umbraco.Web.Mvc.SurfaceController
626+
2014-01-06 15:07:53,618 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Completed resolution of types of Umbraco.Web.Mvc.SurfaceController, found 4 (took 3ms)
627+
2014-01-06 15:07:53,619 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Starting resolution types of Umbraco.Web.WebApi.UmbracoApiController
628+
2014-01-06 15:07:53,626 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Completed resolution of types of Umbraco.Web.WebApi.UmbracoApiController, found 32 (took 7ms)
629+
2014-01-06 15:07:53,630 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Starting resolution types of Umbraco.Core.Media.IThumbnailProvider
630+
2014-01-06 15:07:53,636 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Completed resolution of types of Umbraco.Core.Media.IThumbnailProvider, found 3 (took 5ms)
631+
2014-01-06 15:07:53,637 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Starting resolution types of Umbraco.Core.Media.IImageUrlProvider
632+
2014-01-06 15:07:53,641 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Completed resolution of types of Umbraco.Core.Media.IImageUrlProvider, found 1 (took 4ms)
633+
2014-01-06 15:07:54,699 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Starting resolution types of umbraco.interfaces.IApplication
634+
2014-01-06 15:07:54,709 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Completed resolution of types of umbraco.interfaces.IApplication, found 7 (took 10ms)
635+
2014-01-06 15:07:54,756 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Starting resolution types of Umbraco.Web.Trees.TreeController
636+
2014-01-06 15:07:54,762 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 5ms)
637+
2014-01-06 15:07:54,776 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Starting resolution types of umbraco.interfaces.ITree
638+
2014-01-06 15:07:54,783 [51] INFO Umbraco.Core.PluginManager - [Thread 113] Completed resolution of types of umbraco.interfaces.ITree, found 19 (took 6ms)
639+
2014-01-06 15:07:54,794 [51] INFO Umbraco.Web.Search.ExamineEvents - [Thread 113] Initializing Examine and binding to business logic events
640+
2014-01-06 15:07:55,023 [51] INFO Umbraco.Web.Search.ExamineEvents - [Thread 113] Adding examine event handlers for index providers: 3
641+
2014-01-06 15:07:55,917 [51] INFO Umbraco.Core.PluginManager - [Thread 67] Starting resolution types of Umbraco.Web.Trees.TreeController
642+
2014-01-06 15:07:55,917 [51] INFO Umbraco.Core.PluginManager - [Thread 67] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)
643+
2014-01-06 15:08:02,165 [51] INFO Umbraco.Core.PluginManager - [Thread 68] Starting resolution types of Umbraco.Core.Persistence.Mappers.BaseMapper
644+
2014-01-06 15:08:02,170 [51] INFO Umbraco.Core.PluginManager - [Thread 68] Completed resolution of types of Umbraco.Core.Persistence.Mappers.BaseMapper, found 20 (took 4ms)
645+
2014-01-06 15:08:02,415 [51] INFO Umbraco.Web.Security.WebSecurity - [Thread 68] User Id: 0 logged in
646+
2014-01-06 15:08:02,762 [51] INFO Umbraco.Core.PluginManager - [Thread 89] Starting resolution types of umbraco.interfaces.ITree
647+
2014-01-06 15:08:02,773 [51] INFO Umbraco.Core.PluginManager - [Thread 89] Completed resolution of types of umbraco.interfaces.ITree, found 35 (took 10ms)
648+
2014-01-06 15:08:41,935 [51] INFO Umbraco.Core.PluginManager - [Thread 5] Starting resolution types of Umbraco.Web.Trees.TreeController
649+
2014-01-06 15:08:41,935 [51] INFO Umbraco.Core.PluginManager - [Thread 5] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)
650+
2014-01-06 15:08:56,435 [51] INFO Umbraco.Core.PluginManager - [Thread 62] Starting resolution types of Umbraco.Web.Trees.TreeController
651+
2014-01-06 15:08:56,435 [51] INFO Umbraco.Core.PluginManager - [Thread 62] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)
652+
2014-01-06 15:09:09,565 [51] INFO Umbraco.Core.PluginManager - [Thread 89] Starting resolution types of Umbraco.Web.Trees.TreeController
653+
2014-01-06 15:09:09,565 [51] INFO Umbraco.Core.PluginManager - [Thread 89] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)
654+
2014-01-06 15:09:20,923 [51] INFO Umbraco.Core.PluginManager - [Thread 15] Starting resolution types of Umbraco.Web.Trees.TreeController
655+
2014-01-06 15:09:20,923 [51] INFO Umbraco.Core.PluginManager - [Thread 15] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)
656+
2014-01-06 15:10:41,784 [51] INFO umbraco.CreatedPackageTasks - [Thread 15] Xml save started
657+
2014-01-06 15:10:47,800 [51] INFO Umbraco.Core.PluginManager - [Thread 68] Starting resolution types of Umbraco.Web.Trees.TreeController
658+
2014-01-06 15:10:47,800 [51] INFO Umbraco.Core.PluginManager - [Thread 68] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)
659+
2014-01-06 15:13:23,653 [51] INFO umbraco.BusinessLogic.Log - [Thread 6] Log scrubbed. Removed all items older than 2013-11-07 15:13:23
660+
2014-01-06 15:13:23,655 [51] INFO Umbraco.Core.UmbracoApplicationBase - [Thread 6] Application shutdown. Reason: BinDirChangeOrDirectoryRename
661+
2014-01-06 15:13:34,550 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Determining hash of code files on disk
662+
2014-01-06 15:13:34,572 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Hash determined (took 9ms)
663+
2014-01-06 15:13:34,585 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Starting resolution types of umbraco.interfaces.IApplicationStartupHandler
664+
2014-01-06 15:13:34,819 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Completed resolution of types of umbraco.interfaces.IApplicationStartupHandler, found 30 (took 231ms)
665+
2014-01-06 15:13:34,961 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Starting resolution types of Umbraco.Core.PropertyEditors.IPropertyEditorValueConverter
666+
2014-01-06 15:13:34,966 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Completed resolution of types of Umbraco.Core.PropertyEditors.IPropertyEditorValueConverter, found 0 (took 5ms)
667+
2014-01-06 15:13:34,967 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Starting resolution types of Umbraco.Core.PropertyEditors.IPropertyValueConverter
668+
2014-01-06 15:13:34,973 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Completed resolution of types of Umbraco.Core.PropertyEditors.IPropertyValueConverter, found 14 (took 5ms)
669+
2014-01-06 15:13:34,993 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Starting resolution types of Umbraco.Web.Mvc.SurfaceController
670+
2014-01-06 15:13:34,997 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Completed resolution of types of Umbraco.Web.Mvc.SurfaceController, found 4 (took 4ms)
671+
2014-01-06 15:13:34,999 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Starting resolution types of Umbraco.Web.WebApi.UmbracoApiController
672+
2014-01-06 15:13:35,005 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Completed resolution of types of Umbraco.Web.WebApi.UmbracoApiController, found 32 (took 6ms)
673+
2014-01-06 15:13:35,011 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Starting resolution types of Umbraco.Core.Media.IThumbnailProvider
674+
2014-01-06 15:13:35,016 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Completed resolution of types of Umbraco.Core.Media.IThumbnailProvider, found 3 (took 4ms)
675+
2014-01-06 15:13:35,017 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Starting resolution types of Umbraco.Core.Media.IImageUrlProvider
676+
2014-01-06 15:13:35,021 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Completed resolution of types of Umbraco.Core.Media.IImageUrlProvider, found 1 (took 4ms)
677+
2014-01-06 15:13:36,054 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Starting resolution types of umbraco.interfaces.IApplication
678+
2014-01-06 15:13:36,068 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Completed resolution of types of umbraco.interfaces.IApplication, found 7 (took 13ms)
679+
2014-01-06 15:13:36,180 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Starting resolution types of Umbraco.Web.Trees.TreeController
680+
2014-01-06 15:13:36,187 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 6ms)
681+
2014-01-06 15:13:36,202 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Starting resolution types of umbraco.interfaces.ITree
682+
2014-01-06 15:13:36,209 [19] INFO Umbraco.Core.PluginManager - [Thread 75] Completed resolution of types of umbraco.interfaces.ITree, found 19 (took 6ms)
683+
2014-01-06 15:13:36,223 [19] INFO Umbraco.Web.Search.ExamineEvents - [Thread 75] Initializing Examine and binding to business logic events
684+
2014-01-06 15:13:36,716 [19] INFO Umbraco.Web.Search.ExamineEvents - [Thread 75] Adding examine event handlers for index providers: 3
685+
2014-01-06 15:13:44,425 [19] INFO Umbraco.Core.PluginManager - [Thread 83] Starting resolution types of Umbraco.Web.Trees.TreeController
686+
2014-01-06 15:13:44,425 [19] INFO Umbraco.Core.PluginManager - [Thread 83] Completed resolution of types of Umbraco.Web.Trees.TreeController, found 5 (took 0ms)
687+
2014-01-06 15:13:45,551 [19] INFO Umbraco.Core.PluginManager - [Thread 71] Starting resolution types of umbraco.interfaces.ITree
688+
2014-01-06 15:13:45,577 [19] INFO Umbraco.Core.PluginManager - [Thread 71] Completed resolution of types of umbraco.interfaces.ITree, found 35 (took 25ms)

‎Analytics.Site/App_Data/Umbraco.sdf

0 Bytes
Binary file not shown.

‎Analytics.Site/App_Plugins/Analytics/account.config

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-

1+
{
2+
"Id": "4113171",
3+
"Name": "www.nibble.be",
4+
"Created": "2008-04-13T14:26:12+02:00",
5+
"Updated": "2011-07-20T00:58:59.981+02:00"
6+
}

‎Analytics.Site/App_Plugins/Analytics/backOffice/AnalyticsTree/edit.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<umb-panel ng-controller="Analytics.EditController">
22
<umb-header>
33
<div class="span4">
4-
<h1>{{ sectionName }}</h1>
4+
<h1>Analytics for Umbraco</h1>
55
</div>
66
<div class="span8">
77

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div ng-controller="Analytics.SettingsController">
22
<div class="umb-pane form-horizontal">
3-
3+
<h4>Settings</h4>
44
<umb-control-group ng-hide="hasAuthd()" label="Authorisation" description="Login with Google via oAuth to verify">
55
<button class="btn btn-success" ng-click="auth()"><span class="icon-lock"></span> Authorize</button>
66
</umb-control-group>

‎Analytics.Site/App_Plugins/Analytics/profile.config

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
1-

1+
{
2+
"Id": "8245037",
3+
"AccountId": "4113171",
4+
"WebPropertyId": "UA-4113171-1",
5+
"InternalWebPropertyId": "7923617",
6+
"Name": "www.nibble.be",
7+
"Currency": "USD",
8+
"Timezone": "Europe/Brussels",
9+
"WebsiteUrl": "www.nibble.be",
10+
"Type": "WEB",
11+
"Created": "2008-04-13T14:26:12+02:00",
12+
"Updated": "2011-09-20T09:34:04.996+02:00"
13+
}

‎Analytics.Site/App_Plugins/Analytics/settings.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Analytics>
33
<ClientId label="Client ID" description="This is the Client ID key from the Google API">206456221167-1a6npdlit92260gfaekomgon8cm0ratg</ClientId>
44
<ClientSecret label="Client Secret" description="This is the Client Secret from the Google API">_LklwvmJC0EIkEprcRB4keQ_</ClientSecret>
5-
<RefreshToken label="Refresh Token" description="The refresh token used to acquire new access tokens. This is sensitive information."></RefreshToken>
5+
<RefreshToken label="Refresh Token" description="The refresh token used to acquire new access tokens. This is sensitive information.">1/jFgtcpPN9htmzxRjht9ybJvpOwdhdRsZnAH7tm3H3pI</RefreshToken>
66
</Analytics>

‎Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/edit.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<umb-panel ng-controller="Analytics.EditController">
22
<umb-header>
33
<div class="span4">
4-
<h1>{{ sectionName }}</h1>
4+
<h1>Analytics for Umbraco</h1>
55
</div>
66
<div class="span8">
77

‎Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/settings.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div ng-controller="Analytics.SettingsController">
22
<div class="umb-pane form-horizontal">
3-
3+
<h4>Settings</h4>
44
<umb-control-group ng-hide="hasAuthd()" label="Authorisation" description="Login with Google via oAuth to verify">
55
<button class="btn btn-success" ng-click="auth()"><span class="icon-lock"></span> Authorize</button>
66
</umb-control-group>

0 commit comments

Comments
 (0)