홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
5f39965c 1 parent 01a883cb

Migrated legacy GUI resources out of the way for the new GUI. 

Change-Id: I92dff4012c63d2f60ee61b5d10cbc4a384d49233
Inline Side-by-side
Showing 26 changed files with 11 additions and 11 deletions
......@@ -21,7 +21,7 @@
<display-name>ONOS GUI</display-name>
<welcome-file-list>
<welcome-file>index.html</welcome-file>
<welcome-file>legacy/index.html</welcome-file>
</welcome-file-list>
<!--
......@@ -97,7 +97,7 @@
</init-param>
<init-param>
<param-name>com.sun.jersey.config.property.classnames</param-name>
<param-value>org.onosproject.gui.impl.MainViewResource</param-value>
<param-value>org.onosproject.ui.impl.MainViewResource</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
......
This diff could not be displayed because it is too large.
......@@ -22,14 +22,14 @@
<html>
<head>
<meta charset="utf-8">
<link rel="shortcut icon" href="img/onos-logo.png">
<link rel="shortcut icon" href="../img/onos-logo.png">
<title>ONOS</title>
<!-- Third party library code included here -->
<!--TODO: use the minified version of d3, once debugging is complete -->
<script src="tp/d3.js"></script>
<script src="tp/topojson.v1.min.js"></script>
<script src="tp/jquery-2.1.1.min.js"></script>
<script src="../tp/d3.js"></script>
<script src="../tp/topojson.v1.min.js"></script>
<script src="../tp/jquery-2.1.1.min.js"></script>
<!-- ONOS UI Framework included here -->
<script src="onos.js"></script>
......
......@@ -36,7 +36,7 @@
mast.append('img')
.attr({
id: 'logo',
src: 'img/onos-logo.png'
src: 'onos-logo.png'
});
mast.append('span')
......
......@@ -34,11 +34,11 @@
options: {
showBackground: true
},
webSockUrl: 'ws/topology',
webSockUrl: '../ws/topology',
data: {
live: {
jsonUrl: 'rs/topology/graph',
detailPrefix: 'rs/topology/graph/',
jsonUrl: '../rs/topology/graph',
detailPrefix: '../rs/topology/graph/',
detailSuffix: ''
},
fake: {
......@@ -3029,7 +3029,7 @@
stopAntTimer();
}
var geoJsonUrl = 'data/map/continental_us.json',
var geoJsonUrl = 'continental_us.json',
geoJson;
function loadGeoJsonData() {
......