Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions client/htmls/public/awsCapacity.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
</button>
</div>
<div class="borderTop"></div>
<div class="row">
<div class="col-lg-3 col-md-3 col-xs-6 infrastructureClass marginTop20" data-text="Total Instances">
<div class="small-box bg-aqua">
<div class="inner">
Expand All @@ -50,7 +51,7 @@ <h3 id="totalInstances">0</h3>
</div>
</div>
<div class="col-lg-3 col-md-3 col-xs-6 infrastructureClass marginTop20" data-text="Total Managed Instances">
<div class="small-box bg-aqua">
<div class="totalBox small-box bg-aqua">
<div class="inner">
<h3 id="totalManagedInstances">0</h3>
<p>Total <br>No. of Managed Instances</p>
Expand All @@ -64,7 +65,7 @@ <h3 id="totalManagedInstances">0</h3>
</div>
</div>
<div class="col-lg-3 col-md-3 col-xs-6 infrastructureClass marginTop20" data-text="Total Assigned Instances">
<div class="small-box bg-aqua">
<div class="assignedBox small-box bg-aqua">
<div class="inner">
<h3 id="totalUnmanagedInstances">0</h3>
<p>Total <br>No. of Assigned Instances</p>
Expand All @@ -78,7 +79,7 @@ <h3 id="totalUnmanagedInstances">0</h3>
</div>
</div>
<div class="col-lg-3 col-md-3 col-xs-6 infrastructureClass marginTop20" data-text="Total UnAssigned Instances">
<div class="small-box bg-aqua">
<div class="unassignedBox small-box bg-aqua">
<div class="inner">
<h3 id="totalUnAssignedInstances">0</h3>
<p>Total <br>No. of UnAssigned Instances</p>
Expand All @@ -91,9 +92,10 @@ <h3 id="totalUnAssignedInstances">0</h3>
</span>
</div>
</div>
</div>
<div class=" noProviderView" style="display:none">
<div id="noenvwarning" class="alert alert-warning noEnvWarning text-center">
<span>Please add some providers to show instances </span>
<span>Please add the provider details in Settings to get the complete dashboard.</span>
</div>
</div>
<!--Table to show all the instance actions for all the instances starts here-->
Expand Down
5 changes: 5 additions & 0 deletions client/htmls/public/css/capacity.css
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,8 @@
#instanceUnAssignedContainer {
min-height: 280px;
}

.selectComponent {
border: 5px solid #396ea2;
margin-top: -5px;
}
16 changes: 13 additions & 3 deletions client/htmls/public/js/awsCapacity.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ $(document).ready(function() {
$('#instanceAssignedContainer').hide();
$('#instanceUnAssignedContainer').hide();
$('.footer').addClass('hidden');
$('.unassignedBox').removeClass('selectComponent');
$('.assignedBox').removeClass('selectComponent');
$('.totalBox').removeClass('selectComponent');
}

$("#refreshBtn").click(function() {
Expand Down Expand Up @@ -59,6 +62,7 @@ $(document).ready(function() {
if (data.length === 0) {
$('.providerValues').addClass('hidden');
$('.noProviderView').show();
$('#instanceActionListLoader').hide();
} else {
for (var i = 0; i < data.length; i++) {
$('.noProviderView').hide();
Expand Down Expand Up @@ -194,23 +198,29 @@ $(document).ready(function() {
}

$('#totalManagedInstancesMoreInfo').on('click', function() {
//$(this).css('box-shadow', '10px 10px 5px #888');
$('.unassignedBox').removeClass('selectComponent');
$('.assignedBox').removeClass('selectComponent');
$('.totalBox').addClass('selectComponent');
loadAllManagedInstances();
$('#instanceTableContainer').show();
$('#instanceAssignedContainer').hide();
$('#instanceUnAssignedContainer').hide();
});

$('#totalUnManagedInstancesMoreInfo').on('click', function() {
//$(this).css('box-shadow', '10px 10px 5px #888');
$('.unassignedBox').removeClass('selectComponent');
$('.totalBox').removeClass('selectComponent');
$('.assignedBox').addClass('selectComponent');
loadAllUnManagedInstances();
$('#instanceTableContainer').hide();
$('#instanceUnAssignedContainer').hide();
$('#instanceAssignedContainer').show();
});

$('#totalUnAssignedInstancesMoreInfo').on('click', function() {
//$(this).addClass('shadow');
$('.totalBox').removeClass('selectComponent');
$('.assignedBox').removeClass('selectComponent');
$('.unassignedBox').addClass('selectComponent');
getUnassignedInstancesWithProjectAndEnv();
$('#instanceTableContainer').hide();
$('#instanceAssignedContainer').hide();
Expand Down
1 change: 1 addition & 0 deletions client/htmls/public/js/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ $(document).ready(function () {
}
} else {
$('.noProviderView').show();
$('#totalProviders').append(totalcountproviders);
}
}).fail(function () {

Expand Down
Binary file modified seed/mongodump/devops_new/tracks.bson
Binary file not shown.