>From c73bff8c4df54420c2f115ebdbe1c87e38d444ac Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Fri, 13 May 2011 11:17:01 +0200 Subject: [PATCH conductor 2/2] Layout fixes used *_tag helpers --- src/app/views/layouts/application.haml | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/app/views/layouts/application.haml b/src/app/views/layouts/application.haml index 99fa36e..659e866 100644 --- a/src/app/views/layouts/application.haml +++ b/src/app/views/layouts/application.haml @@ -3,19 +3,19 @@ %head %meta{:charset => 'utf-8'}/ %title Layout Example - %link{:rel => 'stylesheet', :type => 'text/css', :href => '/styles/reset.css'} - %link{:rel => 'stylesheet', :type => 'text/css', :href => '/styles/960.css'} - %link{:rel => 'stylesheet', :type => 'text/css', :href => '/styles/buttons.css'} - %link{:rel => 'stylesheet', :type => 'text/css', :href => '/layout.css'}/ + = stylesheet_link_tag '/stylesheets/reset.css' + = stylesheet_link_tag '/stylesheets/960.css' + = stylesheet_link_tag '/stylesheets/buttons.css' + = stylesheet_link_tag '/stylesheets/compiled/layout.css' /[if lt IE 9] - %script{:src => 'http://html5shiv.googlecode.com/svn/trunk/html5.js'} - %link{:rel => 'stylesheet', :type => 'text/css', :href => '/layout_ie.css'}/ + = stylesheet_link_tag 'http://html5shiv.googlecode.com/svn/trunk/html5.js' + = javascript_include_tag '/stylesheets/layout_ie.css' %body #primary-container %header#masthead .container - %img#logo{:src => '/images/upstream-logo.png'} + = image_tag('upstream-logo.png', :id => 'logo') %nav#system %ul %li.account @@ -37,12 +37,11 @@ %a{:href => '#'} Administer #content - -# works with any 960 container (.container_16 or .container_24) - Yield view here. + = yield %footer.standard .container - %img.logo{:src => '/images/footer-rhlogo.png'} + = image_tag('footer-rhlogo.png', :id => 'logo') %nav.footer %a{:href => '#'} Disclaimer %a{:href => '#'} Terms of Use -- 1.7.4