All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 9cdd5ed8 authored by Leigh B Stoller's avatar Leigh B Stoller

Move the About panel into a template file. Cleaner.

parent 5dc65822
......@@ -167,7 +167,8 @@ function SPITFORM($formfields, $newuser, $errors)
col-sm-8 col-sm-offset-2
col-xs-12 col-xs-offset-0'>\n";
SpitAboutApt();
# 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'
enctype='multipart/form-data'
......
//window.APT_OPTIONS.config();
require(window.APT_OPTIONS.configObject,
['underscore', 'js/quickvm_sup', // jQuery modules
'formhelpers', 'filestyle', 'marked'],
function (_, sup)
'js/lib/text!template/aboutapt.html',
'js/lib/text!template/aboutcloudlab.html',
'formhelpers', 'filestyle', 'marked'],
function (_, sup, aboutaptString, aboutcloudString)
{
'use strict';
......@@ -14,6 +14,9 @@ function (_, sup)
window.APT_OPTIONS.initialize();
ajaxurl = window.AJAXURL;
// The about panel.
$('#about_div').html(window.ISCLOUD ? aboutcloudString : aboutaptString);
if (window.APT_OPTIONS.isNewUser) {
$('#verify_modal_submit').click(function (event) {
$('#verify_modal').modal('hide');
......
<div class="panel panel-info">
<div class="panel-heading">
<h5>
<a data-toggle="collapse"
href="#aboutapt">
What is Apt?
<span class="glyphicon glyphicon-chevron-right pull-right"></span>
</a>
</h5>
</div>
<div id="aboutapt" class="panel-collapse collapse">
<div class="panel-body">
<p>
Apt is a testbed facility built around <em>profiles</em>. A
profile describes an <em>experiment</em>; when you instantiate a
profile, that specification is realized on the Apt cluster using
virtual or physical machines. The creator of a profile may put
code, data, and other resources into it, and the profile may
consist of a single machine or may describe an entire network.
</p>
<p>
Apt is a <em>platform for sharing research</em>; it is open to all
researchers, educators, and students. Basic access to public
profiles on Apt is provided without the need to register for an
account - this keeps the barriers to accessing research results
low. If you find the limited resources that are provided to
unregistered users valuable, we
recommend <a href="signup.php">signing up</a> for a <em>(free)</em>
account to get access to more resources and to create profiles of
your own.
</p>
<p>
Apt is built on <a href="http:/www.emulab.net">Emulab</a> and
<a href="http://www.geni.net">GENI</a> technologies.
It is built and operated by the <a href="http://www.flux.utah.edu">Flux
Research Group</a>, part of
the <a href="http://www.utah.edu">University of
Utah</a>'s <a href="http://www.cs.utah.edu">School of Computing</a>.
Apt is funded by the National Science Foundation under award
CNS-1338155 and by the University of Utah.
</p>
<p>
For help, bug reports, or other questions, come join the
<a href="https://groups.google.com/forum/#!forum/apt-users">Discussion
Forum</a>
</p>
</div> <!-- Panel body -->
</div> <!-- Collapser -->
</div> <!-- Panel -->
<div class="panel panel-info">
<div class="panel-heading">
<h5>
<a data-toggle="collapse"
href="#aboutcloudlab">
What is CloudLab?
<span class="glyphicon glyphicon-chevron-right pull-right"></span>
</a>
</h5>
</div>
<div id="aboutcloudlab" class="panel-collapse collapse">
<div class="panel-body">
<p>
CloudLab allows you to build your own cloud, one in which you have
full control! This means you can run a full suite of cloud software
of your own compute, networking, and storage. That suite might look
like one of today's cloud software stacks (for example, maybe it's an
instance of OpenStack), it might be an incremental improvement to
today's stacks (for example, replacing the storage layer), or it
might be something radically different, built from the ground-up to
support features like real-time computing, integration with
cyber-physical systems, high performance computing, or energy
awareness. Your cloud might be only for your own use as you
experiment with your new architecture, or you could open it up to
other users to get real application workloads.
</p>
<p>
CloudLab is built around profiles. A profile is a description of
everything needed to build a cloud: the physical hardware (servers,
disks, switches) and the software needed to transform it into a
particular type of cloud. A profile is fully packaged and automated:
building a cloud from scratch may take only minutes, depending on its
size and complexity. CloudLab will provide "stock" profiles for
several popular cloud software stacks, but users can modify these or
build their own from scratch.
<p>
CloudLab is built on <a href="http:/www.emulab.net">Emulab</a> and
<a href="http://www.geni.net">GENI</a> technologies.
It is built and operated by the <a href="http://www.flux.utah.edu">Flux
Research Group</a>, part of
the <a href="http://www.utah.edu">University of
Utah</a>'s <a href="http://www.cs.utah.edu">School of Computing</a>.
CloudLab is funded by the National Science Foundation under award
CNS-1302688.
</p>
<p>
For help, bug reports, or other questions, come join the
<a href="https://groups.google.com/forum/#!forum/cloudlab-users">
Discussion Forum</a>
</p>
</div> <!-- Panel body -->
</div> <!-- Collapser -->
</div> <!-- Panel -->
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