From e6a9848c20d880b947e77d42dff7436200a26b10 Mon Sep 17 00:00:00 2001
From: William Woodson <wjwoodson@gmail.com>
Date: Sun, 17 Jan 2016 13:15:32 -0600
Subject: [PATCH] UI fixes to dashboard, campaign, and campaign_result views.
 fixes #76

---
 static/js/app/campaign_results.js | 2 +-
 static/js/app/campaigns.js        | 6 +++---
 static/js/app/dashboard.js        | 6 ++++--
 templates/campaign_results.html   | 2 +-
 templates/campaigns.html          | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/static/js/app/campaign_results.js b/static/js/app/campaign_results.js
index 002f0a57..b4c78c06 100644
--- a/static/js/app/campaign_results.js
+++ b/static/js/app/campaign_results.js
@@ -47,7 +47,7 @@ function deleteCampaign() {
     if (confirm("Are you sure you want to delete: " + campaign.name + "?")) {
         api.campaignId.delete(campaign.id)
             .success(function(msg) {
-                console.log(msg)
+                document.location.href = '/campaigns'
             })
             .error(function(e) {
                 $("#modal\\.flashes").empty().append("<div style=\"text-align:center\" class=\"alert alert-danger\">\
diff --git a/static/js/app/campaigns.js b/static/js/app/campaigns.js
index 1cf81a17..a4ebc0d1 100644
--- a/static/js/app/campaigns.js
+++ b/static/js/app/campaigns.js
@@ -58,7 +58,7 @@ function deleteCampaign(idx) {
         api.campaignId.delete(campaigns[idx].id)
             .success(function(data) {
                 successFlash(data.message)
-                load()
+		location.reload()
             })
     }
 }
@@ -113,10 +113,10 @@ $(document).ready(function() {
                         campaign.name,
                         moment(campaign.created_date).format('MMMM Do YYYY, h:mm:ss a'),
                         "<span class=\"label " + label + "\">" + campaign.status + "</span>",
-                        "<div class='pull-right'><a class='btn btn-primary' href='/campaigns/" + campaign.id + "'>\
+                        "<div class='pull-right'><a class='btn btn-primary' href='/campaigns/" + campaign.id + "' data-toggle='tooltip' data-placement='right' title='View Results'>\
                     <i class='fa fa-bar-chart'></i>\
                     </a>\
-                    <button class='btn btn-danger' onclick='deleteCampaign(" + i + ")'>\
+                    <button class='btn btn-danger' onclick='deleteCampaign(" + i + ")' data-toggle='tooltip' data-placement='right' title='Delete Campaign'>\
                     <i class='fa fa-trash-o'></i>\
                     </button></div>"
                     ]).draw()
diff --git a/static/js/app/dashboard.js b/static/js/app/dashboard.js
index 59a03c29..37a3f379 100644
--- a/static/js/app/dashboard.js
+++ b/static/js/app/dashboard.js
@@ -14,6 +14,8 @@ function deleteCampaign(idx) {
         api.campaignId.delete(campaigns[idx].id)
             .success(function(data) {
                 successFlash(data.message)
+		load()
+		//location.reload()
             })
     }
 }
@@ -58,10 +60,10 @@ $(document).ready(function() {
                             campaign.name,
                             campaign_date,
                             "<span class=\"label " + label + "\">" + campaign.status + "</span>",
-                            "<div class='pull-right'><a class='btn btn-primary' href='/campaigns/" + campaign.id + "'>\
+                            "<div class='pull-right'><a class='btn btn-primary' href='/campaigns/" + campaign.id + "' data-toggle='tooltip' data-placement='right' title='View Results'>\
                     <i class='fa fa-bar-chart'></i>\
                     </a>\
-                    <button class='btn btn-danger' onclick='deleteCampaign(" + i + ")'>\
+                    <button class='btn btn-danger' onclick='deleteCampaign(" + i + ")' data-toggle='tooltip' data-placement='right' title='Delete Campaign'>\
                     <i class='fa fa-trash-o'></i>\
                     </button></div>"
                         ]).draw()
diff --git a/templates/campaign_results.html b/templates/campaign_results.html
index 8bba8327..bad1058f 100644
--- a/templates/campaign_results.html
+++ b/templates/campaign_results.html
@@ -45,7 +45,7 @@
             </div>
 	-->
             <button type="button" class="btn btn-danger" data-toggle="tooltip" data-placement="right" title="Delete Campaign" onclick="deleteCampaign()">
-                <i class="fa fa-times fa-lg"></i>
+                <i class="fa fa-trash-o fa-lg"></i>
             </button>
         </div>
         <br />
diff --git a/templates/campaigns.html b/templates/campaigns.html
index 8c8354c6..105b4c73 100644
--- a/templates/campaigns.html
+++ b/templates/campaigns.html
@@ -127,7 +127,7 @@
   </div>
 </div>
 {{end}}
-{{define "scripts"}}
+{{define "scripts"}}i
 <script src="/js/hogan.js"></script>
 <script src="/js/typeahead.min.js"></script>
 <script src="/js/app/campaigns.js"></script>