Skip to content

Commit 5cf97d4

Browse files
author
Tim Geyssens
committed
Some work on making date range picker filter the data
1 parent e60ee75 commit 5cf97d4

File tree

9 files changed

+6477
-559
lines changed

9 files changed

+6477
-559
lines changed

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

Lines changed: 3268 additions & 1 deletion
Large diffs are not rendered by default.

‎Analytics.Site/App_Data/Logs/UmbracoTraceLog.txt.2014-01-04

Lines changed: 3169 additions & 521 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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-
}
1+


‎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,7 +1,7 @@
11
<div ng-controller="Analytics.SettingsController">
22
<div class="umb-pane">
33
<umb-control-group ng-hide="hasAuthd()" label="Authorisation" description="Login with Google via oAuth to verify">
4-
<button class="btn btn-success" ng-click="auth()">Authorize</button>
4+
<button class="btn btn-success" ng-click="auth()"><span class="icon-lock"></span> Authorize</button>
55
</umb-control-group>
66

77
<umb-control-group ng-repeat="setting in settings" label="{{ setting.Label }}" description="{{ setting.Description }}">

‎Analytics.Site/App_Plugins/Analytics/backOffice/OAuthCallback.aspx

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@
44
<head>
55
<title>Analytics for Umbraco oAuth</title>
66
<link rel="stylesheet" href="/umbraco/assets/css/umbraco.css" />
7+
8+
<style>
9+
.authcontainer {
10+
padding: 20px;
11+
}
12+
13+
h1 {
14+
margin: 0 0 25px 0;
15+
}
16+
</style>
717
</head>
818
<body>
919
<script type="text/javascript">
@@ -17,13 +27,13 @@
1727
}
1828
</script>
1929

20-
<div class="container">
21-
<div class="row">
22-
<div class="span10">
23-
<h1>Analytics for Umbraco</h1>
24-
<asp:Literal runat="server" ID="Content" />
25-
</div>
26-
</div>
30+
<div class="authcontainer">
31+
<h1>
32+
<span class="icon-pulse"></span>
33+
Analytics for Umbraco
34+
</h1>
35+
36+
<asp:Literal runat="server" ID="Content" />
2737
</div>
2838

2939
</body>

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -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-
}
1+


‎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.">1/8yPreeBbqoFR5jVLWfH_lGCCWQnGTwrW84mKQ7jbv70</RefreshToken>
5+
<RefreshToken label="Refresh Token" description="The refresh token used to acquire new access tokens. This is sensitive information."></RefreshToken>
66
</Analytics>

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

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

77
<umb-control-group ng-repeat="setting in settings" label="{{ setting.Label }}" description="{{ setting.Description }}">

‎Analytics/App_Plugins/Analytics/backOffice/OAuthCallback.aspx

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@
44
<head>
55
<title>Analytics for Umbraco oAuth</title>
66
<link rel="stylesheet" href="/umbraco/assets/css/umbraco.css" />
7+
8+
<style>
9+
.authcontainer {
10+
padding: 20px;
11+
}
12+
13+
h1 {
14+
margin: 0 0 25px 0;
15+
}
16+
</style>
717
</head>
818
<body>
919
<script type="text/javascript">
@@ -17,13 +27,13 @@
1727
}
1828
</script>
1929

20-
<div class="container">
21-
<div class="row">
22-
<div class="span10">
23-
<h1>Analytics for Umbraco</h1>
24-
<asp:Literal runat="server" ID="Content" />
25-
</div>
26-
</div>
30+
<div class="authcontainer">
31+
<h1>
32+
<span class="icon-pulse"></span>
33+
Analytics for Umbraco
34+
</h1>
35+
36+
<asp:Literal runat="server" ID="Content" />
2737
</div>
2838

2939
</body>

0 commit comments

Comments
 (0)