Skip to content

Changes for Settings - Integrated New Sections #1157

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 5 commits into from
Jan 19, 2017
Merged

Changes for Settings - Integrated New Sections #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c9743e
New sections added under Devops
srikanthv02 Dec 23, 2016
e96a2fe
Changes for settings
srikanthv02 Dec 26, 2016
217b108
Removed one value attribute
srikanthv02 Dec 26, 2016
612fbbf
Merge pull request #1059 from srikanthv02/topic-2569
udeshrl Dec 26, 2016
3fea2fa
Resolving merge conflicts
srikanthv02 Jan 19, 2017
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
161 changes: 161 additions & 0 deletions client/htmls/private/ajax/Settings/CreateBitbucketConfig.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
<div class="row">
<div class="col-md-12">
<form action="" id="myForm51">
<div class="widget-box">
<div class="widget-header">
<h4 class="widget-margin" style="color:black;">New Bitbucket Config <span id="spnbitbucket"></span></h4>
</div>
<div class="widget-body">
<fieldset>
<div class="widget-main">
<section id="widget-grid" class="">
<!-- START ROW -->
<div class="row">
<!-- NEW COL START -->
<div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
<!-- widget div-->
<div>
<!-- widget content -->
<div class="widget-body no-padding">
<div class="col-lg-6 col-md-6">
<label for="category">Organization:<span class="control-label redSpan">&nbsp;*</span>
</label>
<select id="orgname" class="chooseOrganization width-100" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central" cdata="catalyst" cat-validation="required" cat-validation="required" linkedfields="['configname']" onchange="$('#configname').change();">
<option value="">Select an Organization</option>
</select>
</div>
<div class="col-lg-6 col-md-6">
<label for="">Name<span class="control-label redSpan">&nbsp;*</span></label>
<input name="ctl00$MainContent$orgname" value="" id="bitbucketname" class="form-control" type="text" cdata="catalyst" unique="true" uniqueconditionedby="bitbucketname" cat-validation="required,max15">
</div>
<div class="col-lg-6 col-md-6" style="margin-top:25px">
<label for="">Bitbucket URL<span class="control-label redSpan">&nbsp;*</span></label>
<input name="ctl00$MainContent$orgname" value="" id="bitbucketurl" class="form-control" type="text" cdata="catalyst" cat-validation="urlcheck,required">
</div>
<div class="col-lg-6 col-md-6" style="margin-top:25px">
<label for="">User ID <span class="control-label redSpan">&nbsp;*</span>
</label>
<input name="ctl00$MainContent$orgname" value="" id="bitbucketusername" class="form-control" type="text" cdata="catalyst" cat-validation="required">
</div>
<div class="col-lg-6 col-md-6" style="margin-top:25px">
<label for="">Password <span class="control-label redSpan">&nbsp;*</span></label>
<input name="ctl00$MainContent$orgname" value="" id="bitbucketpassword" class="form-control" type="password" cdata="catalyst" cat-validation="required">
</div>
</div>
<!-- end widget content -->
</div>
<!-- end widget div -->
</div>
<!-- end widget -->
</div>
<!-- END ROW -->
</section>
<!-- end widget grid -->
</div>
</fieldset>
</div>
<div class="widget-toolbox clearfix">
<div class="btn-group pull-right">
<a class="btn btn-default" onclick="window.history.back();" style="margin-right:11px;" id="btncancel">
<i class="ace-icon fa fa-times bigger-110"></i>
Cancel
</a>
<button class="btn btn-primary btn-mini">
<i class="ace-icon fa fa-check bigger-110"></i>
Save
</button>
</div>
</div>
</div>
</form>
</div>
</div>
<!--row ends here-->
<!--Popup for selecting a cloud provider before proceeding-->
<script>

//Form Name
function cancelClicked() {
$("#popupSelectProvider").modal('hide');
$(".modal-backdrop.fade.in").detach();
$('#btncancel').click();
}

function setfolderpath() {
var folderpath = '';
$('#folderpath').val(folderpath);
}

function validateandsaveform() {

if (validateForm()) {
// setfolderpath();
saveform('27');
}

}

function inLineReady() {

$("input[type='text']").on("click", function() {
$(this).select();
$("#msgOrgName").hide();
});
$("#popupSelectProvider").modal({
keyboard: false,
backdrop: "static"
});
var ten = 27;
readformnew('27'); //27 is for bitbucket
//

$('#content').css("opacity", "1 !important");
//Force opening the left navigation menu
if ($('#navSettings').is(":visible") == false) {
$('#navSettings').css("display", '');
$('#navSettings > ul > li').first().addClass('open');
$('#navSettings > ul > li > ul').css("display", "none");
$('#navSettings > ul > li > ul').first().css("display", "block");
}
//redrawing the breadcrumb and selecting the tree
$('#Settings li').removeClass('active');
$('#Settings li').each(function() {

if ($(this).text().trim() == "Docker") {

$(this).addClass('active');
}
});

$('#content').css('opacity', '1 !important');
enableUniqueCheckingForInputs(27);
}

inLineReady();

</script>

<script>

$(document).ready(function() {
$('select').select2();
var isEditActivate = location.href.toString().split('?')[1] === "new" ? false : true;

if (isEditActivate) {
$('#orgname').attr('disabled',true);
$('input#bitbucketpassword').removeAttr('type');
$('input#bitbucketpassword').attr('type', 'password');
}
$('#myForm51').submit(function() {
$(this).validate();

if ($(this).valid) {
validateandsaveform();
} else {
bootbox.alert('Invalid form submitted'); // for demo
}
return false; // for demo
});
});

</script>
161 changes: 161 additions & 0 deletions client/htmls/private/ajax/Settings/CreateFunctionalTestConfig.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
<div class="row">
<div class="col-md-12">
<form action="" id="myForm59">
<div class="widget-box">
<div class="widget-header">
<h4 class="widget-margin" style="color:black;">New QA Portal <span id="spfunctionaltest"></span></h4>
</div>
<div class="widget-body">
<fieldset>
<div class="widget-main">
<section id="widget-grid" class="">
<!-- START ROW -->
<div class="row">
<!-- NEW COL START -->
<div class="jarviswidget" id="wid-id-3" data-widget-editbutton="false" data-widget-custombutton="false">
<!-- widget div-->
<div>
<!-- widget content -->
<div class="widget-body no-padding">
<div class="col-lg-6 col-md-6">
<label for="category">Organization:<span class="control-label redSpan">&nbsp;*</span>
</label>
<select id="orgname" class="chooseOrganization width-100" sourcepath="1" datapath="masterjson.rows.row" valuelinkfield="costcode" style="vertical-align:central" cdata="catalyst" cat-validation="required" cat-validation="required" linkedfields="['configname']" onchange="$('#configname').change();">
<option value="">Select an Organization</option>
</select>
</div>
<div class="col-lg-6 col-md-6">
<label for="">Name<span class="control-label redSpan">&nbsp;*</span></label>
<input name="ctl00$MainContent$orgname" value="" id="functionaltestname" class="form-control" type="text" cdata="catalyst" unique="true" uniqueconditionedby="functionaltestname" cat-validation="required,max15">
</div>
<div class="col-lg-6 col-md-6" style="margin-top:25px">
<label for="">Portal URL<span class="control-label redSpan">&nbsp;*</span></label>
<input name="ctl00$MainContent$orgname" value="" id="functionaltesturl" class="form-control" type="text" cdata="catalyst" cat-validation="urlcheck,required">
</div>
<div class="col-lg-6 col-md-6" style="margin-top:25px">
<label for="">Days <span class="control-label redSpan">&nbsp;*</span>
</label>
<input name="ctl00$MainContent$orgname" value="" id="functionaltestdays" class="form-control" type="text" cdata="catalyst" cat-validation="required">
</div>
<!-- <div class="col-lg-6 col-md-6" style="margin-top:25px">
<label for="">Password <span class="control-label redSpan">&nbsp;*</span></label>
<input name="ctl00$MainContent$orgname" value="" id="bitbucketpassword" class="form-control" type="text" cdata="catalyst" cat-validation="required" value="*********">
</div> -->
</div>
<!-- end widget content -->
</div>
<!-- end widget div -->
</div>
<!-- end widget -->
</div>
<!-- END ROW -->
</section>
<!-- end widget grid -->
</div>
</fieldset>
</div>
<div class="widget-toolbox clearfix">
<div class="btn-group pull-right">
<a class="btn btn-default" onclick="window.history.back();" style="margin-right:11px;" id="btncancel">
<i class="ace-icon fa fa-times bigger-110"></i>
Cancel
</a>
<button class="btn btn-primary btn-mini">
<i class="ace-icon fa fa-check bigger-110"></i>
Save
</button>
</div>
</div>
</div>
</form>
</div>
</div>
<!--row ends here-->
<!--Popup for selecting a cloud provider before proceeding-->
<script>

//Form Name
function cancelClicked() {
$("#popupSelectProvider").modal('hide');
$(".modal-backdrop.fade.in").detach();
$('#btncancel').click();
}

function setfolderpath() {
var folderpath = '';
$('#folderpath').val(folderpath);
}

function validateandsaveform() {

if (validateForm()) {
// setfolderpath();
saveform('29');
}

}

function inLineReady() {

$("input[type='text']").on("click", function() {
$(this).select();
$("#msgOrgName").hide();
});
$("#popupSelectProvider").modal({
keyboard: false,
backdrop: "static"
});
var ten = 27;
readformnew('29'); //29 is for functionaltest
//

$('#content').css("opacity", "1 !important");
//Force opening the left navigation menu
if ($('#navSettings').is(":visible") == false) {
$('#navSettings').css("display", '');
$('#navSettings > ul > li').first().addClass('open');
$('#navSettings > ul > li > ul').css("display", "none");
$('#navSettings > ul > li > ul').first().css("display", "block");
}
//redrawing the breadcrumb and selecting the tree
$('#Settings li').removeClass('active');
$('#Settings li').each(function() {

if ($(this).text().trim() == "Docker") {

$(this).addClass('active');
}
});

$('#content').css('opacity', '1 !important');
enableUniqueCheckingForInputs(29);
}

inLineReady();

</script>

<script>

$(document).ready(function() {
$('select').select2();
var isEditActivate = location.href.toString().split('?')[1] === "new" ? false : true;

if (isEditActivate) {
$('#orgname').attr('disabled',true);
// $('input#bitbucketpassword').removeAttr('type');
// $('input#bitbucketpassword').attr('type', 'password');
}
$('#myForm59').submit(function() {
$(this).validate();

if ($(this).valid) {
validateandsaveform();
} else {
bootbox.alert('Invalid form submitted'); // for demo
}
return false; // for demo
});
});

</script>
Loading