Please review pull request #92: Refactor how account widgets are added to the header opened by (lifton)
Description:
This commit refactors the changes made in commit cd417f1.
- Opened: Wed Mar 14 21:56:13 UTC 2012
- Based on: puppetlabs:master (7121c8230be84f1f8b5a7f62ddd3e6021649cbcf)
- Requested merge: lifton:master (44d8da0cb433c033d337e0e2c4a9715bcc86c498)
Diff follows:
diff --git a/app/views/shared/_global_nav.html.haml b/app/views/shared/_global_nav.html.haml
index b9dbd98..9dfdd10 100644
--- a/app/views/shared/_global_nav.html.haml
+++ b/app/views/shared/_global_nav.html.haml
@@ -1,16 +1,13 @@
.topbar
.topbar-inner
.container
- %ul#logo-and-account.navigation
+ %ul#global-navigation.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)}
@@ -31,3 +28,5 @@
= link_to "Inventory Search", search_nodes_path
- Registry.each_callback :core, :global_nav_widgets do |callback|
= callback.call self
+ - Registry.each_callback :core, :account_widgets do |callback|
+ = callback.call self
-- 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.
