Commit 7a355473 authored by Leigh Stoller's avatar Leigh Stoller

Add a help block for OS features and Whole Disk images.

parent 199b98cd
...@@ -169,6 +169,9 @@ $(function () ...@@ -169,6 +169,9 @@ $(function ()
}); });
} }
// Copy the osfeatures help string into the popover before init.
$('#osfeatures-help')
.data("content", $('#osfeatures-help-contents').html());
// This activates the popover subsystem. // This activates the popover subsystem.
$('[data-toggle="popover"]').popover({ $('[data-toggle="popover"]').popover({
trigger: 'hover', trigger: 'hover',
......
...@@ -158,7 +158,15 @@ ...@@ -158,7 +158,15 @@
<div class="form-group"> <div class="form-group">
<div class="format-me" <div class="format-me"
data-key="wholedisk" data-key="wholedisk"
data-label="Whole Disk"> data-label="Whole Disk"
data-help="Check this box if you need to capture more
then just the primary partition of your disk.
For example, you created a file system on
parition two, and want to include that in
your new disk image.
<b><em>Do not check this box if you do not
need to do this or
do not know what this means!</em></b>">
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="checkbox" <input type="checkbox"
<% if (formfields.wholedisk) { %> <% if (formfields.wholedisk) { %>
......
...@@ -8,6 +8,15 @@ ...@@ -8,6 +8,15 @@
padding-top: 2px; padding-top: 2px;
padding-bottom: 2px; padding-bottom: 2px;
} }
@media (min-width: 768px) {
.dl-horizontal dt {
width: 80px;
}
.dl-horizontal dd {
margin-left: 100px;
}
}
</style> </style>
<div class='col-lg-10 col-lg-offset-1 <div class='col-lg-10 col-lg-offset-1
col-md-10 col-md-offset-1 col-md-10 col-md-offset-1
...@@ -187,17 +196,17 @@ ...@@ -187,17 +196,17 @@
<a href='#' class='btn btn-xs' <a href='#' class='btn btn-xs'
data-toggle='popover' data-toggle='popover'
data-html='true' data-html='true'
data-content='<dl class=horizontal> data-content='<dl class=dl-horizontal>
<dt>Shared</dt> <dt>Shared</dt>
<dd>Images that are marked shared can be used by all <dd>Images that are marked shared can be used by all
subgroups of the project the image belongs to. When not subgroups of the project the image belongs to. When not
shared, the image is accessible only by experiments shared, the image is accessible only by experiments
created in the same subgroup as the image.</dd> created in the same subgroup as the image.</dd>
<dt>Global</dt> <dt>Global</dt>
<dd>Images that are marked global can be used by any <dd>Images that are marked global can be used by any
user in any project or subgroup. Global implies shared user in any project or subgroup. Global implies shared
so if you mark an image as global, we will uncheck so if you mark an image as global, we will uncheck
shared.</dd></dl>'> shared.</dd></dl>'>
<span class='glyphicon glyphicon-question-sign' <span class='glyphicon glyphicon-question-sign'
style='margin-bottom: 4px;'></span> style='margin-bottom: 4px;'></span>
</a> </a>
...@@ -250,7 +259,7 @@ ...@@ -250,7 +259,7 @@
</td> </td>
</tr> </tr>
<% } %> <% } %>
<% if (! fields.isdataset) { %> <% if (isadmin && !fields.isdataset) { %>
<tr> <tr>
<td>Partition/Length</td> <td>Partition/Length</td>
<td><%- fields.loadpart %>/<%- fields.loadlength %></td> <td><%- fields.loadpart %>/<%- fields.loadlength %></td>
...@@ -285,14 +294,21 @@ ...@@ -285,14 +294,21 @@
<% } %> <% } %>
</td> </td>
</tr> </tr>
<% } %>
<tr> <tr>
<td class="editable adminonly" <td class="editable adminonly"
data-fieldname="osfeatures" data-fieldtype="text"> data-fieldname="osfeatures" data-fieldtype="text">
Features</td> Features
<a href='#' class='btn btn-xs' id="osfeatures-help"
data-toggle='popover'
data-html='true'>
<span class='glyphicon glyphicon-question-sign'
style='margin-bottom: 4px;'></span>
</a>
</td>
<td><span class="original" <td><span class="original"
><%- fields.os_features.join(",") %></span></td> ><%- fields.os_features.join(",") %></span></td>
</tr> </tr>
<% } %>
<% if (fields.hash) { %> <% if (fields.hash) { %>
<tr> <tr>
<td>SHA1 Hash</td> <td>SHA1 Hash</td>
...@@ -403,3 +419,38 @@ ...@@ -403,3 +419,38 @@
</div> </div>
</div> </div>
</div> </div>
<div class="hidden" id="osfeatures-help-contents">
<p>
Features that an image advertises to the infrastructure. These
features are used by the control framework to dictate what
operations it can perform on a node running the image, either for
its own needs or on behalf of a user.
</p>
<dl class=dl-horizontal>
<dt></dt>
<dd></dd>
<dt>ping</dt>
<dd>OS kernel will respond to ICMP pings</dd>
<dt>ssh</dt>
<dd>OS runs an sshd supporting public key authentication</dd>
<dt>ipod</dt>
<dd>OS kernel supports the Emulab-specific ICMP "ping of death"</dd>
<dt>isup</dt>
<dd>Contains Emulab control scripts that report the "ISUP" state</dd>
<dt>mlinks</dt>
<dd>Contains scripts to configure "multiplexed links"</dd>
<dt>linktest</dt>
<dd>Contains scripts to perform connectivity/routing/loss/BW tests on
configured</dd>
<dt>linkdelays</dt>
<dd>Contains scripts to configure on-node traffic shaping</dd>
<dt>vlans</dt>
<dd>OS can support multiplexed links using VLAN devices</dd>
<dt>loc-bstore</dt>
<dd>Supports configuration of local disk blockstores</dd>
<dt>rem-bstore</dt>
<dd>Supports configuration of remote iSCSI-based blockstores</dd>
</dl>
</div>
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