Please review pull request #91: Add account information option to header opened by (lifton)
Description:
Previous to this commit, Dashboard did not have any way to display
user account information. With this commit, an account_widgets
callback is added to the global navigation header.
- Opened: Tue Mar 13 01:04:36 UTC 2012
- Based on: puppetlabs:master (ed6c231d41b188d6b90442b3291e8d31237b9eb7)
- Requested merge: lifton:master (cd417f16317b47958e9ce8e2e504a358200b2433)
Diff follows:
diff --git a/app/views/shared/_global_nav.html.haml b/app/views/shared/_global_nav.html.haml
index 4be7116..b9dbd98 100644
--- a/app/views/shared/_global_nav.html.haml
+++ b/app/views/shared/_global_nav.html.haml
@@ -1,13 +1,16 @@
.topbar
.topbar-inner
.container
- %ul#global-navigation.navigation
+ %ul#logo-and-account.navigation
%li#logo
- css = ["background-repeat: no-repeat", "text-indent: -9000px"]
- css << "background-image: url('#{SETTINGS.custom_logo_url}')"
- css << "height: #{SETTINGS.custom_logo_height}"
- css << "width: #{SETTINGS.custom_logo_width}"
%a{:href ="" root_path, :title => SETTINGS.custom_logo_alt_text, :style => css.join('; ')} Puppet Dashboard
+ - Registry.each_callback :core, :account_widgets do |callback|
+ = callback.call self
+ %ul#global-navigation.navigation
%li#dashboard-version{:class => active_if(request.url == release_notes_url)}
= link_to h(APP_VERSION), APP_VERSION_LINK
%li#navigation-home{:class => active_if(request.url == root_url)}
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
