Greetings!
Please review the pull request #30: (#9571) exports global nav bar for use by other web apps (via /header.html) opened by (djsauble2)
Some more information about the pull request:
- Opened: Sat Sep 17 01:20:33 UTC 2011
- Based on: puppetlabs:master (881abbf160bcb0018c95b298389805b5061ebe32)
- Requested merge: djsauble2:9571_export_nav_bar (576028e8534eef33123080192e68b7df1da0cd99)
Description:
Thanks!
The Pull Request Bot
Diff follows:
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index aac3f6c..920d406 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -10,4 +10,10 @@ class PagesController < ApplicationController
@unchanged_nodes = @all_nodes.unchanged
end
+ def header
+ respond_to do |format|
+ format.html { render :partial => 'shared/global_nav' }
+ end
+ end
+
end
diff --git a/config/routes.rb b/config/routes.rb
index 2169501..934ae17 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -37,6 +37,8 @@ ActionController::Routing::Routes.draw do |map|
map.release_notes '/release_notes', :controller => :pages, :action ="" :release_notes
+ map.header '/header.:format', :controller => :pages, :action ="" :header
+
map.root :controller => :pages, :action ="" :home
map.connect ':controller/:action/:id'
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index e5a92ec..8aaaa5e 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -281,7 +281,8 @@ body {
margin-right: 5%;
float: left; }
body .section {
- margin-bottom: 1.5em; }
+ margin-bottom: 1.5em;
+ overflow: auto; }
body .section.error {
-webkit-border-radius: 0.35em 0.35em 0.35em 0.35em;
-moz-border-radius: 0.35em 0.35em 0.35em 0.35em;
diff --git a/public/stylesheets/sass/application.scss b/public/stylesheets/sass/application.scss
index 419af24..9fd611a 100644
--- a/public/stylesheets/sass/application.scss
+++ b/public/stylesheets/sass/application.scss
@@ -506,6 +506,7 @@ body {
.section {
margin-bottom: 1.5em;
+ overflow: auto;
&.error {
@include icony_section('failed',
-- 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.
