Commit c9cf3f91 authored by Jonathon Duerig's avatar Jonathon Duerig

Fix various minor bugs and typos. All pages except for instantiate.php now seem to work.

parent 7d6cdea1
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
include("profile_defs.php");
$page_title = "My Profiles";
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
# Must be after quickvm_sup.php since it changes the auth domain.
$page_title = "Extend";
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
$page_title = "Approve User";
#
......@@ -95,7 +94,6 @@ echo " window.AJAXURL = 'server-ajax.php';\n";
echo "</script>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
REQUIRE_SUP();
SPITREQUIRE("js/approveuser.js");
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
$page_title = "Change Password";
RedirectSecure();
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
$page_title = "Cluster Graphs";
SPITHEADER(1);
......
......@@ -26,7 +26,6 @@ include("defs.php3");
include_once("geni_defs.php");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
include_once("instance_defs.php");
include_once("aggregate_defs.php");
$page_title = "Cluster Status";
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
include_once("profile_defs.php");
include_once("instance_defs.php");
# Must be after quickvm_sup.php since it changes the auth domain.
......@@ -49,7 +48,7 @@ $optargs = OptionalPageArguments("create", PAGEARG_STRING,
#
function SPITFORM($formfields, $errors)
{
global $this_user, $projlist, $embedded, $this_idx, $PORTAL_TEMPLATES;
global $this_user, $projlist, $embedded, $this_idx;
$button_label = "Create";
$title = "Create Dataset";
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
# Must be after quickvm_sup.php since it changes the auth domain.
$page_title = "Create Group";
......
......@@ -26,7 +26,6 @@ include("defs.php3");
include_once("geni_defs.php");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
$dblink = GetDBLink("sa");
#
......
/*
You probably do not need to edit this at all.
Add some SmartMenus required styles not covered in Bootstrap 3's default CSS.
These are theme independent and should work with any Bootstrap 3 theme mod.
*/
/* sub menus arrows on desktop */
.navbar-nav:not(.sm-collapsible) ul .caret {
position: absolute;
right: 0;
margin-top: 6px;
margin-right: 15px;
border-top: 4px solid transparent;
border-bottom: 4px solid transparent;
border-left: 4px dashed;
}
.navbar-nav:not(.sm-collapsible) ul a.has-submenu {
padding-right: 30px;
}
/* make sub menu arrows look like +/- buttons in collapsible mode */
.navbar-nav.sm-collapsible .caret, .navbar-nav.sm-collapsible ul .caret {
position: absolute;
right: 0;
margin: -3px 15px 0 0;
padding: 0;
width: 32px;
height: 26px;
line-height: 24px;
text-align: center;
border-width: 1px;
border-style: solid;
}
.navbar-nav.sm-collapsible .caret:before {
content: '+';
font-family: monospace;
font-weight: bold;
}
.navbar-nav.sm-collapsible .open > a > .caret:before {
content: '-';
}
.navbar-nav.sm-collapsible a.has-submenu {
padding-right: 50px;
}
/* revert to Bootstrap's default carets in collapsible mode when the "data-sm-skip-collapsible-behavior" attribute is set to the ul.navbar-nav */
.navbar-nav.sm-collapsible[data-sm-skip-collapsible-behavior] .caret, .navbar-nav.sm-collapsible[data-sm-skip-collapsible-behavior] ul .caret {
position: static;
margin: 0 0 0 2px;
padding: 0;
width: 0;
height: 0;
border-top: 4px dashed;
border-right: 4px solid transparent;
border-bottom: 0;
border-left: 4px solid transparent;
}
.navbar-nav.sm-collapsible[data-sm-skip-collapsible-behavior] .caret:before {
content: '' !important;
}
.navbar-nav.sm-collapsible[data-sm-skip-collapsible-behavior] a.has-submenu {
padding-right: 15px;
}
/* scrolling arrows for tall menus */
.navbar-nav span.scroll-up, .navbar-nav span.scroll-down {
position: absolute;
display: none;
visibility: hidden;
height: 20px;
overflow: hidden;
text-align: center;
}
.navbar-nav span.scroll-up-arrow, .navbar-nav span.scroll-down-arrow {
position: absolute;
top: -2px;
left: 50%;
margin-left: -8px;
width: 0;
height: 0;
overflow: hidden;
border-top: 7px dashed transparent;
border-right: 7px dashed transparent;
border-bottom: 7px solid;
border-left: 7px dashed transparent;
}
.navbar-nav span.scroll-down-arrow {
top: 6px;
border-top: 7px solid;
border-right: 7px dashed transparent;
border-bottom: 7px dashed transparent;
border-left: 7px dashed transparent;
}
/* add more indentation for 2+ level sub in collapsible mode - Bootstrap normally supports just 1 level sub menus */
.navbar-nav.sm-collapsible ul .dropdown-menu > li > a,
.navbar-nav.sm-collapsible ul .dropdown-menu .dropdown-header {
padding-left: 35px;
}
.navbar-nav.sm-collapsible ul ul .dropdown-menu > li > a,
.navbar-nav.sm-collapsible ul ul .dropdown-menu .dropdown-header {
padding-left: 45px;
}
.navbar-nav.sm-collapsible ul ul ul .dropdown-menu > li > a,
.navbar-nav.sm-collapsible ul ul ul .dropdown-menu .dropdown-header {
padding-left: 55px;
}
.navbar-nav.sm-collapsible ul ul ul ul .dropdown-menu > li > a,
.navbar-nav.sm-collapsible ul ul ul ul .dropdown-menu .dropdown-header {
padding-left: 65px;
}
/* fix SmartMenus sub menus auto width (subMenusMinWidth and subMenusMaxWidth options) */
.navbar-nav .dropdown-menu > li > a {
white-space: normal;
}
.navbar-nav ul.sm-nowrap > li > a {
white-space: nowrap;
}
.navbar-nav.sm-collapsible ul.sm-nowrap > li > a {
white-space: normal;
}
/* fix .navbar-right subs alignment */
.navbar-right ul.dropdown-menu {
left: 0;
right: auto;
}
\ No newline at end of file
......@@ -26,7 +26,6 @@ include("defs.php3");
include_once("geni_defs.php");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
include_once("instance_defs.php");
$page_title = "Dash Board";
......@@ -51,7 +50,6 @@ echo " window.ISADMIN = $isadmin;\n";
echo " window.ISFADMIN = $isfadmin;\n";
echo "</script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
echo "<script src='js/lib/require.js' data-main='js/dashboard'></script>\n";
REQUIRE_UNDERSCORE();
......
......@@ -27,7 +27,6 @@ include("lease_defs.php");
include("imageid_defs.php");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
include_once("dataset_defs.php");
include_once("instance_defs.php");
include_once("profile_defs.php");
......@@ -78,7 +77,7 @@ if (!$dataset->AccessCheck($this_user, $LEASE_ACCESS_MODIFY)) {
#
function SPITFORM($formfields, $errors)
{
global $this_user, $projlist, $embedded, $this_idx, $PORTAL_TEMPLATES;
global $this_user, $projlist, $embedded, $this_idx;
$button_label = "Save";
$title = "Modify Dataset";
$isadmin = (ISADMIN() ? "true" : "false");
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
# No page arguments, but make sure that the environment is clean
RequiredPageArguments();
......@@ -34,7 +33,6 @@ SPITHEADER();
echo "The URL you gave: <b>" . htmlentities( $_SERVER["REQUEST_URI"] ) . "</b>
is not available or is broken.";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
SPITNULLREQUIRE();
SPITFOOTER();
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
jinclude("require.php");
$page_title = "Forgot Your Password";
RedirectSecure();
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
# Must be after quickvm_sup.php since it changes the auth domain.
include_once("../session.php");
$page_title = "Login";
......@@ -48,7 +47,6 @@ echo "<div id='waitwait_div'></div>\n";
echo "<script src='https://www.emulab.net/protogeni/speaks-for/geni-auth.js'>
</script>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
REQUIRE_UNDERSCORE();
REQUIRE_SUP();
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
include_once("profile_defs.php");
$page_title = "Genilib Editor";
......@@ -118,7 +117,6 @@ echo "</script>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
echo "<script src='https://cdn.jsdelivr.net/ace/1.2.3/noconflict/ace.js'></script>\n";
echo "<script src='https://cdn.jsdelivr.net/ace/1.2.3/noconflict/keybinding-vim.js'></script>\n";
echo "<script src='https://cdn.jsdelivr.net/ace/1.2.3/noconflict/keybinding-emacs.js'></script>\n";
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
$page_title = "Image List";
#
......@@ -172,7 +171,6 @@ echo "</script>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/jquery.tablesorter.min.js'></script>\n";
echo "<script src='js/lib/jquery.tablesorter.widgets.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
REQUIRE_UNDERSCORE();
REQUIRE_SUP();
......
......@@ -28,7 +28,6 @@ include_once("geni_defs.php");
include_once("webtask.php");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
include_once("instance_defs.php");
include_once("profile_defs.php");
# Must be after quickvm_sup.php since it changes the auth domain.
......@@ -439,7 +438,6 @@ function SPITFORM($formfields, $newuser, $errors)
echo " window.CLASSIC = " . ($classic ? "true" : "false") . ";\n";
echo "</script>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
REQUIRE_UNDERSCORE();
REQUIRE_CONSTRAINTS();
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
$page_title = "Invite a User";
#
......@@ -46,7 +45,7 @@ $optargs = OptionalPageArguments("invite", PAGEARG_STRING,
#
function SPITFORM($formfields, $errors)
{
global $projlist, $PORTAL_TEMPLATES;
global $projlist;
SPITHEADER(1);
......@@ -69,7 +68,6 @@ function SPITFORM($formfields, $errors)
echo "</script>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
REQUIRE_UNDERSCORE();
REQUIRE_SUP();
......
//define(['underscore', 'js/lib/text!template/edit-modal.html', 'js/lib/text!template/edit-inline.html'],
window.JacksEditor = function ()
window.JacksEditor = (function ()
{
'use strict';
......
......@@ -61,7 +61,6 @@ window.APT_OPTIONS.configObject = {
window.APT_OPTIONS.initialize = function (sup)
{
var geniauth = "https://www.emulab.net/protogeni/speaks-for/geni-auth.js";
var embedded = window.EMBEDDED;
// Eventually make this download without having to follow a link.
......@@ -97,10 +96,7 @@ window.APT_OPTIONS.initialize = function (sup)
if (window.ISCLOUD || window.ISPNET) {
console.info("Loading geni auth code");
sup.InitGeniLogin(embedded);
require([geniauth], function() {
console.info("Geni auth code has been loaded");
$('#quickvm_geni_login_button').removeAttr("disabled");
});
$('#quickvm_geni_login_button').removeAttr("disabled");
}
return false;
});
......
......@@ -1175,7 +1175,6 @@ $(function (_, Constraints, sup, ppstart, JacksEditor, wt)
var description = null;
$(xml).find("rspec_tour").each(function() {
$(this).find("description").each(function() {
var marked = require("marked");
description = marked($(this).text());
});
});
......
......@@ -872,7 +872,6 @@ $(function (_, Constraints, sup, ppstart, JacksEditor, wt)
var description = null;
$(xml).find("rspec_tour").each(function() {
$(this).find("description").each(function() {
var marked = require("marked");
description = marked($(this).text());
});
});
......
//require(window.APT_OPTIONS.configObject,
// ['underscore', 'js/quickvm_sup', 'js/aptforms'],
$(function (_, sup, aptforms)
$(function ()
{
'use strict';
......
......@@ -4,7 +4,7 @@ $(function ()
{
'use strict';
var templates = fetchTemplateList(['lists']);
var templates = APT_OPTIONS.fetchTemplateList(['lists']);
var mainTemplate = _.template(templates['lists']);
function initialize()
......
......@@ -451,14 +451,12 @@ $(function (/*_, sup, filesize, JacksEditor, ShowImagingModal, moment, aptforms,
*/
$('#profile_instructions').dblclick(function() {
var text = $(this).val();
var marked = require("marked");
$('#renderer_modal_div').html(marked(text));
sup.ShowModal("#renderer_modal");
});
// Ditto the description.
$('#profile_description').dblclick(function() {
var text = $(this).val();
var marked = require("marked");
$('#renderer_modal_div').html(marked(text));
sup.ShowModal("#renderer_modal");
});
......
......@@ -10,7 +10,7 @@ $(function ()
var templates = APT_OPTIONS.fetchTemplateList(['rspec2genilib', 'waitwait-modal', 'oops-modal']);
var mainString = templates['rspec2genilib'];
var waitwaitString = templates['waitwait-modal'];
var waitString = templates['waitwait-modal'];
var oopsString = templates['oops-modal'];
var mainTemplate = _.template(mainString);
......
......@@ -21,7 +21,7 @@ $(function (/*_, sup, moment, aptforms, mainString,
var detailsString = templates['group-profile'];
var classicString = templates['classic-explist'];
var oopsString = templates['oops-modal'];
var waitwaitString = templates['waitwait-modal'];
var waitString = templates['waitwait-modal'];
var mainTemplate = _.template(mainString);
......
......@@ -11,7 +11,7 @@
'js/lib/text!template/share-modal.html',
// jQuery modules
'marked'],*/
function (/*_, sup, moment,
$(function (/*_, sup, moment,
showString, waitwaitString,
rendererString, showtopoString, rspectextviewString,
guestInstantiateString, instantiateString, oopsString, shareString*/)
......@@ -258,12 +258,10 @@ function (/*_, sup, moment,
$(xml).find("rspec_tour > description").each(function() {
var text = $(this).text();
var marked = require("marked");
$('#profile_description').html(marked(text));
});
$(xml).find("rspec_tour > instructions").each(function() {
var text = $(this).text();
var marked = require("marked");
$('#profile_instructions').html(marked(text));
});
}
......
......@@ -22,7 +22,7 @@ $(function (/*_, sup, moment, marked, UriTemplate, ShowImagingModal,
{
'use strict';
var templates = APT_OPTIONS.fetchTemplateList(['status', 'waitwait-modal', 'oops-modal', 'register-modal', 'terminate-modal', 'clone-help', 'snapshot-help', 'oneonly-modal', 'approval-modal', 'linktest-modal']);
var templates = APT_OPTIONS.fetchTemplateList(['status', 'waitwait-modal', 'oops-modal', 'register-modal', 'terminate-modal', 'clone-help', 'snapshot-help', 'oneonly-modal', 'approval-modal', 'linktest-modal', 'linktest.md']);
var statusString = templates['status'];
var waitwaitString = templates['waitwait-modal'];
......@@ -2380,12 +2380,10 @@ $(function (/*_, sup, moment, marked, UriTemplate, ShowImagingModal,
if (hidelinktest || !showlinktest) {
return;
}
require(['js/lib/text!template/linktest.md'],
function(md) {
console.info(md);
console.info(marked(md));
$('#linktest-help').html(marked(md));
});
var md = templates['linktest.md'];
console.info(md);
console.info(marked(md));
$('#linktest-help').html(marked(md));
// Handler for the linktest modal button
$('button#linktest-modal-button').click(function (event) {
......
......@@ -28,7 +28,6 @@ include("blockstore_defs.php");
include("imageid_defs.php");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
include("dataset_defs.php");
$page_title = "My Datasets";
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
# Must be after quickvm_sup.php since it changes the auth domain.
$page_title = "Ranking";
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
$page_title = "Login";
AddTemplate("waitwait-modal");
......@@ -93,7 +92,6 @@ if (NOLOGINS() && !$adminmode) {
SPITUSERERROR("Sorry, logins are temporarily disabled, ".
"please try again later.");
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
SPITNULLREQUIRE();
SPITFOOTER();
return;
......@@ -231,7 +229,6 @@ function SPITFORM($uid, $referrer, $error)
}
echo "<div id='waitwait_div'></div>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
REQUIRE_UNDERSCORE();
REQUIRE_SUP();
......@@ -284,7 +281,6 @@ else {
Please do not attempt to login again; it will not work!
</h4>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
SPITNULLREQUIRE();
SPITFOOTER();
return;
......@@ -300,7 +296,6 @@ else {
Please do not attempt to login again; it will not work!
</h4>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
SPITNULLREQUIRE();
SPITFOOTER();
return;
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
#
# Verify page arguments.
......@@ -46,7 +45,6 @@ if ($this_user) {
SPITHEADER();
echo "<center><font color=red>Logout failed!</font></failed>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
SPITNULLREQUIRE();
SPITFOOTER();
}
......
......@@ -26,7 +26,6 @@ include("defs.php3");
include_once("webtask.php");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
include_once("profile_defs.php");
include_once("instance_defs.php");
# Must be after quickvm_sup.php since it changes the auth domain.
......@@ -210,7 +209,6 @@ function SPITFORM($formfields, $errors)
echo "<script src='js/lib/jquery-ui.js'></script>\n";
echo "<script src='js/lib/jquery.appendGrid-1.3.1.min.js'></script>\n";
echo "<script src='js/lib/codemirror-min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
REQUIRE_UNDERSCORE();
REQUIRE_SUP();
......@@ -222,7 +220,8 @@ function SPITFORM($formfields, $errors)
REQUIRE_FILESTYLE();
REQUIRE_MARKED();
SPITREQUIRE("js/manage_profile.js");
AddTemplateList(array('manage-profile', 'waitwait-modal', 'renderer-modal', 'showtopo-modal', 'oops-modal', 'rspectextview-modal', 'guest-instantiate', 'publish-modal', 'instantiate-modal', 'share-modal'));
SPITFOOTER();
}
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
#
# Get current user.
......@@ -95,7 +94,6 @@ echo "<script type='text/plain' id='form-json'>\n";
echo htmlentities(json_encode($defaults)) . "\n";
echo "</script>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
REQUIRE_UNDERSCORE();
REQUIRE_SUP();
......
......@@ -26,7 +26,6 @@ include("defs.php3");
include_once("geni_defs.php");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
include_once("profile_defs.php");
include_once("instance_defs.php");
$page_title = "My Experiments";
......@@ -337,7 +336,6 @@ echo " </div>
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/jquery.tablesorter.min.js'></script>\n";
echo "<script src='js/lib/jquery.tablesorter.widgets.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
REQUIRE_SUP();
REQUIRE_MOMENT();
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
$page_title = "My Profiles";
#
......@@ -228,7 +227,6 @@ echo "</script>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/jquery.tablesorter.min.js'></script>\n";
echo "<script src='js/lib/jquery.tablesorter.widgets.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
REQUIRE_SUP();
REQUIRE_MOMENT();
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
include("profile_defs.php");
$page_title = "My Profiles";
......@@ -119,7 +118,6 @@ echo "<script type='text/plain' id='instances-json'>\n";
echo json_encode($instances);
echo "</script>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
REQUIRE_UNDERSCORE();
REQUIRE_SUP();
......
......@@ -25,7 +25,6 @@ chdir("..");
include("defs.php3");
chdir("apt");
include("quickvm_sup.php");
include("require.php");
include("profile_defs.php");
$page_title = "My Profiles";
......@@ -110,7 +109,6 @@ echo "<script type='text/plain' id='profiles-json'>\n";
echo json_encode($profiles);
echo "</script>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
REQUIRE_UNDERSCORE();
REQUIRE_SUP();
......
......@@ -23,6 +23,7 @@
#
include_once("portal_defs.php");
include_once("instance_defs.php");
include_once("require.php");
#
# Global flag to disable accounts. We do this on some pages which
......@@ -40,12 +41,6 @@ if (isset($_REQUEST["embedded"]) && $_REQUEST["embedded"]) {
$embedded = 1;
}
$PORTAL_TEMPLATES = array();
$PORTAL_LIBRARIES = array();
# Flag to signal that a requires was spit. For errors.
$spatrequired = 0;
# For backend scripts to know how they were invoked.
if (isset($_SERVER['SERVER_NAME'])) {
putenv("SERVER_NAME=" . $_SERVER['SERVER_NAME']);
......@@ -73,9 +68,7 @@ $PAGEERROR_HANDLER = function($msg, $status_code = 0) {
echo "</script>\n";
if (!$spatrequired) {
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='js/lib/bootstrap.js'></script>\n";
echo "<script src='js/lib/require.js' data-main='js/null.js'>
</script>\n";
SPITNULLREQUIRE();
}
SPITFOOTER();