[Kimchi-devel] [PATCH 1/2] [Wok] Removed duplicate id reference for Live Migration

sguimaraes943 at gmail.com sguimaraes943 at gmail.com
Thu Dec 3 20:30:32 UTC 2015


From: samhenri <samuel.guimaraes at eldorado.org.br>

Signed-off-by: samhenri <samuel.guimaraes at eldorado.org.br>
---
 ui/js/src/wok.user.js     | 4 ++--
 ui/pages/login.html.tmpl  | 6 ------
 ui/pages/wok-ui.html.tmpl | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/ui/js/src/wok.user.js b/ui/js/src/wok.user.js
index 822ff78..2734f1e 100644
--- a/ui/js/src/wok.user.js
+++ b/ui/js/src/wok.user.js
@@ -30,11 +30,11 @@ wok.user = (function() {
         if (toShow) {
             var userName = getUserName();
             userName && $('#user-name').text(userName);
-            $('#user').removeClass('not-logged-in');
+            $('#user-login').removeClass('not-logged-in');
             return;
         }
 
-        $('#user').addClass('not-logged-in');
+        $('#user-login').addClass('not-logged-in');
     };
 
     return {
diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl
index 92eb3d5..434301e 100644
--- a/ui/pages/login.html.tmpl
+++ b/ui/pages/login.html.tmpl
@@ -80,16 +80,10 @@
         <nav class="navbar navbar-default">
             <div class="container">
                 <div class="navbar-header">
-                    <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#nav-menu" aria-expanded="false">
-                        <span class="sr-only">Toggle navigation</span>
-                        <span class="icon-bar"><!-- Hamburguer button here --></span>
-                    </button>
                 </div>
-                <div class="collapse navbar-collapse" id="nav-menu">
                     <ul class="nav navbar-nav">
                         <li class="hostname"><span class="host-location"></span></li>
                     </ul>
-                </div>
             </div>
         </nav>
     </div>
diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl
index 395c661..cd98239 100644
--- a/ui/pages/wok-ui.html.tmpl
+++ b/ui/pages/wok-ui.html.tmpl
@@ -107,7 +107,7 @@
                        <li id="no-peers" class="hide-content">$_("No peers found.")</li>
                    </ul>
                 </li>
-                <li class="dropdown" id="user">
+                <li class="dropdown" id="user-login">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
                         <i class="fa fa-user" id="user-icon"></i><span class="topbar-text empty-when-logged-off" id="user-name"></span><span class="caret"></span>
                     </a>
-- 
1.9.3




More information about the Kimchi-devel mailing list