Commit 010e3723 authored by Jonathon Duerig's avatar Jonathon Duerig
Browse files

Really fix menu and whitespace bugs.

parent 24cb6595
......@@ -365,6 +365,7 @@ function SPITFORM($formfields, $newuser, $errors)
}
echo "</script>\n";
echo "<script src='js/lib/jquery-2.0.3.min.js'></script>\n";
echo "<script src='bootstrap/js/bootstrap.js'></script>\n";
echo "<script src='js/lib/require.js' data-main='js/instantiate'></script>";
}
......
......@@ -60,7 +60,7 @@ window.APT_OPTIONS.configNoQuery = function ()
'bootstrap': { },
'jquery-ui': { },
'jquery-grid': { deps: ['jquery-ui'] },
'formhelpers': { deps: ['bootstrap']},
'formhelpers': { /*deps: ['bootstrap']*/},
'dateformat': { exports: 'dateFormat' },
'd3': { exports: 'd3' },
'filestyle': { deps: ['bootstrap']},
......
window.APT_OPTIONS.configNoQuery();
require([// jQuery modules
'formhelpers', 'filestyle', 'marked', 'jacks'],
'formhelpers', 'filestyle', 'marked', 'jacks'],
function ()
{
'use strict';
......
......@@ -139,7 +139,10 @@ body {
width: 950px;
}
#showtopo_description,
#showtopo_description {
width: 643px;
}
#showtopo_div {
width: 643px;
height: 300px;
......
......@@ -376,8 +376,8 @@ function SpitTopologyViewModal($modal_name, $profile_array)
echo " </ul>
</div>
<div class='pull-right'>
<span id='showtopo_title'></span>
<div class='panel-body'>
<span id='showtopo_title'></span>
<div id='showtopo_div' class='jacks'></div>
<span class='pull-left' id='showtopo_description'></span>
</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