Commit 489f1472 authored by Jonathon Duerig's avatar Jonathon Duerig
Browse files

Moved .js files to a js source directory. Fixed makefile and references.

parent b25b53fd
......@@ -147,9 +147,10 @@ JSFILES += $(wildcard $(SRCDIR)/js/*.js)
BLOBFILES += $(wildcard blob/*.php3)
APTUIFILES = $(wildcard $(SRCDIR)/aptui/*.php)
APTUIFILES += $(wildcard $(SRCDIR)/aptui/*.js)
APTUIFILES += $(wildcard $(SRCDIR)/aptui/*.css)
APTUIFILES += $(wildcard $(SRCDIR)/aptui/*.png)
APTJSFILES = $(wildcard $(SRCDIR)/aptui/js/*.js)
APTLIBFILES = $(wildcard $(SRCDIR)/aptui/js/lib/*.js)
UIKITFILES = $(wildcard $(SRCDIR)/aptui/uikit/fonts/*)
BOOTSTFONTS = $(wildcard $(SRCDIR)/aptui/bootstrap/fonts/*)
BOOTSTCSS = $(wildcard $(SRCDIR)/aptui/bootstrap/css/*)
......@@ -212,6 +213,8 @@ ALLJS = $(notdir $(JSFILES))
ALLWISTATS = $(notdir $(WIRELESSSTATSFILES))
ALLBLOB = $(notdir $(BLOBFILES))
ALLAPTUI = $(notdir $(APTUIFILES))
ALLAPTJS = $(notdir $(APTJSFILES))
ALLAPTLIB = $(notdir $(APTLIBFILES))
ALLUIKITFONTS = $(notdir $(UIKITFILES))
ALLBOOTSTFONTS = $(notdir $(BOOTSTFONTS))
ALLBOOTSTCSS = $(notdir $(BOOTSTCSS))
......@@ -258,6 +261,8 @@ endif
$(INSTALL_OPSCVSWEBCGI)
apt-install: $(addprefix $(INSTALL_WWWDIR)/apt/, $(ALLAPTUI)) \
$(addprefix $(INSTALL_WWWDIR)/apt/js/, $(ALLAPTJS)) \
$(addprefix $(INSTALL_WWWDIR)/apt/js/lib/, $(ALLAPTLIB)) \
$(addprefix $(INSTALL_WWWDIR)/apt/bootstrap/css/, $(ALLBOOTSTCSS)) \
$(addprefix $(INSTALL_WWWDIR)/apt/bootstrap/js/, $(ALLBOOTSTJS)) \
$(addprefix $(INSTALL_WWWDIR)/apt/bootstrap/fonts/, $(ALLBOOTSTFONTS))
......
......@@ -9,9 +9,9 @@ require.config({
},
});
define(['jquery',
// jQuery modules
'bootstrap'],
require(['jquery',
// jQuery modules
'bootstrap'],
function ($)
{
'use strict';
......
......@@ -129,7 +129,7 @@ function SPITFORM($username, $email, $sshkey, $profile, $newuser, $errors)
if ($internal_error) {
echo "<center><h2>$internal_error</h2></center><br>\n";
}
echo "<script src='d3.v3.js'></script>\n";
echo "<script src='js/d3.v3.js'></script>\n";
echo "<div class='row'>
<div class='col-lg-6 col-lg-offset-3
col-md-6 col-md-offset-3
......
......@@ -33,11 +33,9 @@ function SPITHEADER($thinheader = 0)
<link rel='stylesheet' href='bootstrap/css/bootstrap.css'>
<link rel='stylesheet' href='quickvm.css'>
<script src='js/lib/require.js' data-main='js/main'></script>
<script src='quickvm_sup.js'></script>
<script src='date.format.js'></script>
<script src='js/quickvm_sup.js'></script>
<script src='js/date.format.js'></script>
<script src='https://www.emulab.net/emulab_sup.js'></script>
<script src='https://code.jquery.com/jquery.js'></script>
<script src='bootstrap/js/bootstrap.js'></script>
</head>
<body style='display: none'>\n";
......
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