From a2252c1b5b42a2a223b0b5577eb756c65ae891bf Mon Sep 17 00:00:00 2001
From: unknown <jmwright798@gmail.com>
Date: Tue, 7 Jul 2015 22:31:21 -0500
Subject: [PATCH] UI fixes working on campaign results page

---
 static/css/dataTables.bootstrap.css |  2 +-
 static/js/app/campaigns.js          |  6 +++---
 static/js/app/templates.js          |  2 +-
 static/js/app/users.js              |  2 +-
 templates/base.html                 | 12 ++++++------
 templates/campaign_results.html     | 17 +++++++++++------
 templates/campaigns.html            |  2 +-
 7 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/static/css/dataTables.bootstrap.css b/static/css/dataTables.bootstrap.css
index f238fd18..f713b7a5 100644
--- a/static/css/dataTables.bootstrap.css
+++ b/static/css/dataTables.bootstrap.css
@@ -68,7 +68,7 @@ table.dataTable th {
 table.dataTable {
 	clear: both;
 	margin-top: 6px !important;
-	margin-bottom: 6px !important;
+	margin-bottom: 12px !important;
 	max-width: none !important;
 }
 
diff --git a/static/js/app/campaigns.js b/static/js/app/campaigns.js
index 798f7374..32288a3c 100644
--- a/static/js/app/campaigns.js
+++ b/static/js/app/campaigns.js
@@ -57,10 +57,10 @@ $(document).ready(function(){
             campaignTable = $("#campaignTable").DataTable();
             $.each(campaigns, function(i, campaign){
                 campaignTable.row.add([
-                    moment(campaign.created_date).format('MMMM Do YYYY, h:mm:ss a'),
                     campaign.name,
-                    campaign.status,
-                    "<div class='pull-right'><button class='btn btn-success' onclick='alert(\"test\")'>\
+                    moment(campaign.created_date).format('MMMM Do YYYY, h:mm:ss a'),
+                    "<span class=\"label label-primary\">" + campaign.status + "</span>",
+                    "<div class='pull-right'><button class='btn btn-primary' onclick='alert(\"test\")'>\
                     <i class='fa fa-bar-chart'></i>\
                     </button>\
                     <button class='btn btn-danger' onclick='alert(\"test\")'>\
diff --git a/static/js/app/templates.js b/static/js/app/templates.js
index 4bc4030b..fb461714 100644
--- a/static/js/app/templates.js
+++ b/static/js/app/templates.js
@@ -93,7 +93,7 @@ function load(){
                 templateTable.row.add([
                     template.name,
                     moment(template.modified_date).format('MMMM Do YYYY, h:mm:ss a'),
-                    "<div class='pull-right'><button class='btn btn-success' onclick='alert(\"test\")'>\
+                    "<div class='pull-right'><button class='btn btn-primary' onclick='alert(\"test\")'>\
                     <i class='fa fa-pencil'></i>\
                     </button>\
                     <button class='btn btn-danger' onclick='alert(\"test\")'>\
diff --git a/static/js/app/users.js b/static/js/app/users.js
index c70199a4..d74d81d0 100644
--- a/static/js/app/users.js
+++ b/static/js/app/users.js
@@ -108,7 +108,7 @@ function load(){
                     group.name,
                     targets,
                     moment(group.modified_date).format('MMMM Do YYYY, h:mm:ss a'),
-                    "<div class='pull-right'><button class='btn btn-success' onclick='alert(\"test\")'>\
+                    "<div class='pull-right'><button class='btn btn-primary' onclick='alert(\"test\")'>\
                     <i class='fa fa-pencil'></i>\
                     </button>\
                     <button class='btn btn-danger' onclick='alert(\"test\")'>\
diff --git a/templates/base.html b/templates/base.html
index c4c72e11..762df25e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -50,17 +50,17 @@
             </div>
             <div class="navbar-collapse collapse">
                 <ul class="nav navbar-nav navbar-right">
-                    <li><a href="#/">Dashboard</a>
+                    <li><a href="/">Dashboard</a>
                     </li>
-                    <li><a href="#/campaigns">Campaigns</a>
+                    <li><a href="/campaigns">Campaigns</a>
                     </li>
-                    <li><a href="#/users">Users &amp; Groups</a>
+                    <li><a href="/users">Users &amp; Groups</a>
                     </li>
-                    <li><a href="#/templates">Email Templates</a>
+                    <li><a href="/templates">Email Templates</a>
                     </li>
-                    <li><a href="#/landing_pages">Landing Pages</a>
+                    <li><a href="/landing_pages">Landing Pages</a>
                     </li>
-                    <li><a href="#/settings">Settings</a>
+                    <li><a href="/settings">Settings</a>
                     </li>
                     <li><a href="/api/">API Documentation</a>
                     </li>
diff --git a/templates/campaign_results.html b/templates/campaign_results.html
index a0e17d05..f39b30ec 100644
--- a/templates/campaign_results.html
+++ b/templates/campaign_results.html
@@ -3,9 +3,9 @@
     <div class="row">
         <div class="col-sm-3 col-md-2 sidebar">
             <ul class="nav nav-sidebar">
-                <li><a href="#">Dashboard</a>
+                <li><a href="/">Dashboard</a>
                 </li>
-                <li class="active"><a href="#/campaigns">Campaigns</a>
+                <li class="active"><a href="/campaigns">Campaigns</a>
                 </li>
                 <li><a href="/users">Users &amp; Groups</a>
                 </li>
@@ -24,7 +24,7 @@
 <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main" ng-controller="CampaignResultsCtrl">
     <div ng-show="campaign">
         <div class="row">
-            <h1 class="page-header">Results for {{campaign.name}}</h1>
+            <h1 class="page-header">Results for campaign.name</h1>
         </div>
         <div class="row">
             <div class="btn-group">
@@ -39,7 +39,7 @@
                     </li>
                 </ul>
             </div>
-            <button type="button" class="btn btn-danger" tooltip="Delete Campaign" tooltip-placement="right" ng-click="delete(campaign)" ng-href="#/dashboard"><i class="fa fa-times fa-lg"></i>
+            <button type="button" class="btn btn-danger" tooltip="Delete Campaign" tooltip-placement="right" ng-click="delete(campaign)" ng-href="/dashboard"><i class="fa fa-times fa-lg"></i>
             </button>
         </div>
         <br />
@@ -65,8 +65,8 @@
             <table ng-table="mainTableParams" class="table table-hover table-striped table-bordered">
                 <tbody>
                     <tr ng-repeat="result in $data" class="editable-row">
-                        <td data-title="'Email'" class="col-sm-1">{{result.email}}</td>
-                        <td data-title="'Status'" class="col-sm-2">{{result.status}}</td>
+                        <td data-title="'Email'" class="col-sm-1">result.email</td>
+                        <td data-title="'Status'" class="col-sm-2">result.status</td>
                     </tr>
                 </tbody>
             </table>
@@ -81,3 +81,8 @@
     </div>
 </div>
 {{end}}
+{{define "scripts"}}
+<script src="/js/hogan.js"></script>
+<script src="/js/typeahead.min.js"></script>
+<script src="/js/app/campaign_results.js"></script>
+{{end}}
diff --git a/templates/campaigns.html b/templates/campaigns.html
index 39fdf65e..858b831b 100644
--- a/templates/campaigns.html
+++ b/templates/campaigns.html
@@ -41,8 +41,8 @@
         <table id="campaignTable" class="table" style="display:none;">
             <thead>
                 <tr>
-                    <th>Created Date</th>
                     <th>Name</th>
+                    <th>Created Date</th>
                     <th>Status</th>
                     <th class="col-md-2"></th>
                 </tr>