Promoting new GUI resources into place; still hidden behind legacy redirect though.
Change-Id: If1f25cd7297b93374f492474eb321da16e9995ec
diff --git a/web/gui/src/main/webapp/app/fw/mast/mast.html b/web/gui/src/main/webapp/app/fw/mast/mast.html
index 59c99a3..216b01c 100644
--- a/web/gui/src/main/webapp/app/fw/mast/mast.html
+++ b/web/gui/src/main/webapp/app/fw/mast/mast.html
@@ -1,4 +1,4 @@
<!-- Masthead partial HTML -->
-<img class="logo" src="../data/img/onos-logo.png" ng-click="mastCtrl.toggleNav()">
+<img class="logo" src="data/img/onos-logo.png" ng-click="mastCtrl.toggleNav()">
<span class="title">Open Network Operating System</span>
<div id="mast-right"></div>
diff --git a/web/gui/src/main/webapp/app/fw/nav/nav.html b/web/gui/src/main/webapp/app/fw/nav/nav.html
deleted file mode 100644
index 1f74ab1..0000000
--- a/web/gui/src/main/webapp/app/fw/nav/nav.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Navigation partial HTML -->
-<h2>Navigation</h2>
-<h3>(Note - this is temporary)</h3>
-
-<ul>
- <li> <a ng-click="navCtrl.hideNav()" href="#/sample">Sample View</a></li>
- <li> <a ng-click="navCtrl.hideNav()" href="#/topo">Topology View</a></li>
- <li> <a ng-click="navCtrl.hideNav()" href="#/device">Device View</a></li>
-</ul>
diff --git a/web/gui/src/main/webapp/app/fw/svg/geodata.js b/web/gui/src/main/webapp/app/fw/svg/geodata.js
index 63fa4ce..bc6b296 100644
--- a/web/gui/src/main/webapp/app/fw/svg/geodata.js
+++ b/web/gui/src/main/webapp/app/fw/svg/geodata.js
@@ -59,7 +59,7 @@
// internal state
var cache = d3.map(),
- bundledUrlPrefix = '../data/map/';
+ bundledUrlPrefix = 'data/map/';
function getUrl(id) {
if (id[0] === '*') {