Commit 394a47a7 authored by Keith Downie's avatar Keith Downie Committed by Leigh Stoller

Fixed some conflict errors

parent 97e75cbd
...@@ -267,6 +267,10 @@ left: -999em; ...@@ -267,6 +267,10 @@ left: -999em;
margin-bottom: 20px; margin-bottom: 20px;
} }
.wizard #finalize_options {
min-height: 100px;
}
.wizard #inline_container { .wizard #inline_container {
padding: 0; padding: 0;
margin-bottom: 20px; margin-bottom: 20px;
...@@ -283,10 +287,30 @@ left: -999em; ...@@ -283,10 +287,30 @@ left: -999em;
z-index: 20; z-index: 20;
} }
.wizard #inline_container #inline_overlay span {
color: #aaa;
top: 100%;
left: 17px;
margin-top: -19px;
position: absolute;
}
#inline_large_container button.close { #inline_large_container button.close {
padding: 1px 5px 0 0; padding: 1px 5px 0 0;
} }
#about_div {
padding-right: 30px;
}
#about_div .panel {
margin-left: -14px;
}
#where_warming {
margin-bottom: 0;
}
@media (min-width: 768px) { @media (min-width: 768px) {
.wizard #finalize_container.col-lg-8 { .wizard #finalize_container.col-lg-8 {
padding-right: 5px; padding-right: 5px;
......
...@@ -266,15 +266,18 @@ function SPITFORM($formfields, $newuser, $errors) ...@@ -266,15 +266,18 @@ function SPITFORM($formfields, $newuser, $errors)
SPITHEADER(1); SPITHEADER(1);
echo "<div id='ppviewmodal_div'></div>\n"; echo "<div id='ppviewmodal_div'></div>\n";
# Placeholder for the "about" panel, which is now a template file.
echo "<div id='about_div' class='col-lg-8 col-lg-offset-2
col-md-8 col-md-offset-2
col-sm-10 col-sm-offset-1
col-xs-12 col-xs-offset-0'></div>\n";
echo "<div id='stepsContainer' class='row'> echo "<div id='stepsContainer' class='row'>
<h3>Select a Profile</h3> <h3>Select a Profile</h3>
<div class='col-lg-6 col-lg-offset-3 <div class='col-lg-8 col-lg-offset-2
col-md-6 col-md-offset-3 col-md-8 col-md-offset-2
col-sm-8 col-sm-offset-2 col-sm-10 col-sm-offset-1
col-xs-12 col-xs-offset-0'>\n"; col-xs-12 col-xs-offset-0'>\n";
# Placeholder for the "about" panel, which is now a template file.
echo "<div id='about_div'></div>\n";
echo "<form id='quickvm_form' role='form' echo "<form id='quickvm_form' role='form'
enctype='multipart/form-data' enctype='multipart/form-data'
...@@ -556,6 +559,7 @@ function SPITFORM($formfields, $newuser, $errors) ...@@ -556,6 +559,7 @@ function SPITFORM($formfields, $newuser, $errors)
<select name=\"formfields[where]\" <select name=\"formfields[where]\"
id='profile_where' class='form-control'> id='profile_where' class='form-control'>
$am_options</select><br> $am_options</select><br>
</div><div class='col-sm-10 col-sm-offset-1' style='text-align: center'>
<div class='alert alert-warning' id='where-warning' style='display: none'>This profile only works on some clusters. Incompatible clusters are unselectable.</div> <div class='alert alert-warning' id='where-warning' style='display: none'>This profile only works on some clusters. Incompatible clusters are unselectable.</div>
</div></div></div>"; </div></div></div>";
$html = $html . "<div id='site_selector' class='hidden'></div></div>"; $html = $html . "<div id='site_selector' class='hidden'></div></div>";
...@@ -587,13 +591,13 @@ function SPITFORM($formfields, $newuser, $errors) ...@@ -587,13 +591,13 @@ function SPITFORM($formfields, $newuser, $errors)
echo "</div> echo "</div>
</div>\n"; </div>\n";
} }
echo "<h3>Parameterize</h3><div class='col-lg-6 col-lg-offset-3 echo "<h3>Parameterize</h3><div class='col-lg-8 col-lg-offset-2
col-md-6 col-md-offset-3 col-md-8 col-md-offset-2
col-sm-8 col-sm-offset-2 col-sm-10 col-sm-offset-1
col-xs-12 col-xs-offset-0'></div>\n"; col-xs-12 col-xs-offset-0'></div>\n";
echo "<h3>Finalize</h3><div class='col-lg-6 col-lg-offset-3 echo "<h3>Finalize</h3><div class='col-lg-8 col-lg-offset-2
col-md-6 col-md-offset-3 col-md-8 col-md-offset-2
col-sm-8 col-sm-offset-2 col-sm-10 col-sm-offset-1
col-xs-12 col-xs-offset-0'> col-xs-12 col-xs-offset-0'>
<div id='finalize_container' class='col-lg-8 col-md-8 col-sm-8 col-xs-12'> <div id='finalize_container' class='col-lg-8 col-md-8 col-sm-8 col-xs-12'>
<div class='panel panel-default'> <div class='panel panel-default'>
...@@ -604,7 +608,7 @@ function SPITFORM($formfields, $newuser, $errors) ...@@ -604,7 +608,7 @@ function SPITFORM($formfields, $newuser, $errors)
</div> </div>
</div> </div>
<div id='inline_container' class='col-lg-4 col-md-4 col-sm-4 col-xs-12'> <div id='inline_container' class='col-lg-4 col-md-4 col-sm-4 col-xs-12'>
<a id='inline_overlay' href='#'></a> <a id='inline_overlay' href='#'><span class='glyphicon glyphicon-fullscreen' aria-hidden='true'></span></a>
<div id='inline_jacks'></div> <div id='inline_jacks'></div>
</div> </div>
</div>\n"; </div>\n";
......
...@@ -143,8 +143,8 @@ function (_, Constraints, sup, ppstart, JacksEditor, aboutaptString, aboutcloudS ...@@ -143,8 +143,8 @@ function (_, Constraints, sup, ppstart, JacksEditor, aboutaptString, aboutcloudS
}); });
// Set up wizard final page formatting // Set up wizard final page formatting
$('#stepsContainer .steps').addClass('col-lg-6 col-lg-offset-3 col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2 col-xs-12 col-xs-offset-0'); $('#stepsContainer .steps').addClass('col-lg-8 col-lg-offset-2 col-md-8 col-md-offset-2 col-sm-10 col-sm-offset-1 col-xs-12 col-xs-offset-0');
$('#stepsContainer .actions').addClass('col-lg-6 col-lg-offset-3 col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2 col-xs-12 col-xs-offset-0'); $('#stepsContainer .actions').addClass('col-lg-8 col-lg-offset-2 col-md-8 col-md-offset-2 col-sm-10 col-sm-offset-1 col-xs-12 col-xs-offset-0');
// Set up jacks swap // Set up jacks swap
$('#stepsContainer #inline_overlay').click(function() { $('#stepsContainer #inline_overlay').click(function() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment