Merge "UI: Allow admin to reset password for other users"

[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 863b0a64a04b6e2f32abfaf50bc78adf7965236b..4b0ce2d07d3d55a51c2ac873b642ce081c659728 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">
@@ -63,16 +67,15 @@
    </div>
    <div class="span3">
     <div id="toolbar" class="btn-group">
+    <input type="hidden" id="currentuser" value="${username}" data-role="${role}">
      <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
       <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>
@@ -160,6 +163,8 @@
   <div class="modal-header">
    <button type="button" class="close" data-dismiss="modal"
     aria-hidden="true">&times;</button>
+   <button type="button" class="help" aria-hidden="true"
+    >?</button>
    <h3></h3>
   </div>
   <div class="modal-body"></div>