Merge branch 'master' into feature/date_bound_adj_fe_stats

3 files changed, 21 insertions, 6 deletions

diff --git a/public/css/admin.css b/public/css/admin.css
index f33a96d..b718f20 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -38,6 +38,7 @@ input.api-quota {
     width: 9em;
     font-size: .85em;
     height: .85em;
+    padding-left: 0.8em;
 }
 
 .wrap-text {
diff --git a/public/js/SetupCtrl.js b/public/js/SetupCtrl.js
new file mode 100644
index 0000000..c5fced4
--- /dev/null
+++ b/public/js/SetupCtrl.js
@@ -0,0 +1,20 @@
+polr.directive('setupTooltip', function() {
+    return {
+        scope: {
+            content: '@',
+        },
+        replace: true,
+        template: '<button data-content="{{ content }}" type="button" class="btn btn-xs btn-default setup-qmark" data-toggle="popover">?</button>'
+    }
+})
+
+polr.controller('SetupCtrl', function($scope) {
+    $scope.init = function () {
+        $('[data-toggle="popover"]').popover({
+            trigger: "hover",
+            placement: "right"
+        });
+    };
+
+    $scope.init();
+});
diff --git a/public/js/setup.js b/public/js/setup.js
deleted file mode 100644
index 924ceb2..0000000
--- a/public/js/setup.js
+++ /dev/null
@@ -1,6 +0,0 @@
-$(function () {
-    $('[data-toggle="popover"]').popover({
-        trigger: "hover",
-        placement: "right"
-    });
-});