Commit e195996f authored by Leigh B Stoller's avatar Leigh B Stoller

Minor UI changes.

parent 805bd80b
......@@ -143,7 +143,8 @@ class Dataset
$this->aggregate_urn(), $matches)) {
return "";
}
return $matches[1] . "+" . $matches[2] . "+dataset+" . $this->id();
return $matches[1] . "+" . $matches[2] . "+dataset+" .
$this->pid() . "//" . $this->id();
}
}
?>
......@@ -49,6 +49,11 @@ function (_, sup, moment, mainString)
html = formatter(html, errors).html();
$('#main-body').html(html);
// This activates the popover subsystem.
$('[data-toggle="popover"]').popover({
trigger: 'hover',
container: 'body'
});
// stdatasets need the datepicker.
var needpicker = false;
if (formfields["dataset_type"] == "stdataset") {
......
......@@ -100,6 +100,10 @@ elseif (0 || ($TBMAINSITE && $_SERVER["SERVER_NAME"] == "www.cloudlab.us")) {
$APTBASE .= "/" . $matches[1];
}
}
# For backend scripts to know how they were invoked.
if (isset($_SERVER['SERVER_NAME'])) {
putenv("SERVER_NAME=" . $_SERVER['SERVER_NAME']);
}
#
# Redefine this so APT errors are styled properly. Called by PAGEERROR();.
......
......@@ -37,6 +37,7 @@ RedirectSecure();
$this_user = CheckLoginOrRedirect();
$this_idx = $this_user->uid_idx();
$this_uid = $this_user->uid();
$isadmin = (ISADMIN() ? 1 : 0);
#
# Verify page arguments.
......@@ -89,9 +90,11 @@ $fields["dataset_expires"] = ($dataset->expires() ?
$fields["dataset_lastused"] = ($dataset->last_used() ?
DateStringGMT($dataset->last_used()) : "");
$fields["dataset_uuid"] = $uuid;
$fields["dataset_idx"] = $dataset->idx();
$fields["dataset_urn"] = $dataset->URN();
$fields["dataset_who"] = $dataset->PrivacyString();
if (ISADMIN()) {
$fields["dataset_idx"] = $dataset->idx();
}
#
# The state is a bit of a problem, since local leases do not have
......
......@@ -84,6 +84,21 @@
%>checked<% } %>
value='ltdataset'> Long term
</label>
<a href='#' class='radio-inline'
data-toggle='popover'
data-delay='{"hide":1500}'
data-content="Long term datasets are what
you would think of as 'persistent': they stick around
for as long as they are useful; i.e., they expire only
after having been unused for a long time rather than
at a fixed date, and then are locked down rather than
automatically destroyed. Short-term datasets are for
situations where you want to run a series of
experiments over a short time period (days to weeks)
using the same large data set but where ephemeral
storage may not be practical.">
<span class='glyphicon glyphicon-question-sign'></span>
</a>
</div>
<% } %>
<div id='dataset_expires_div'
......
......@@ -78,10 +78,12 @@
<td>URN</td>
<td><%- formfields.dataset_urn %></td>
</tr>
<% if (_.has(formfields, 'dataset_idx')) { %>
<tr>
<td>Internal ID</td>
<td><%- formfields.dataset_idx %></td>
</tr>
<% } %>
</table>
</div>
</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