commit 766319d08692368f4c1b3b2130cead4a1c0ac27f
author Tao Shen <shentao@chinamobile.com> Sat Apr 29 03:39:34 2017 +0000
committer Gerrit Code Review <gerrit@open-o.org> Sat Apr 29 03:39:34 2017 +0000
tree 8bb8c9461b950cf13cf292b2393386e724a7c57f
parent 82b4ce0fb90bf5aa0e431d33236bb3dd73fcbc89
parent 7dae73cc54f435f4644a255eb3cb70c67109b852

Merge "vlinfo field parse wrong"

login/src/main/webapp/login/html/menu.html

diff --git a/login/src/main/webapp/login/html/menu.html b/login/src/main/webapp/login/html/menu.html
index 713bede..bd10fe1 100644
--- a/login/src/main/webapp/login/html/menu.html
+++ b/login/src/main/webapp/login/html/menu.html
@@ -279,9 +279,7 @@
                             </a>
                         </div>
                     </div>
-                    <div id="mainFrame_div">
-                        <iframe id="mainFrame" name="mainFrame" frameBorder="0" scrolling="no" width="100%" height="100%" onload="iFrameHeight()"></iframe>
-                    </div>
+                    <iframe id="mainFrame" name="mainFrame" frameBorder="0" scrolling="no" width="100%" height="100%" onload="iFrameHeight()"></iframe>
                 </div>
             </div>
         </div>

login/src/main/webapp/login/js/menuApp.js

diff --git a/login/src/main/webapp/login/js/menuApp.js b/login/src/main/webapp/login/js/menuApp.js
index 3696eb1..8a82de1 100644
--- a/login/src/main/webapp/login/js/menuApp.js
+++ b/login/src/main/webapp/login/js/menuApp.js
@@ -65,15 +65,15 @@
 
 function displayIframe() {
     var dashboard_div = document.getElementById("dashboard_div");
-    var mainFrame_div = document.getElementById("mainFrame_div");
+    var mainFrame = document.getElementById("mainFrame");
     dashboard_div.style.display = "none";
-    mainFrame_div.style.display = "";
+    mainFrame.style.display = "";
 }
 
 function displayDashboard() {
     var dashboard_div = document.getElementById("dashboard_div");
-    var mainFrame_div = document.getElementById("mainFrame_div");
-    mainFrame_div.style.display = "none";
+    var mainFrame = document.getElementById("mainFrame");
+    mainFrame.style.display = "none";
     dashboard_div.style.display = "";
 }