incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject svn commit: r1444931 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/router.js ambari-web/app/styles/application.less ambari-web/app/templates/application.hbs
Date Mon, 11 Feb 2013 19:28:55 GMT
Author: jaimin
Date: Mon Feb 11 19:28:55 2013
New Revision: 1444931

URL: http://svn.apache.org/r1444931
Log:
AMBARI-1373. Since there is the ability to log in to Ambari Web as different users the current
user should be indicated. (jaimin)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/router.js
    incubator/ambari/trunk/ambari-web/app/styles/application.less
    incubator/ambari/trunk/ambari-web/app/templates/application.hbs

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1444931&r1=1444930&r2=1444931&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Feb 11 19:28:55 2013
@@ -40,6 +40,9 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-1373. Since there is the ability to log in to Ambari Web as 
+ different users the current user should be indicated. (jaimin)
+
  AMBARI-1366. Nagios alert tweaks. (jaimin)
 
  AMBARI-1365. Make Hosts table update dynamically. (jaimin)

Modified: incubator/ambari/trunk/ambari-web/app/router.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/router.js?rev=1444931&r1=1444930&r2=1444931&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/router.js (original)
+++ incubator/ambari/trunk/ambari-web/app/router.js Mon Feb 11 19:28:55 2013
@@ -79,6 +79,10 @@ App.Router = Em.Router.extend({
 
   loggedIn: false,
 
+  loginName: function() {
+    return this.getLoginName();
+  }.property('loggedIn'),
+
   getAuthenticated: function () {
     var auth = App.db.getAuthenticated();
     var authResp = (auth && auth === true);

Modified: incubator/ambari/trunk/ambari-web/app/styles/application.less
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/styles/application.less?rev=1444931&r1=1444930&r2=1444931&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/styles/application.less (original)
+++ incubator/ambari/trunk/ambari-web/app/styles/application.less Mon Feb 11 19:28:55 2013
@@ -96,7 +96,7 @@ footer {
   }
 
   .navbar-inner{
-    min-height: 30px;
+    min-height: 40px;
   }
 
   .navbar .nav .active > a, .navbar .nav .active > a:hover {

Modified: incubator/ambari/trunk/ambari-web/app/templates/application.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/application.hbs?rev=1444931&r1=1444930&r2=1444931&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/application.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/application.hbs Mon Feb 11 19:28:55 2013
@@ -37,13 +37,16 @@
               </a>
           {{/if}}
 
-          <ul class="nav">
-            <!-- <li class="right"><a class="help" {{!translateAttr href="topnav.help.href"}}
target="_blank">Help</a></li> -->
-            {{#if App.router.loggedIn}}
-            <li class="right"><a class="help" href="" {{action logoff}}>{{t app.sighout}}</a></li>
-            {{/if}}
-            <li class="right">{{loginName}}</li>
-          </ul>
+          {{#if App.router.loggedIn}}
+            <div class="btn-group pull-right usermenu-wrapper">
+              <button class="btn btn-group dropdown-toggle"  data-toggle="dropdown">
+                {{App.router.loginName}}&nbsp;<span class="caret"></span>
+              </button>
+              <ul class="dropdown-menu">
+                <li><a href="" {{action logoff}}>{{t app.sighout}}</a></li>
+              </ul>
+            </div>
+          {{/if}}
         </div>
       </div>
     </div>



Mime
View raw message