Skip to content

Dev #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 13, 2016
Merged

Dev #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
190ecd9
Add Planned Cost at Org Lavel and Provider Lavel
Durgesh1988 Sep 12, 2016
dbbeebd
Add Tag Mapping for Business Group
Durgesh1988 Sep 12, 2016
40679ff
Add BU Level Tag Mapping in Provider Sync
Durgesh1988 Sep 13, 2016
d5c9301
Resolved merge conflicts
Durgesh1988 Sep 13, 2016
6b3ebe9
Add BU Level Tag Mapping in Provider Sync
Durgesh1988 Sep 13, 2016
2a59c3f
Add BU Level Tag Mapping in Provider Sync
Durgesh1988 Sep 13, 2016
4bba1a9
Add BU Level Tag Mapping in Provider Sync
Durgesh1988 Sep 13, 2016
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
8 changes: 8 additions & 0 deletions client/htmls/private/ajax/Settings/CreateOrg.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
<input name="ctl00$MainContent$domainname" value="" id="domainname" class="form-control" type="text" cdata="catalyst" maxlength="35">
<span data-val-controltovalidate="domainname" id="MainContent_Req_domainname" data-val="true" data-val-evaluationfunction="RequiredFieldValidatorEvaluateIsValid" data-val-initialvalue="" style="visibility:hidden;">Required</span>
</div>
<div class="col-lg-6 col-md-6">
<label for="name">Planned Cost:</label>
<span>
<img data-toggle="popover" data-html="true" data-placement="left" title="AWS Planned Cost for a Month." src="img/help.png"/>
</span>
<input name="ctl00$MainContent$plannedCost" value="" id="plannedCost" class="form-control" type="text" cdata="catalyst" maxlength="35">
<span data-val-controltovalidate="plannedCost" id="MainContent_Req_plannedCost" data-val="true" data-val-evaluationfunction="RequiredFieldValidatorEvaluateIsValid" data-val-initialvalue="" style="visibility:hidden;">Required</span>
</div>
<div class="col-lg-6 orgactive hidden">
<label for="name">Organization Status:</label>
<div class="clearfix" style="border:1px solid silver" >
Expand Down
10 changes: 10 additions & 0 deletions client/htmls/private/ajax/Settings/CreateProviders.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,15 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
<input name="s3BucketName" id="s3BucketName" class="form-control" type="text" cdata="catalyst" cat-validation="required" placeholder="Enter the S3 Bucket Name">
</div>

<div class="col-lg-6 col-md-6 margintop20 foraws">
<label for="">Planned Cost:</label>
<span>
<img data-toggle="popover" data-html="true" data-placement="left" title="AWS Planned Cost for a Month." src="img/help.png"/>
</span>
<input name="plannedCost" id="plannedCost" class="form-control" type="text" cdata="catalyst" cat-validation="required" placeholder="Enter the Planned Cost">
</div>
</div>
<div class="row">
<div class="col-lg-6 col-md-6 margintop20">
<label for="name">Organization Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
<select id="orgId" name="orgId" unique="true" uniqueconditionedby="orgname" class="chooseOrganization width-100" style="vertical-align: central" cat-validation="required" cat-validation-openstack="required" cdata="catalyst" skiprowid="yes">
Expand Down Expand Up @@ -601,6 +610,7 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
$('#secretKey').val(data.secretKey);
$('#providertype').val(data.providerType).select2();
$('#s3BucketName').val(data.s3BucketName);
$('#plannedCost').val(data.plannedCost);
$('#orgId').val(data.orgId[0]).attr({
'answer': data.orgId[0]
}).select2().attr('disabled', 'disabled');
Expand Down
400 changes: 358 additions & 42 deletions client/htmls/private/ajax/Settings/providerSync.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions client/htmls/public/Dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ <h4 class="panel-title padding2">
<tr>
<th class="text-center">InstanceId</th>
<th class="text-center">Org</th>
<th class="text-center">Bg</th>
<th class="text-center">Project</th>
<th class="text-center">Env</th>
<th class="text-center">OS</th>
Expand Down Expand Up @@ -262,6 +263,7 @@ <h4 class="panel-title padding2">
<tr>
<th class="text-center">InstanceId</th>
<th class="text-center">Org</th>
<th class="text-center">Bg</th>
<th class="text-center">Project</th>
<th class="text-center">Env</th>
<th class="text-center">OS</th>
Expand Down
4 changes: 3 additions & 1 deletion client/htmls/public/awsCapacity.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ <h3 id="totalUnAssignedInstances">0</h3>
<tr>
<th class="text-center">Instance Id</th>
<th class="text-center">Org</th>
<th class="text-center">BU</th>
<th class="text-center">Bg</th>
<th class="text-center">Project</th>
<th class="text-center">Env</th>
<th class="text-center">Instance IP</th>
Expand All @@ -124,6 +124,7 @@ <h3 id="totalUnAssignedInstances">0</h3>
<tr>
<th class="text-center">Instance Id</th>
<th class="text-center">Org</th>
<th class="text-center">Bg</th>
<th class="text-center">Project</th>
<th class="text-center">Env</th>
<th class="text-center">Instance IP</th>
Expand Down Expand Up @@ -169,6 +170,7 @@ <h3 id="totalUnAssignedInstances">0</h3>
<th class="text-center">OS</th>
<th class="text-center">IP Address</th>
<th class="text-center">Status</th>
<th class="text-center">Bg Tag Value</th>
<th class="text-center">Project Tag Value</th>
<th class="text-center">Env. Tag Value</th>
<th class="text-center">Action</th>
Expand Down
Loading