From 59b6aa16c1e625380629837cc704024a3b074beb Mon Sep 17 00:00:00 2001
From: unknown <jmwright798@gmail.com>
Date: Sun, 14 Jun 2015 18:15:29 -0500
Subject: [PATCH] Better UI Color consistency

---
 static/css/dashboard.css                     |  4 ++--
 static/js/app/controllers.js                 | 23 ++++++++++++++------
 static/js/app/partials/campaign_results.html |  4 ++--
 static/js/app/partials/campaigns.html        |  2 +-
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/static/css/dashboard.css b/static/css/dashboard.css
index 5fed6583..2efe8ce3 100644
--- a/static/css/dashboard.css
+++ b/static/css/dashboard.css
@@ -54,7 +54,7 @@ body {
 }
 .nav-sidebar > .active > a {
   color: #fff;
-  background-color: #428bca;
+  background-color: #34495e;
 }
 
 
@@ -93,4 +93,4 @@ body {
 .placeholder img {
   display: inline-block;
   border-radius: 50%;
-}
\ No newline at end of file
+}
diff --git a/static/js/app/controllers.js b/static/js/app/controllers.js
index 511978ad..f09a108b 100644
--- a/static/js/app/controllers.js
+++ b/static/js/app/controllers.js
@@ -49,7 +49,7 @@ app.controller('DashboardCtrl', function($scope, $filter, $location, CampaignSer
                                             $scope.$apply()
                                         }
                                     }
-                                }
+                                },
                             }
                         },
                         xAxis: {
@@ -61,7 +61,15 @@ app.controller('DashboardCtrl', function($scope, $filter, $location, CampaignSer
                     },
                     series: [{
                         name: "Campaigns",
-                        data: $scope.campaigns
+                        data: $scope.campaigns,
+                        marker: {
+                            enabled: true,
+                            radius: 3,
+                            symbol: "circle",
+                            fillColor: "#e74c3c"
+                        },
+                        lineColor:"rgba(231,76,60,.8)",
+                        fillColor:"rgba(231,76,60,.8)"
                     }],
                     title: {
                         text: 'Phishing Success Overview'
@@ -107,7 +115,7 @@ app.controller('DashboardCtrl', function($scope, $filter, $location, CampaignSer
                             y: avg
                         }, {
                             name: "Unsuccessful Phishes",
-                            color: "#7cb5ec",
+                            color: "#1abc9c",
                             y: 100 - avg
                         }]
                     }],
@@ -150,7 +158,7 @@ app.controller('CampaignCtrl', function($scope, $modal, CampaignService, GroupSe
         page: 1, // show first page
         count: 10, // count per page
         sorting: {
-            name: 'asc' // initial sorting
+            modified_date: 'desc' // initial sorting
         }
     }, {
         total: 0, // length of data
@@ -259,7 +267,7 @@ var CampaignModalCtrl = function($scope, CampaignService, $modalInstance) {
     $scope.ok = function(campaign) {
         var newCampaign = new CampaignService(campaign);
         newCampaign.$save({}, function() {
-            $modalInstance.close("Campaign added successfully")
+            $modalInstance.close("Campaign launched successfully")
             $scope.campaigns.push(newCampaign);
             $scope.mainTableParams.reload()
         }, function(response) {
@@ -296,10 +304,11 @@ app.controller('CampaignResultsCtrl', function($scope, $filter, $interval, Campa
             }, function(response) {
                 if (response.success) {
                     $scope.successFlash(response.message)
+                    $location.path("/campaigns/")
+                    $scope.$apply()
                 } else {
                     $scope.errorFlash(response.message)
                 }
-                $scope.mainTableParams.reload();
             });
         }
     }
@@ -434,7 +443,7 @@ app.controller('CampaignResultsCtrl', function($scope, $filter, $interval, Campa
                         enabled: true,
                         radius: 3,
                         symbol: "circle",
-                        fillColor: "#7cb5ec"
+                        fillColor: "#34495e"
                     },
                     animation: false
                 }],
diff --git a/static/js/app/partials/campaign_results.html b/static/js/app/partials/campaign_results.html
index eeb613af..432dc51d 100644
--- a/static/js/app/partials/campaign_results.html
+++ b/static/js/app/partials/campaign_results.html
@@ -2,9 +2,9 @@
     <div class="row">
         <div class="col-sm-3 col-md-2 sidebar">
             <ul class="nav nav-sidebar">
-                <li class="active"><a href="#">Dashboard</a>
+                <li><a href="#">Dashboard</a>
                 </li>
-                <li><a href="#/campaigns">Campaigns</a>
+                <li class="active"><a href="#/campaigns">Campaigns</a>
                 </li>
                 <li><a href="#/users">Users &amp; Groups</a>
                 </li>
diff --git a/static/js/app/partials/campaigns.html b/static/js/app/partials/campaigns.html
index e2f45a52..d908f849 100644
--- a/static/js/app/partials/campaigns.html
+++ b/static/js/app/partials/campaigns.html
@@ -43,7 +43,7 @@
     <div ng-show="campaigns.length" class="row">
         <table ng-table="mainTableParams" class="table table-hover table-striped table-bordered">
             <tbody>
-                <tr ng-repeat="campaign in $data | orderBy: '-modified_date'" class="editable-row">
+                <tr ng-repeat="campaign in $data | orderBy:modified_date:true" class="editable-row">
                     <td data-title="'Created Date'" class="col-sm-1">{{campaign.created_date | date:'medium'}}</td>
                     <td data-title="'Name'" class="col-sm-2">{{campaign.name}}
                         <div class="btn-group" style="float: right;">