Merge "Fix for exceptions seen in FlowProgrammer NB, when get/put is done for invalid...

[controller.git] / opendaylight / web / root / src / main / resources / WEB-INF / jsp / main.jsp

diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/main.jsp b/opendaylight/web/root/src/main/resources/WEB-INF/jsp/main.jsp
index a532560bcde4b3166cf42c7f7bc8e62fc83ef068..c795a5d56b920de6111141bea501a8b3dbcfaa57 100644 (file)
--- a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/main.jsp
+++ b/opendaylight/web/root/src/main/resources/WEB-INF/jsp/main.jsp
@@ -16,6 +16,8 @@
 
 <!-- Bootstrap CSS - 1 -->
 <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
+<link rel="stylesheet" type="text/css" href="/css/fuelux.min.css">
+<link rel="stylesheet" type="text/css" href="/css/opendaylight.css">
 
 <!-- Core CSS - 2 -->
 <link rel="stylesheet/less" type="text/css" href="/css/one.less">
@@ -38,7 +40,9 @@
 <script src="/js/jquery-1.9.1.min.js"></script>
 
 <!-- Bootstrap JS - 2 -->
-<script src="/js/bootstrap.min.js"></script>
+<script src="/js/underscore-min.js"></script>
+<script src="/js/fuelux/loader.min.js"></script>
+<script src="/js/datasource.js"></script>
 
 <!-- LESS - 3 -->
 <script type="text/javascript">
@@ -67,12 +71,10 @@
       <div class="icon-user"></div> ${username} <span class="caret"></span>
      </a>
      <ul class="dropdown-menu">
-      <li><a href="#admin" id="admin" data-role="${role}"><div
-         class="icon-users"></div> Users</a></li>
-      <li><a href="#save" id="save"><div class="icon-save"></div>
-        Save</a></li>
-      <li><a href="#logout" id="logout"><div
-         class="icon-logout"></div> Logout</a></li>
+      <li><a href="#admin" id="admin" data-role="${role}"><div class="icon-users"></div> Users</a></li>
+      <li><a href="#cluster" id="cluster"><div class="icon-cluster"></div>Cluster</a></li>
+      <li><a href="#save" id="save"><div class="icon-save"></div>Save</a></li>
+      <li><a href="#logout" id="logout"><div class="icon-logout"></div> Logout</a></li>
      </ul>
     </div>
    </div>