Commit 6404271b authored by Leigh B Stoller's avatar Leigh B Stoller

Always show the full panel, even if the link is to a specific

profile. This is more consistent, and we show the profile name,
and the copy/show buttons.
parent 7d194254
...@@ -37,25 +37,21 @@ ...@@ -37,25 +37,21 @@
</center> </center>
</h3> </h3>
<% } %> <% } %>
<% } %> <!-- If linked to a specific profile, description goes here -->
<!-- If linked to a specific profile, description goes here --> <% if (profilename) { %>
<% if (profilename) { %>
<% if (!registered) { %>
<p> <p>
Fill out the form below to run an experiment Fill out the form below to run an experiment
using this profile: using this profile:
</p> </p>
<blockquote>
<p><span id='selected_profile_description'></span></p>
</blockquote>
<p>
When you click the 'Create' button, the virtual or
physical machines described in the profile will be booted
on <%= clustername %>'s hardware
</p>
<% } %> <% } %>
<blockquote>
<p><span id='selected_profile_description'></span></p>
</blockquote>
<p>
When you click the 'Create' button, the virtual or
physical machines described in the profile will be booted
on <%= clustername %>'s hardware
</p>
<% } %>
<% if (!registered) { %>
<div class='form-group format-me'> <div class='form-group format-me'>
<input name="username" <input name="username"
id='input_username' id='input_username'
...@@ -146,54 +142,56 @@ ...@@ -146,54 +142,56 @@
</div> </div>
</div> </div>
</div> </div>
<% } %> <% } %>
<!-- Profile selection box --> <% if (registered || !profilename) { %>
<% if (showpicker) { %> <div class='form-group row' style='margin-bottom: 0px;'>
<div class='form-group row' style='margin-bottom: 0px;'> <div class='col-md-12'>
<div class='col-md-12'> <div class='panel panel-default'>
<div class='panel panel-default'> <div class='panel-heading'>
<div class='panel-heading'> <span class='panel-title'>
<span class='panel-title'> <strong>Selected Profile:</strong>
<strong>Selected Profile:</strong> <span id='selected_profile_text'></span>
<span id='selected_profile_text'></span> </span>
</span> </div>
</div> <div class='panel-body'>
<div class='panel-body'> <div id='selected_profile_description'></div>
<div id='selected_profile_description'></div> </div>
</div> <div class='panel-footer'>
<div class='panel-footer'> <% if (cancopy) { %>
<% if (cancopy) { %> <button class='btn btn-default btn-sm pull-left'
<button class='btn btn-default btn-sm pull-left' type='button' id='profile_copy_button'
type='button' id='profile_copy_button' style='margin-right: 10px;'
style='margin-right: 10px;' data-toggle='popover'
data-toggle='popover' data-delay='{hide:1500, show:500}'
data-delay='{hide:1500, show:500}' data-html='true'
data-html='true' data-content='When you copy a profile you are
data-content='When you copy a profile you are
creating a new profile that uses the same creating a new profile that uses the same
source code and metadata (description, source code and metadata (description,
instructions) as the original profile, but instructions) as the original profile, but
without creating a new disk image. Instead, without creating a new disk image. Instead,
the new profile uses whatever images the the new profile uses whatever images the
original profile uses.'> original profile uses.'>
Copy Profile Copy Profile
</button> </button>
<button class='btn btn-default btn-sm pull-left' <button class='btn btn-default btn-sm pull-left'
type='button' id='profile_show_button'> type='button' id='profile_show_button'>
Show Profile Show Profile
</button> </button>
<% } %> <% } %>
<!-- Profile selection box -->
<% if (showpicker) { %>
<button id='profile' <button id='profile'
class='btn btn-primary btn-sm pull-right' class='btn btn-primary btn-sm pull-right'
type='button' name='profile_button'> type='button' name='profile_button'>
Change Profile Change Profile
</button> </button>
<div class='clearfix'></div> <% } %>
</div> <div class='clearfix'></div>
</div> </div>
</div> </div>
</div> </div>
<% } %> </div>
<% } %>
</div> </div>
</div> </div>
</form> </form>
......
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