newsletter 3.2.0 → 3.2.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/helpers/newsletter/newsletters_helper.rb +4 -1
- data/app/models/newsletter/design.rb +2 -0
- data/app/views/layouts/newsletter/application.html.erb +1 -1
- data/designs/exports/example-export.yaml +2 -4
- data/lib/newsletter/version.rb +1 -1
- data/spec/test_app/spec/helpers/newsletter/newsletters_helper_spec.rb +2 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 34d92eca9bea6c0add79daa334bd161770f54466
|
4
|
+
data.tar.gz: 7201f1ee597aa433b656635afc2f55c1b59b52ca
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c5ac9e0c4b9b806ee7863f4c8927b2dd7499ebcb63e42b1a291211c5993d47310f41ef6bdccb5c06a6d7fef8ede1d4aaa3f88064efd864f23013940e3f65f2e4
|
7
|
+
data.tar.gz: 317f06ca5d0bc1758b4ea05558bd5947e222c99c608bbf0fda42829e210d44476dcd5bdaae49a8e388f88c680f320a8c1f17a37e3b46c81e303b833108ce6370
|
@@ -16,7 +16,10 @@ module Newsletter
|
|
16
16
|
options.each_pair do |key,value|
|
17
17
|
options_text << %Q| #{key}="#{ERB::Util.html_escape value}"|
|
18
18
|
end
|
19
|
-
%Q|<img src="#{ERB::Util.html_escape
|
19
|
+
%Q|<img src="#{ERB::Util.html_escape ::Newsletter.site_url +
|
20
|
+
::Newsletter.site_path +
|
21
|
+
@newsletter.image_uri(image_filename).gsub(%r#^/#,'')
|
22
|
+
}"#{options_text}/>|.html_safe
|
20
23
|
end
|
21
24
|
|
22
25
|
protected
|
@@ -70,11 +70,13 @@ module ::Newsletter
|
|
70
70
|
|
71
71
|
# returns path to newsletter design for use in views and is the same for actual file
|
72
72
|
def view_path(this_name=nil)
|
73
|
+
this_name ||= name
|
73
74
|
File.join(base_design_path(this_name),'layout.html.erb')
|
74
75
|
end
|
75
76
|
|
76
77
|
# returns the path to the base of the design's files
|
77
78
|
def base_design_path(this_name=nil)
|
79
|
+
this_name ||= name
|
78
80
|
File.join(::Newsletter.designs_path,'designs',name_as_path(this_name))
|
79
81
|
end
|
80
82
|
|
@@ -13,7 +13,7 @@
|
|
13
13
|
<div style="background-color: #fff;">
|
14
14
|
<div id="menu">
|
15
15
|
<ul>
|
16
|
-
<li><span onClick="$('#setup_submenu').toggle();return false">Setup</span>
|
16
|
+
<li><span onClick="$('#setup_submenu').toggle();return false" style="cursor: pointer;">Setup</span>
|
17
17
|
<ul id='setup_submenu' <%= ' style="display:none"'.html_safe unless request.path =~ %r#/newsletter/designs|setup# %>>
|
18
18
|
<%= content_tag(:li, link_to('Newsletter Designs', news.designs_path)) if can?(:manage, Newsletter::Design) %>
|
19
19
|
</ul>
|
@@ -10,10 +10,8 @@
|
|
10
10
|
padding: 0; line-height:1.2em;}\r\na{text-decoration:none; color: #0068b3;}\r\na:hover
|
11
11
|
{color: #7fc348;}\r\n.footer {font-size:7pt;}\r\np a {font-size: 6pt; font-weight:
|
12
12
|
bold;}\r\np.right a {font-size: 7pt;}\r\nhr{color: #7fc348; margin:5px 0; height:
|
13
|
-
1px; padding: 0;}\r\n.bullet {color: #7fc348; font-weight: bold; height: 5px;}\r\
|
14
|
-
|
15
|
-
repeat-x ; margin:0; padding: 15px; text-align:center; font-style: italic; font-size:\r\n7pt;}\r\np.pullquote
|
16
|
-
a { color: #333333;}\r\np.pullquote a:hover {color: #0068b3;}\r\n .wrappertable
|
13
|
+
1px; padding: 0;}\r\n.bullet {color: #7fc348; font-weight: bold; height: 5px;}\r\n
|
14
|
+
.wrappertable
|
17
15
|
{\r\n\twidth: 587px;\r\n\tmargin: 0 8px;\r\n }\r\n .leftcoltable {\r\n\twidth:
|
18
16
|
227px;\r\n } \r\n .rightcoltable {\r\n\twidth: 347px;\r\n }\r\n .left_col_img
|
19
17
|
{\r\n\twidth: 220px;\r\n }\r\n .right_col_img {\r\n\twidth: 320px;\r\n }\r\n
|
data/lib/newsletter/version.rb
CHANGED
@@ -58,7 +58,8 @@ RSpec.describe Newsletter::NewslettersHelper, :type => :helper do
|
|
58
58
|
design = import_design
|
59
59
|
@newsletter = FactoryGirl.create(:newsletter, design: design)
|
60
60
|
expect(design_image('newsletter_header.png',width: '100',class: 'neat_image')).to \
|
61
|
-
eq(%Q|<img src="
|
61
|
+
eq(%Q|<img src="#{Newsletter.site_url}#{Newsletter.site_path}images/#{
|
62
|
+
design.name_as_path(design.name)
|
62
63
|
}/newsletter_header.png" width="100" class="neat_image"/>|)
|
63
64
|
end
|
64
65
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: newsletter
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.2.
|
4
|
+
version: 3.2.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Lone Star Internet
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-04-
|
11
|
+
date: 2015-04-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|