Fixes allignment on settings page

Tim Geyssens · Tim Geyssens · commit 0173108e30b8 · 2014-01-06T14:53:59.000+01:00
diff --git a/Analytics.Site/App_Data/Logs/UmbracoTraceLog.txt b/Analytics.Site/App_Data/Logs/UmbracoTraceLog.txt
diff --git a/Analytics.Site/App_Data/Umbraco.sdf b/Analytics.Site/App_Data/Umbraco.sdf
diff --git a/Analytics.Site/App_Plugins/Analytics/account.config b/Analytics.Site/App_Plugins/Analytics/account.config
@@ -1,6 +1 @@
-{
-  "Id": "4113171",
-  "Name": "www.nibble.be",
-  "Created": "2008-04-13T14:26:12+02:00",
-  "Updated": "2011-07-20T00:58:59.981+02:00"
-}
+﻿ 
diff --git a/Analytics.Site/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/PageViews.Controller.js b/Analytics.Site/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/PageViews.Controller.js
@@ -12,7 +12,7 @@
         
         $scope.$watch('dateFilter', function () {
             
-           
+            settingsResource.setDateFilter($scope.dateFilter.startDate, $scope.dateFilter.endDate);
             //Get Profile
             settingsResource.getprofile().then(function (response) {
                 $scope.profile = response.data;
diff --git a/Analytics.Site/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/settings.html b/Analytics.Site/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/settings.html
@@ -1,5 +1,6 @@
 ﻿<div ng-controller="Analytics.SettingsController">
-    <div class="umb-pane">
+    <div class="umb-pane form-horizontal">
+        
         <umb-control-group ng-hide="hasAuthd()" label="Authorisation" description="Login with Google via oAuth to verify">
             <button class="btn btn-success" ng-click="auth()"><span class="icon-lock"></span> Authorize</button>
         </umb-control-group>
@@ -16,7 +17,7 @@
                         Account
                         <small>Select which account you wish to view settings from</small>
                     </label>
-
+                  
                     <div class="controls controls-row">
                         
                         <select name="account" ng-model="selectedaccount" ng-change="accountSelected(selectedaccount)" ng-options="account.Name for account in accounts">
@@ -46,10 +47,10 @@ <h5>Web Property Id: {{ selectedprofile.WebPropertyId }}</h5>
         </div>
 
         
-       <!-- <h4>DEBUG</h4>
-        <textarea>{{ settings | json }}</textarea><br />
-        <textarea>{{ selectedaccount | json }}</textarea><br/>
-        <textarea>{{ selectedprofile | json }}</textarea>-->
+        <!-- <h4>DEBUG</h4>
+            <textarea>{{ settings | json }}</textarea><br />
+            <textarea>{{ selectedaccount | json }}</textarea><br/>
+            <textarea>{{ selectedprofile | json }}</textarea>-->
 
 
         <div class="umb-tab-buttons">
diff --git a/Analytics.Site/App_Plugins/Analytics/backOffice/AnalyticsTree/resources/Settings.Resource.js b/Analytics.Site/App_Plugins/Analytics/backOffice/AnalyticsTree/resources/Settings.Resource.js
@@ -52,7 +52,8 @@ angular.module("umbraco.resources")
                 if (dateFilter.startDate == null) {
                     dateFilter.startDate = moment().subtract('days', 29).format('YYYY-MM-DD');
                     dateFilter.endDate = moment().format('YYYY-MM-DD');
-                    setDateFilter(dateFilter.startDate, dateFilter.endDate);
+                    $cookieStore.put("analyticsStartDate", dateFilter.startDate);
+                    $cookieStore.put("analyticsEndDate", dateFilter.endDate);
                 }
                 
                 return dateFilter;
diff --git a/Analytics.Site/App_Plugins/Analytics/profile.config b/Analytics.Site/App_Plugins/Analytics/profile.config
@@ -1,13 +1 @@
-{
-  "Id": "8245037",
-  "AccountId": "4113171",
-  "WebPropertyId": "UA-4113171-1",
-  "InternalWebPropertyId": "7923617",
-  "Name": "www.nibble.be",
-  "Currency": "USD",
-  "Timezone": "Europe/Brussels",
-  "WebsiteUrl": "www.nibble.be",
-  "Type": "WEB",
-  "Created": "2008-04-13T14:26:12+02:00",
-  "Updated": "2011-09-20T09:34:04.996+02:00"
-}
+﻿ 
diff --git a/Analytics.Site/App_Plugins/Analytics/settings.config b/Analytics.Site/App_Plugins/Analytics/settings.config
@@ -1,6 +1,6 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8" ?>
 <Analytics>
   <ClientId label="Client ID" description="This is the Client ID key from the Google API">206456221167-1a6npdlit92260gfaekomgon8cm0ratg</ClientId>
   <ClientSecret label="Client Secret" description="This is the Client Secret from the Google API">_LklwvmJC0EIkEprcRB4keQ_</ClientSecret>
-  <RefreshToken label="Refresh Token" description="The refresh token used to acquire new access tokens. This is sensitive information.">1/8T0O1zrI2lVG7exZzmvUMlhNQPbN7NL2Tp6ijimsCvo</RefreshToken>
+  <RefreshToken label="Refresh Token" description="The refresh token used to acquire new access tokens. This is sensitive information."></RefreshToken>
 </Analytics>
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/settings.html b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/partials/settings.html
@@ -1,5 +1,6 @@
 ﻿<div ng-controller="Analytics.SettingsController">
-    <div class="umb-pane">
+    <div class="umb-pane form-horizontal">
+        
         <umb-control-group ng-hide="hasAuthd()" label="Authorisation" description="Login with Google via oAuth to verify">
             <button class="btn btn-success" ng-click="auth()"><span class="icon-lock"></span> Authorize</button>
         </umb-control-group>
@@ -16,7 +17,7 @@
                         Account
                         <small>Select which account you wish to view settings from</small>
                     </label>
-
+                  
                     <div class="controls controls-row">
                         
                         <select name="account" ng-model="selectedaccount" ng-change="accountSelected(selectedaccount)" ng-options="account.Name for account in accounts">
@@ -46,10 +47,10 @@ <h5>Web Property Id: {{ selectedprofile.WebPropertyId }}</h5>
         </div>
 
         
-       <!-- <h4>DEBUG</h4>
-        <textarea>{{ settings | json }}</textarea><br />
-        <textarea>{{ selectedaccount | json }}</textarea><br/>
-        <textarea>{{ selectedprofile | json }}</textarea>-->
+        <!-- <h4>DEBUG</h4>
+            <textarea>{{ settings | json }}</textarea><br />
+            <textarea>{{ selectedaccount | json }}</textarea><br/>
+            <textarea>{{ selectedprofile | json }}</textarea>-->
 
 
         <div class="umb-tab-buttons">

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,8 @@ angular.module("umbraco.resources")`
`52`	`52`	`if (dateFilter.startDate == null) {`
`53`	`53`	`dateFilter.startDate = moment().subtract('days', 29).format('YYYY-MM-DD');`
`54`	`54`	`dateFilter.endDate = moment().format('YYYY-MM-DD');`
`55`		`- setDateFilter(dateFilter.startDate, dateFilter.endDate);`
	`55`	`+ $cookieStore.put("analyticsStartDate", dateFilter.startDate);`
	`56`	`+ $cookieStore.put("analyticsEndDate", dateFilter.endDate);`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`return dateFilter;`