diff options
| -rw-r--r-- | app/views/content/_headline_image.html.erb | 6 | ||||
| -rw-r--r-- | app/views/nodes/show.html.erb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/content/_headline_image.html.erb b/app/views/content/_headline_image.html.erb index e7b821b..13a4ac7 100644 --- a/app/views/content/_headline_image.html.erb +++ b/app/views/content/_headline_image.html.erb | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | :class => "glightbox", | 7 | :class => "glightbox", |
| 8 | :data => { :gallery => "page-#{@page.node.id}", | 8 | :data => { :gallery => "page-#{@page.node.id}", |
| 9 | :glightbox => glightbox_data(@headline_asset, @headline_asset.name), | 9 | :glightbox => glightbox_data(@headline_asset, @headline_asset.name), |
| 10 | :"credit-selector" => (@headline_asset.has_credit? ? "#credit_for_asset_#{@headline_asset.id}" : nil) } | 10 | :"credit-selector" => (@headline_asset.show_credit? ? "#credit_for_asset_#{@headline_asset.id}" : nil) } |
| 11 | ) %> | 11 | ) %> |
| 12 | <% if gallery_images.size > 1 %> | 12 | <% if gallery_images.size > 1 %> |
| 13 | <div class="right"><%= "#{gallery_images.size} #{t(:images)}" %></div> | 13 | <div class="right"><%= "#{gallery_images.size} #{t(:images)}" %></div> |
| @@ -18,7 +18,7 @@ | |||
| 18 | :class => "glightbox right", | 18 | :class => "glightbox right", |
| 19 | :data => { :gallery => "page-#{@page.node.id}", | 19 | :data => { :gallery => "page-#{@page.node.id}", |
| 20 | :glightbox => glightbox_data(gallery_images.first, gallery_images.first.name), | 20 | :glightbox => glightbox_data(gallery_images.first, gallery_images.first.name), |
| 21 | :"credit-selector" => (gallery_images.first.has_credit? ? "#credit_for_asset_#{gallery_images.first.id}" : nil) } %> | 21 | :"credit-selector" => (gallery_images.first.show_credit? ? "#credit_for_asset_#{gallery_images.first.id}" : nil) } %> |
| 22 | <% end %> | 22 | <% end %> |
| 23 | 23 | ||
| 24 | <% gallery_images.each do |image| %> | 24 | <% gallery_images.each do |image| %> |
| @@ -27,5 +27,5 @@ | |||
| 27 | <%= link_to "", image.upload.url, :class => "glightbox", :style => "display: none", | 27 | <%= link_to "", image.upload.url, :class => "glightbox", :style => "display: none", |
| 28 | :data => { :gallery => "page-#{@page.node.id}", | 28 | :data => { :gallery => "page-#{@page.node.id}", |
| 29 | :glightbox => glightbox_data(image, image.name), | 29 | :glightbox => glightbox_data(image, image.name), |
| 30 | :"credit-selector" => (image.has_credit? ? "#credit_for_asset_#{image.id}" : nil) } %> | 30 | :"credit-selector" => (image.show_credit? ? "#credit_for_asset_#{image.id}" : nil) } %> |
| 31 | <% end %> | 31 | <% end %> |
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb index f2b4b15..adf79dd 100644 --- a/app/views/nodes/show.html.erb +++ b/app/views/nodes/show.html.erb | |||
| @@ -253,12 +253,12 @@ | |||
| 253 | <% end %> | 253 | <% end %> |
| 254 | </div> | 254 | </div> |
| 255 | 255 | ||
| 256 | <% if @page.assets.images.any? %> | 256 | <% if @page.assets.any? %> |
| 257 | <% headline_asset_id = @page.headline_asset&.id %> | 257 | <% headline_asset_id = @page.headline_asset&.id %> |
| 258 | <div class="node_description">Images</div> | 258 | <div class="node_description">Images</div> |
| 259 | <div class="node_content node_info_group"> | 259 | <div class="node_content node_info_group"> |
| 260 | <ul class="thumbnail_list"> | 260 | <ul class="thumbnail_list"> |
| 261 | <% @page.assets.images.each do |asset| %> | 261 | <% @page.assets.each do |asset| %> |
| 262 | <li class="<%= "is_headline" if asset.id == headline_asset_id %>"> | 262 | <li class="<%= "is_headline" if asset.id == headline_asset_id %>"> |
| 263 | <%= link_to image_tag(asset.upload.url(:thumb)), asset_path(asset) %> | 263 | <%= link_to image_tag(asset.upload.url(:thumb)), asset_path(asset) %> |
| 264 | <% if asset.id == headline_asset_id %> | 264 | <% if asset.id == headline_asset_id %> |
