Greetings!
Please review the pull request #27: 8825 allows configuration of logo dimensions and alt text opened by (djsauble2)
Some more information about the pull request:
- Opened: Wed Sep 14 17:14:52 UTC 2011
- Based on: puppetlabs:master (2d92f0f2e9440b082fbafe7e4696d39b3f7fd2da)
- Requested merge: djsauble2:8825_custom_logo_config (1f42a271b6e386714eabb7503120f4b8caf131f0)
Description:
Thanks!
The Pull Request Bot
Diff follows:
diff --git a/app/views/shared/_global_nav.html.haml b/app/views/shared/_global_nav.html.haml
index 2ceadb6..26f0913 100644
--- a/app/views/shared/_global_nav.html.haml
+++ b/app/views/shared/_global_nav.html.haml
@@ -1,8 +1,8 @@
%ul#global-navigation.navigation
%li
- if SETTINGS.custom_logo_url
- %a{:href ="" root_path, :id => "logo", :style => "background-image:none"}
- %img{:src ="" SETTINGS.custom_logo_url, :height => '23', :width => '155', :alt => "Puppet Dashboard" }
+ %a{:href ="" root_path, :id => "logo", :style => "background-image:none; height:auto; width:auto;"}
+ %img{:src ="" SETTINGS.custom_logo_url, :height => SETTINGS.custom_logo_height, :width => SETTINGS.custom_logo_width, :alt => SETTINGS.custom_logo_alt_text }
- else
%a{:href ="" root_path, :id => "logo", :style => "text-indent: -9000px;"} Puppet Dashboard
%li{:class => active_if(request.url == release_notes_url)}
diff --git a/config/settings.yml.example b/config/settings.yml.example
index e9ccba6..45152af 100644
--- a/config/settings.yml.example
+++ b/config/settings.yml.example
@@ -66,8 +66,11 @@ use_external_node_classification: true
datetime_format: '%Y-%m-%d %H:%M %Z'
date_format: '%A, %B %e, %Y'
-# Set this to the URL of an image. The image will be scaled to 155x23 pixels.
+# Set this to the URL of an image. The image will be scaled to the specified dimensions.
#custom_logo_url: 'http://www.puppetlabs.com/images/puppet-short.png'
+#custom_logo_width: 155
+#custom_logo_height: 23
+#custom_logo_alt_text: 'Puppet Dashboard'
# We will be deprecating using "http://dashboard_servername/reports" as the puppet master's reporturl.
# Set this to 'true' once you have changed all your puppet masters to send reports to
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/layout.css b/public/stylesheets/layout.css
index 90159df..87a4062 100644
--- a/public/stylesheets/layout.css
+++ b/public/stylesheets/layout.css
@@ -6,7 +6,7 @@
margin-bottom: 1em;
}
-#content #sidebar { width: 20%; float: left; }
+#content #sidebar { width: 20%; float: left; clear: left; }
body.with-sidebar #content #main { width: 80%; float: left; }
body.no-sidebar #content #main { width: 100%; }
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.
