On 09/22/2010 05:05 PM, Jacob Helwig wrote: > On Wed, 22 Sep 2010 16:50:24 -0700, Igal Koshevoy wrote: >> Date: Wed, 22 Sep 2010 16:50:24 -0700 >> From: Igal Koshevoy <[email protected]> >> To: [email protected] >> Subject: [Puppet-dev] [PATCH/puppet-dashboard 1/1] (#4825) Fix raw >> "favicon.ico" URL, which breaks if app is mounted in subpath. >> X-Mailer: git-send-email 1.7.2.3 >> Message-Id: <[email protected]> >> >> By default, the app runs without a subpath, so that the >> "/images/favicon.ico" path is correct. However, some users need to mount >> the app under a subpath so that, for example, this path becomes >> "/dashboard/images/favicon.ico". >> >> The solution is to use Rails routing-aware helpers to produce paths. >> >> Signed-off-by: Igal Koshevoy <[email protected]> >> --- >> >> Published to: >> http://github.com/igal/puppet-dashboard/commits/bug/v1.0.4rc1/4825-fix_raw_favicon_link >> >> app/views/layouts/application.html.haml | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/app/views/layouts/application.html.haml >> b/app/views/layouts/application.html.haml >> index 4022b58..42d903f 100644 >> --- a/app/views/layouts/application.html.haml >> +++ b/app/views/layouts/application.html.haml >> @@ -3,7 +3,7 @@ >> %head >> - page_title = yield(:page_title) >> %title= [ page_title, 'Puppet Node Manager'].compact.join(' - ') >> - %link{ :href => "/images/favicon.ico", :rel => "shortcut icon" } >> + %link{ :href => image_path("favicon.ico"), :rel => "shortcut icon" } >> %meta{ :content => "text/html; charset=UTF-8", "http-equiv" => >> "Content-Type" } >> >> = javascript_include_tag 'jquery.min' >> -- >> 1.7.2.3 >> >> -- >> 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. >> > +1
Jacob: Thanks, I've merged this into `next`. -igal -- 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.
