diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/application.css | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/gallery_links.scss | 24 | ||||
| -rw-r--r-- | app/helpers/sidebar_helper.rb | 5 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 12 |
4 files changed, 34 insertions, 8 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 1f93b7e..fbd78ca 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -15,4 +15,5 @@ *= require hmno_main *= require hmno_page *= require hmno_sidebars + *= require gallery_links */ diff --git a/app/assets/stylesheets/gallery_links.scss b/app/assets/stylesheets/gallery_links.scss new file mode 100644 index 0000000..302fd3e --- /dev/null +++ b/app/assets/stylesheets/gallery_links.scss @@ -0,0 +1,24 @@ +.gallery_link { + display: inline-block; + width: 225px; + vertical-align: top; + margin: { + bottom: 8mm; + right: 10mm; + } + + header { + h1 { + font-size: 100%; + margin-bottom: 0; + } + + margin-bottom: 2mm; + } + img { + margin: 0; + } + .gallery_link_meta { + font-size: 80%; + } +} diff --git a/app/helpers/sidebar_helper.rb b/app/helpers/sidebar_helper.rb index e8e076a..ad9c6de 100644 --- a/app/helpers/sidebar_helper.rb +++ b/app/helpers/sidebar_helper.rb @@ -14,7 +14,8 @@ module SidebarHelper end def page_has_side_body?(page) - part = page.part_with_title("Side Body") - return part.present? && !part.body.empty? + #part = page.part_with_title("Side Body") + #return part.present? && !part.try(:body).try(:empty?) + false end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6a92b7f..547013d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,13 +1,13 @@ <!DOCTYPE html> <%= render '/refinery/html_tag' %> - <% site_bar = render('/refinery/site_bar', :head => true) -%> - <%= render '/refinery/head' %> + <% site_bar = render('refinery/site_bar', :head => true) -%> + <%= render 'refinery/head' %> <body> <%= site_bar -%> - <%= render '/refinery/ie6check' if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%> + <%= render 'refinery/ie6check' if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%> <div id="page_container"> <header id="header"> - <%= render '/refinery/header' -%> + <%= render 'refinery/header' -%> </header> <section id="page"> <%= render 'common/left_sidebar' %> @@ -16,10 +16,10 @@ <%= render 'common/right_sidebar' %> </section> <footer> - <%= render '/refinery/footer' -%> + <%= render 'refinery/footer' -%> </footer> </div> - <%= render '/refinery/javascripts' %> + <%= render 'refinery/javascripts' %> <%= piwik_tracking_tag %> </body> </html> |