diff options
| author | hukl <contact@smyck.org> | 2009-09-12 13:09:10 +0200 |
|---|---|---|
| committer | hukl <contact@smyck.org> | 2009-09-12 13:09:10 +0200 |
| commit | fe551453149f302eabd3e484d7ef69413c596656 (patch) | |
| tree | ee4ebc1402b377fed737869a7a658e80edc5416c /app | |
| parent | e92172d3fd63241b6e96bfefb2e1b8ebc3474138 (diff) | |
Moved galery template and changed width of headline image thumbnail preset
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/content_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/asset.rb | 2 | ||||
| -rw-r--r-- | app/views/content/gallery.html.erb (renamed from app/views/custom/page_templates/public/gallery.html.erb) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb index 250e6ba..13d06e9 100644 --- a/app/controllers/content_controller.rb +++ b/app/controllers/content_controller.rb | |||
| @@ -29,7 +29,7 @@ class ContentController < ApplicationController | |||
| 29 | 29 | ||
| 30 | def render_gallery | 30 | def render_gallery |
| 31 | @images = @page.assets.images | 31 | @images = @page.assets.images |
| 32 | render :file => "custom/page_templates/public/gallery" | 32 | render :file => "content/gallery" |
| 33 | end | 33 | end |
| 34 | 34 | ||
| 35 | private | 35 | private |
diff --git a/app/models/asset.rb b/app/models/asset.rb index fda2dc0..41823e7 100644 --- a/app/models/asset.rb +++ b/app/models/asset.rb | |||
| @@ -7,7 +7,7 @@ class Asset < ActiveRecord::Base | |||
| 7 | :styles => { | 7 | :styles => { |
| 8 | :medium => "300x300", | 8 | :medium => "300x300", |
| 9 | :thumb => "100x100", | 9 | :thumb => "100x100", |
| 10 | :headline => "530x250#" | 10 | :headline => "460x250#" |
| 11 | } | 11 | } |
| 12 | ) | 12 | ) |
| 13 | 13 | ||
diff --git a/app/views/custom/page_templates/public/gallery.html.erb b/app/views/content/gallery.html.erb index 7511db3..7511db3 100644 --- a/app/views/custom/page_templates/public/gallery.html.erb +++ b/app/views/content/gallery.html.erb | |||