Skip to content
Browse files

Rearrange menu items. Add caption to media_uploads.

  • Loading branch information...
1 parent ee25de7 commit deaad9120d293727fca7a0f80bc532c68d2a90bb @rywall rywall committed
Showing with 2 additions and 2 deletions.
  1. +1 −1 app/helpers/html_helper.rb
  2. +1 −1 app/views/layouts/_site_header.html.erb
View
2 app/helpers/html_helper.rb
@@ -58,7 +58,7 @@ def mfm(text, html_options = {})
elsif media_upload.image? || media_upload.audio? || media_upload.video?
has_images = true
content_tag :span, :class => 'inset' do
- link_to(image_tag(media_upload.asset_url(:thumb)), media_upload_player_url(media_upload), :class => "asset lightbox", :rel => "lightbox") + content_tag(:span, $2, :class => 'caption')
+ link_to(image_tag(media_upload.asset_url(:thumb)), media_upload_player_url(media_upload), :class => "asset lightbox", :rel => "lightbox", :title => media_upload.caption) + content_tag(:span, $2, :class => 'caption')
end
else
link_to $2 || media_upload.asset_name, media_upload_player_url(media_upload)
View
2 app/views/layouts/_site_header.html.erb
@@ -9,10 +9,10 @@
<ul class='group'>
<%= content_tag :li, link_to('Home', root_path), :class => ('selected' if website_section == :home) %>
<%= content_tag :li, link_to('The MacFarlane Collection', collection_intro_path), :class => ('selected' if website_section == :collection) %>
- <%= content_tag :li, link_to('Media Galleries', media_intro_path), :class => ('selected' if website_section == :media) %>
<%= content_tag :li, link_to('People and Places', people_and_places_path), :class => ('selected' if website_section == :people_and_places) %>
<%= content_tag :li, link_to('Conversations', conversations_path), :class => ('selected' if website_section == :conversations) %>
<%= content_tag :li, link_to('Learn', learn_path), :class => ('selected' if website_section == :learn) %>
+ <%= content_tag :li, link_to('Media Galleries', media_intro_path), :class => ('selected' if website_section == :media) %>
<%= content_tag :li, link_to('About', about_path), :class => ('selected' if website_section == :about) %>
</ul>
</div>

0 comments on commit deaad91

Please sign in to comment.
Something went wrong with that request. Please try again.