beef-slides 1.1.8 → 1.1.9
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/app/models/slide.rb +0 -7
- data/app/views/admin/slides/show.html.erb +4 -8
- data/beef-slides.gemspec +2 -2
- metadata +2 -2
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.1.
|
1
|
+
1.1.9
|
data/app/models/slide.rb
CHANGED
@@ -14,8 +14,6 @@ class Slide < ActiveRecord::Base
|
|
14
14
|
|
15
15
|
default_scope :order => 'position ASC'
|
16
16
|
|
17
|
-
before_save :correct_url
|
18
|
-
|
19
17
|
def to_json(options = {})
|
20
18
|
options.reverse_merge! :methods => :public_filename, :only => [:title, :strapline, :link, :date]
|
21
19
|
super options
|
@@ -25,9 +23,4 @@ private
|
|
25
23
|
def has_file?
|
26
24
|
filename != 'no_file'
|
27
25
|
end
|
28
|
-
|
29
|
-
|
30
|
-
def correct_url
|
31
|
-
write_attribute :link, self.link.gsub(/^http\:\/\//i,'') unless self.link.nil?
|
32
|
-
end
|
33
26
|
end
|
@@ -13,26 +13,22 @@
|
|
13
13
|
<%= f.text_field :strapline %>
|
14
14
|
</p>
|
15
15
|
<p>
|
16
|
-
<%= f.label :link %><br />
|
17
|
-
|
16
|
+
<%= f.label :link, "Link - add http:// to open in a new window" %><br />
|
17
|
+
<%= f.text_field :link %>
|
18
18
|
</p>
|
19
19
|
<p>
|
20
20
|
<%= f.label :uploaded_data, "Image" %><br />
|
21
21
|
<%= f.file_field :uploaded_data %>
|
22
22
|
</p>
|
23
|
-
<div class="module">
|
24
|
-
|
25
23
|
<%= publish_select(f) %>
|
26
|
-
|
27
24
|
<p class="submission">
|
28
25
|
<%= f.submit 'Publish', :name => 'slide[publish]' %>
|
29
26
|
<%= f.submit 'Save as draft', :name => 'slide[hide]' %>
|
30
27
|
or <%= link_to 'Cancel', admin_slide_show_slides_path(@slide.slide_show_id) %>
|
31
28
|
</p>
|
32
|
-
</div>
|
33
29
|
<% end %>
|
34
30
|
|
35
31
|
<% content_for :sub_content do %>
|
36
|
-
|
37
|
-
|
32
|
+
<h2>Current Image</h2>
|
33
|
+
<%= image_tag @slide.public_filename(), :width => '100%' %>
|
38
34
|
<% end unless @slide.new_record? or @slide.filename == 'no_file' %>
|
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.9"
|
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-01-
|
12
|
+
s.date = %q{2010-01-12}
|
13
13
|
s.email = %q{daniel@wearebeef.co.uk}
|
14
14
|
s.extra_rdoc_files = [
|
15
15
|
"LICENSE",
|
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.9
|
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-01-
|
12
|
+
date: 2010-01-12 00:00:00 +00:00
|
13
13
|
default_executable:
|
14
14
|
dependencies: []
|
15
15
|
|