beef-slides 1.1.10 → 1.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/app/controllers/slides_controller.rb +8 -1
- data/app/views/admin/slides/index.html.erb +1 -1
- data/beef-slides.gemspec +4 -4
- metadata +3 -3
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.1.
|
|
1
|
+
1.1.11
|
|
@@ -1,8 +1,15 @@
|
|
|
1
1
|
class SlidesController < ApplicationController
|
|
2
2
|
|
|
3
3
|
def index
|
|
4
|
+
if params[:slide_show_id].blank?
|
|
5
|
+
@slides = Slide.published
|
|
6
|
+
else
|
|
7
|
+
@slideshow = SlideShow.find_by_permalink(params[:slide_show_id])
|
|
8
|
+
@slides = @slideshow.slides.published
|
|
9
|
+
end
|
|
10
|
+
|
|
4
11
|
respond_to do |format|
|
|
5
|
-
format.json { render :json =>
|
|
12
|
+
format.json { render :json => @slides }
|
|
6
13
|
end
|
|
7
14
|
end
|
|
8
15
|
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
<% @slides.each do |slide| %>
|
|
24
24
|
<tr>
|
|
25
25
|
<td><%= slide.position %></td>
|
|
26
|
-
<td><%= image_tag slide.public_filename, :width => 100 unless slide.filename == 'no_file' %></td>
|
|
26
|
+
<td><%= image_tag slide.public_filename(:slide), :width => 100 unless slide.filename == 'no_file' %></td>
|
|
27
27
|
<td><%=h slide.title %></td>
|
|
28
28
|
<td><%= content_status(slide) %></td>
|
|
29
29
|
<td><%=h slide.created_at.to_formatted_s(:short) %></td>
|
data/beef-slides.gemspec
CHANGED
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{beef-slides}
|
|
8
|
-
s.version = "1.1.
|
|
8
|
+
s.version = "1.1.11"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Daniel Craig"]
|
|
12
|
-
s.date = %q{2010-
|
|
12
|
+
s.date = %q{2010-02-24}
|
|
13
13
|
s.email = %q{daniel@wearebeef.co.uk}
|
|
14
14
|
s.extra_rdoc_files = [
|
|
15
15
|
"LICENSE",
|
|
@@ -49,8 +49,8 @@ Gem::Specification.new do |s|
|
|
|
49
49
|
s.rubygems_version = %q{1.3.5}
|
|
50
50
|
s.summary = %q{Slide show generation}
|
|
51
51
|
s.test_files = [
|
|
52
|
-
"test/
|
|
53
|
-
"test/
|
|
52
|
+
"test/slides_test.rb",
|
|
53
|
+
"test/slide_show_test.rb",
|
|
54
54
|
"test/test_helper.rb"
|
|
55
55
|
]
|
|
56
56
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: beef-slides
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
4
|
+
version: 1.1.11
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Daniel Craig
|
|
@@ -9,7 +9,7 @@ autorequire:
|
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
11
|
|
|
12
|
-
date: 2010-
|
|
12
|
+
date: 2010-02-24 00:00:00 +00:00
|
|
13
13
|
default_executable:
|
|
14
14
|
dependencies: []
|
|
15
15
|
|
|
@@ -78,6 +78,6 @@ signing_key:
|
|
|
78
78
|
specification_version: 3
|
|
79
79
|
summary: Slide show generation
|
|
80
80
|
test_files:
|
|
81
|
-
- test/slide_show_test.rb
|
|
82
81
|
- test/slides_test.rb
|
|
82
|
+
- test/slide_show_test.rb
|
|
83
83
|
- test/test_helper.rb
|