diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/public_bundle.js | 2 | ||||
| -rw-r--r-- | app/views/content/_headline_image.html.erb | 14 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 5 |
3 files changed, 9 insertions, 12 deletions
diff --git a/app/assets/javascripts/public_bundle.js b/app/assets/javascripts/public_bundle.js deleted file mode 100644 index b66b4a3..0000000 --- a/app/assets/javascripts/public_bundle.js +++ /dev/null | |||
| @@ -1,2 +0,0 @@ | |||
| 1 | //= require jquery | ||
| 2 | //= require_self | ||
diff --git a/app/views/content/_headline_image.html.erb b/app/views/content/_headline_image.html.erb index 71a4cb3..243be40 100644 --- a/app/views/content/_headline_image.html.erb +++ b/app/views/content/_headline_image.html.erb | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | <%= link_to_path( | 1 | <%= link_to( |
| 2 | image_tag(@images[0].upload.url(:headline)), | 2 | image_tag(@images[0].upload.url(:headline)), |
| 3 | ("galleries/" + @page.node.unique_name) | 3 | @images[0].upload.url, |
| 4 | :class => "glightbox", | ||
| 5 | :data => { :gallery => "page-#{@page.node.id}" } | ||
| 4 | ) %> | 6 | ) %> |
| 5 | 7 | ||
| 6 | <% if 1 < @images.length %> | 8 | <% if 1 < @images.length %> |
| @@ -9,8 +11,6 @@ | |||
| 9 | </div> | 11 | </div> |
| 10 | <% end %> | 12 | <% end %> |
| 11 | 13 | ||
| 12 | <div class="shadowbox_images" style="display: none"> | 14 | <% @images[1..-1].each do |image| %> |
| 13 | <% @images.each do |image| %> | 15 | <%= link_to "", image.upload.url, :class => "glightbox", :style => "display: none", :data => { :gallery => "page-#{@page.node.id}" } %> |
| 14 | <%= link_to "hallo", image.upload.url, :class => "shadowbox_image" %> | 16 | <% end %> |
| 15 | <% end %> | ||
| 16 | </div> \ No newline at end of file | ||
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5edb614..edab5fc 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb | |||
| @@ -11,9 +11,8 @@ | |||
| 11 | 11 | ||
| 12 | <title><%= page_title %></title> | 12 | <title><%= page_title %></title> |
| 13 | <link rel="stylesheet" href="/stylesheets/ccc.css"> | 13 | <link rel="stylesheet" href="/stylesheets/ccc.css"> |
| 14 | <%= javascript_include_tag 'public_bundle' %> | 14 | <link rel="stylesheet" href="/stylesheets/glightbox.min.css"> |
| 15 | <script src="/javascripts/shadowbox/shadowbox.js"></script> | 15 | <script src="/javascripts/glightbox.min.js"></script> |
| 16 | <link rel="stylesheet" href="/stylesheets/shadowbox.css"> | ||
| 17 | <script src="/javascripts/public.js"></script> | 16 | <script src="/javascripts/public.js"></script> |
| 18 | 17 | ||
| 19 | <%= auto_discovery_link_tag(:atom, '/rss/updates.xml', title: "ATOM") %> | 18 | <%= auto_discovery_link_tag(:atom, '/rss/updates.xml', title: "ATOM") %> |
