Commit 0f386380 authored by Leigh B Stoller's avatar Leigh B Stoller

First cut at the Emulab Portal. Recalling a historical commit message, many

things were changed.
parent bff243ed
.navbar img {
margin: 5 auto;
height: 65px;
}
.navbar-static-top, .navbar-inner {
background-color: #66b2ff;
}
#footer, #footer a, #footer a:hover {
background-color: #66b2ff;
color: black;
}
#footer a, #footer a:hover {
color: black;
}
.btn-quickvm-home, .btn-quickvm-home:hover {
background-color: #e8eeef
}
.btn-success {
background-color: #289328;
border-color: #237f23;
}
.btn-primary {
background-color: #2f8ead;
border-color: #2a7e99;
}
.btn-info {
background-color: #2f64ad;
border-color: #2a5899;
}
.btn-warning {
background-color: #8a7626;
border-color: #766520;
}
.btn-danger {
background-color: #9c2a2a;
border-color: #882525;
}
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.0"
width="157.64218"
height="106.33039"
id="svg2">
<defs
id="defs4" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:date>3/27/06</dc:date>
<dc:creator>
<cc:Agent>
<dc:title>Robert Ricci</dc:title>
</cc:Agent>
</dc:creator>
<dc:rights>
<cc:Agent>
<dc:title>University of Utah, School of Computing, Flux Group</dc:title>
</cc:Agent>
</dc:rights>
</cc:Work>
</rdf:RDF>
</metadata>
<g
transform="translate(8.0449154,-3.5159479)"
id="layer3"
style="display:inline">
<text
x="-11.64179"
y="109.08384"
id="text3057"
xml:space="preserve"
style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"><tspan
x="-11.64179"
y="109.08384"
id="tspan3059">Emulab</tspan></text>
</g>
<g
transform="translate(8.0449154,-3.5159479)"
id="layer1">
<g
transform="matrix(0.8,0,0,0.8,21.476119,0.7619092)"
id="g3266"
style="stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
<g
id="g3182"
style="stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,16.21204,20.04604)"
id="path1394"
style="color:#000000;fill:#ccfdd1;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,33.40521,20.78061)"
id="path2278"
style="color:#000000;fill:#ccfdd1;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,42.49658,35.55408)"
id="path2280"
style="color:#000000;fill:#ccfdd1;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,34.16281,50.70637)"
id="path2282"
style="color:#000000;fill:#ccfdd1;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,16.61142,50.32757)"
id="path2284"
style="color:#000000;fill:#ccfdd1;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,7.014966,35.30154)"
id="path2286"
style="color:#000000;fill:#ccfdd1;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,24.4401,35.30155)"
id="path2288"
style="color:#000000;fill:#1be12d;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 63.008265,16.283608 2.146574,4.293148"
id="path3164"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="m 73.993674,16.914953 -2.65165,3.788072"
id="path3166"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="m 79.549513,26.511402 -5.050763,0"
id="path3168"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="M 74.372481,36.107851 71.342024,31.562165"
id="path3170"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="m 62.755727,35.476506 2.65165,-3.914341"
id="path3172"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="m 56.694812,26.637671 5.050762,0"
id="path3174"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
</g>
<g
transform="translate(-8.144354,45.63475)"
id="g3197"
style="stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,16.21204,20.04604)"
id="path3199"
style="color:#000000;fill:#f8b9b9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,33.40521,20.78061)"
id="path3201"
style="color:#000000;fill:#f8b9b9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,42.49658,35.55408)"
id="path3203"
style="color:#000000;fill:#f8b9b9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,34.16281,50.70637)"
id="path3205"
style="color:#000000;fill:#f8b9b9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,16.61142,50.32757)"
id="path3207"
style="color:#000000;fill:#f8b9b9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,7.014966,35.30154)"
id="path3209"
style="color:#000000;fill:#f8b9b9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,24.4401,35.30155)"
id="path3211"
style="color:#000000;fill:#e21a1a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 63.008265,16.283608 2.146574,4.293148"
id="path3213"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="m 73.993674,16.914953 -2.65165,3.788072"
id="path3215"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="m 79.549513,26.511402 -5.050763,0"
id="path3217"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="M 74.372481,36.107851 71.342024,31.562165"
id="path3219"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="m 62.755727,35.476506 2.65165,-3.914341"
id="path3221"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="m 56.694812,26.637671 5.050762,0"
id="path3223"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
</g>
<g
transform="translate(-43.41543,14.17606)"
id="g3225"
style="stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,16.21204,20.04604)"
id="path3227"
style="color:#000000;fill:#a5bfff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,33.40521,20.78061)"
id="path3229"
style="color:#000000;fill:#a5bfff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,42.49658,35.55408)"
id="path3231"
style="color:#000000;fill:#a5bfff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,34.16281,50.70637)"
id="path3233"
style="color:#000000;fill:#a5bfff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,16.61142,50.32757)"
id="path3235"
style="color:#000000;fill:#a5bfff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,7.014966,35.30154)"
id="path3237"
style="color:#000000;fill:#a5bfff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 43.639094,-8.125 a 5.5140939,5.5140939 0 1 1 -11.028188,0 5.5140939,5.5140939 0 1 1 11.028188,0 z"
transform="matrix(1.144103,0,0,1.144027,24.4401,35.30155)"
id="path3239"
style="color:#000000;fill:#1930e3;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31111431;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
<path
d="m 63.008265,16.283608 2.146574,4.293148"
id="path3241"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="m 73.993674,16.914953 -2.65165,3.788072"
id="path3243"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="m 79.549513,26.511402 -5.050763,0"
id="path3245"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="M 74.372481,36.107851 71.342024,31.562165"
id="path3247"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="m 62.755727,35.476506 2.65165,-3.914341"
id="path3249"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<path
d="m 56.694812,26.637671 5.050762,0"
id="path3251"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
</g>
<g
id="g3261"
style="stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
<path
d="M 39.774757,65.907352 37.249375,61.235396"
id="path3255"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
d="M 66.038723,51.512678 63.008265,46.714453"
id="path3257"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
d="M 47.350901,31.435896 45.709403,34.97143"
id="path3259"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
</g>
</g>
</g>
</svg>
......@@ -23,16 +23,6 @@
#
#
if ($ISAPT) {
$DEFAULT_AGGREGATE = "Utah APT";
}
elseif ($ISCLOUD) {
$DEFAULT_AGGREGATE = "Utah Cloudlab";
}
elseif ($ISPNET) {
$DEFAULT_AGGREGATE = "Emulab";
}
$urn_mapping =
array("urn:publicid:IDN+utah.cloudlab.us+authority+cm" => "Utah",
"urn:publicid:IDN+wisc.cloudlab.us+authority+cm" => "Wisc",
......@@ -359,7 +349,7 @@ class Instance
# Return aggregate based on the current user.
#
function DefaultAggregateList() {
global $ISAPT, $ISCLOUD, $ISPNET;
global $ISAPT, $ISCLOUD, $ISPNET, $ISEMULAB;
if ($ISAPT) {
$am_array = array(
'Cloudlab Utah' =>
......@@ -394,7 +384,7 @@ class Instance
"urn:publicid:IDN+uky.emulab.net+authority+cm";
}
}
elseif ($ISPNET) {
elseif ($ISPNET || $ISEMULAB) {
$am_array = array(
'Emulab' =>
"urn:publicid:IDN+emulab.net+authority+cm"
......
......@@ -115,75 +115,8 @@ function Do_GetParameters()
#
function Do_Instantiate()
{
global $this_user, $DEFAULT_AGGREGATE, $ISCLOUD;
global $ajax_args;
$am_array = Instance::DefaultAggregateList();
if (!isset($ajax_args["uuid"])) {
SPITAJAX_ERROR(1, "Missing profile uuid");
return;
}
$profile = Profile::Lookup($ajax_args["uuid"]);
if (!$profile) {
SPITAJAX_ERROR(1, "Unknown profile uuid");
return;
}
if (!isset($this_user)) {
if (!$profile->ispublic()) {
SPITAJAX_ERROR(1, "Not enough permission to instantiate profile");
return;
}
}
elseif (! ($profile->CanInstantiate($this_user) || ISADMIN())) {
SPITAJAX_ERROR(1, "Not enough permission to instantiate profile");
return;
}
$args = array();
$args["username"] = $this_user->uid();
$args["email"] = $this_user->email();
$args["profile"] = $profile->uuid();
# Guest users not allowed to provide rspec
if (isset($this_user) &&
array_key_exists("rspec", $ajax_args)) {
$args["rspec"] = $ajax_args["rspec"];
}
$opts = "";
# Guest users not allowed to choose aggregate.
if (isset($this_user) && ($ISCLOUD || ISADMIN() || STUDLY()) &&
isset($ajax_args["where"])) {
if (array_key_exists($ajax_args["where"], $am_array)) {
$opts = "-a " . $am_array[$ajax_args["where"]];
}
else {
SPITAJAX_ERROR(1, "Invalid Aggregate");
return;
}
}
else {
# Temporary until constraint system in place.
$best = $profile->BestAggregate();
if (!$best) {
$best = $DEFAULT_AGGREGATE;
}
$opts = "-a " . $am_array[$best];
}
#
# Invoke the backend.
#
$errors = array();
list ($instance, $creator) =
Instance::Instantiate($this_user, $opts, $args, $errors);
if (!isset($instance) || is_null($instance)) {
SPITAJAX_ERROR(1, $errors["error"]);
return;
}
#
# Redirect user to status page.
#
$uuid = $instance->uuid();
SPITAJAX_RESPONSE("status.php?uuid=$uuid");
SPITAJAX_ERROR(1, "This interface is deprecated");
return;
}
#
......@@ -611,7 +544,7 @@ function CheckStep2()
{
global $this_user;
global $ajax_args;
global $ISAPT, $ISPNET, $ISCLOUD;
global $ISAPT, $ISPNET, $ISCLOUD, $ISEMULAB;
if (!isset($ajax_args["formfields"])) {
SPITAJAX_ERROR(-1, "Missing formfields");
......@@ -659,7 +592,7 @@ function CheckStep2()
}
}
}
elseif ($ISAPT || $ISPNET) {
elseif ($ISAPT || $ISPNET || $ISEMULAB) {
# No choice
;
}
......@@ -714,7 +647,7 @@ function Do_Submit()
{
global $this_user;
global $ajax_args;
global $TBAUTHDOMAIN, $ISAPT, $ISPNET;
global $TBAUTHDOMAIN, $ISAPT, $ISPNET, $DEFAULT_AGGREGATE_URN;
if (!isset($ajax_args["formfields"])) {
SPITAJAX_ERROR(1, "Missing formfields");
......@@ -758,12 +691,9 @@ function Do_Submit()
$sitemap = array();
if ($this_user) {
if ($ISAPT) {
$aggregate_urn = "urn:publicid:IDN+apt.emulab.net+authority+cm";
if ($ISAPT || $ISPNET) {
$aggregate_urn = $DEFAULT_AGGREGATE_URN;
}
elseif ($ISPNET) {
$aggregate_urn = "urn:publicid:IDN+emulab.net+authority+cm";
}
elseif (isset($formfields["sites"]) && is_array($formfields["sites"])) {
while (list($siteid, $am) = each($formfields["sites"])) {
if (array_key_exists($am, $am_array)) {
......
......@@ -44,7 +44,7 @@ $this_user = CheckLogin($check_status);
if (isset($this_user)) {
CheckLoginOrDie(CHECKLOGIN_NONLOCAL|CHECKLOGIN_WEBONLY);
}
elseif ($ISCLOUD || $ISPNET) {
elseif (!$ISAPT) {
RedirectLoginPage();
}
......@@ -300,7 +300,7 @@ $profile_array = $tmp_array;
function SPITFORM($formfields, $newuser, $errors)
{
global $TBBASE, $APTMAIL, $ISAPT, $ISCLOUD, $ISPNET;
global $TBBASE, $APTMAIL, $ISAPT, $ISCLOUD, $ISPNET, $PORTAL_NAME;
global $profile_array, $this_user, $profilename, $profile, $am_array;
global $projlist;
$amlist = array();
......@@ -312,7 +312,6 @@ function SPITFORM($formfields, $newuser, $errors)
$this_user->webonly() ? "true" : "false");
$cancopy = (isset($this_user) && !$this_user->webonly() ? 1 : 0);
$nopprspec = (!isset($this_user) ? "true" : "false");
$cluster = ($ISCLOUD ? "Cloudlab" : ($ISPNET ? "PhantomNet" : "APT"));
$portal = "";
$showpicker = (isset($profile) ? 0 : 1);
if (isset($profilename)) {
......@@ -399,6 +398,7 @@ function SPITFORM($formfields, $newuser, $errors)
$doconstraints = (isset($this_user) &&
(ISADMINISTRATOR() || STUDLY()) ? 1 : 0);
echo " window.DOCONSTRAINTS = 1;\n";
echo " window.PORTAL_NAME = '$PORTAL_NAME';\n";
echo "</script>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js?nocache=asdfasdf'></script>\n";
echo "<script src='js/lib/bootstrap.js?nocache=asdfasdf'></script>\n";
......
......@@ -41,7 +41,7 @@ function (_, editModalString, editInlineString)
var contextFetched = false;
var contextUrl = "";
if (window.ISCLOUD)
if (window.ISCLOUD || window.ISEMULAB)
{
contextUrl = 'https://www.emulab.net/protogeni/jacks-context/cloudlab-utah.json';
}
......
......@@ -56,8 +56,6 @@ function (_, sup, moment, mainString, helpString)
embedded: window.EMBEDDED,
editing: editing,
isadmin: isadmin,
sitename: (window.ISCLOUD ? "CloudLab" :
(window.ISPNET ? "PhantomNet" : "APT")),
});
html = formatter(html, errors).html();
$('#main-body').html(html);
......
......@@ -83,8 +83,7 @@ function (_, Constraints, sup, ppstart, JacksEditor, wt,
profilevers: window.PROFILEVERS,
showpicker: showpicker,
cancopy: window.CANCOPY,
clustername: (window.ISCLOUD ? "CloudLab" :
(window.ISPNET ? "PhantomNet" : "APT")),
clustername: window.PORTAL_NAME,
});
$('#main-body').html(html);
......
......@@ -111,8 +111,7 @@ function (_, sup, filesize, JacksEditor, ShowImagingModal, moment, ppstart,
copyuuid: (window.COPYUUID || null),
snapuuid: (window.SNAPUUID || null),
general_error: (errors.error || ''),
iscloud: window.ISCLOUD,
ispnet: window.ISPNET,
isapt: window.ISAPT,
disabled: window.DISABLED,
versions: versions,
withpublishing: window.WITHPUBLISHING,
......
......@@ -19,14 +19,10 @@ function (_, sup,
var personalTemplate = _.template(personalString);
var projectTemplate = _.template(projectString);
var signupTemplate = _.template(signupString);
var ISCLOUD = 0;
var ISPNET = 0;
function initialize()
{
window.APT_OPTIONS.initialize(sup);
ISCLOUD = window.ISCLOUD;
ISPNET = window.ISPNET;
$('#toomany_div').html(toomanyString);
var fields = JSON.parse(_.unescape($('#form-json')[0].textContent));
......@@ -79,7 +75,7 @@ function (_, sup,
var signup = signupTemplate({
button_label: buttonLabel,
general_error: (errors.error || ''),
about_account: (ISCLOUD || ISPNET || thisUser ? null : about),
about_account: (window.ISAPT || !thisUser ? about : null),
this_user: thisUser,
promoting: promoting,
joinproject: joinproject,
......
......@@ -60,11 +60,7 @@ function (_, sup, moment, marked, UriTemplate, ShowImagingModal,
lockdown = window.APT_OPTIONS.lockdown;
lockdown_code= uuid.substr(2, 5);
var instanceStatus = window.APT_OPTIONS.instanceStatus;
var errorURL = (window.ISCLOUD ?
"https://groups.google.com/d/forum/cloudlab-users" :
(window.ISPNET ?
"https://groups.google.com/d/forum/phantomnet-users" :
"https://groups.google.com/d/forum/apt-users"));
var errorURL = window.HELPFORUM;
// Generate the templates.
var template_args = {
......
......@@ -33,7 +33,7 @@ include_once("instance_defs.php");
#
RedirectSecure();
$this_user = CheckLogin($check_status);
if ($ISCLOUD || $ISPNET) {
if (!$ISAPT) {
if (! ($CHECKLOGIN_STATUS & CHECKLOGIN_LOGGEDIN)) {
header("Location: login.php");
return;
......
......@@ -87,13 +87,10 @@ if (NOLOGINS()) {
#
function SPITFORM($uid, $referrer, $error)
{
global $PORTAL_PASSWORD_HELP;
global $TBDB_UIDLEN, $TBBASE, $refer;
global $ISAPT, $ISCLOUD, $ISPNET, $showguestlogin;
$pwlab = ($ISAPT ? "Aptlab.net" :
($ISCLOUD ? "CloudLab.us" :
($ISPNET ? "PhantomNet.org" : ""))) .
" or Emulab.net Username";
global $ISAPT, $ISCLOUD, $showguestlogin;
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Cache-Control: no-cache, max-age=0, must-revalidate, no-store");
......@@ -146,7 +143,7 @@ function SPITFORM($uid, $referrer, $error)
<label for='uid' class='col-sm-2 control-label'>Username</label>
<div class='col-sm-10'>
<input name='uid' class='form-control'
placeholder='<?php echo $pwlab ?>'