Better UI Color consistency

pull/24/head
unknown 2015-06-14 18:15:29 -05:00
parent 497fce25df
commit 59b6aa16c1
4 changed files with 21 additions and 12 deletions

View File

@ -54,7 +54,7 @@ body {
}
.nav-sidebar > .active > a {
color: #fff;
background-color: #428bca;
background-color: #34495e;
}

View File

@ -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
}],

View File

@ -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>

View File

@ -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;">