trusty-cms 3.0.7 → 3.0.8

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1089cf91a5d41f02d4a61d2b2b1223aa0eaaccc6
4
- data.tar.gz: db7fda3f9d50a978d7a1a69bd92f8d5202a0ef10
3
+ metadata.gz: d6ebe8fcd153e149f08eec67dbdcc44e23b50f30
4
+ data.tar.gz: dfaff5d25baef6ed75e7f0d1e9d17bd8072a426f
5
5
  SHA512:
6
- metadata.gz: c979253e71d3bb17ac8addb5f74ca8d0ee1b2071c80366858ef043b2535931cc91eb9939bb6085045b51880530d8765862345e9deeb162ebbdce7f4f608d164a
7
- data.tar.gz: 49cabbee0f1e608fdc4c11794439a7eda3ce3802da6ba07a2daefb335c87303dd7642aa2b71696f6f54a599006cf16965e4e7a9b46f1160ab27f24a6db055e08
6
+ metadata.gz: bfdf645ed79a45b6ee8a8ceaa57c9d6d01478939ee2a34c0402492749b5d09fc857092a679742a35856933f4efcb086cea020435f14084f4f48a8e669e036ea2
7
+ data.tar.gz: 6649e139dfa185309c435ffbc4378eaddae63c6a997ee9bb047b7ae5c743e91514b1d10efc867d2d1ae156e96abc150956c3dfa08aae4cc1552d5349d977b706
data/Gemfile.lock CHANGED
@@ -8,7 +8,7 @@ GIT
8
8
  PATH
9
9
  remote: .
10
10
  specs:
11
- trusty-cms (3.0.7)
11
+ trusty-cms (3.0.8)
12
12
  RedCloth (~> 4.3.2)
13
13
  acts_as_tree (~> 2.6.1)
14
14
  bundler (~> 1.7)
@@ -158,7 +158,7 @@ GEM
158
158
  json (2.1.0)
159
159
  launchy (2.4.3)
160
160
  addressable (~> 2.3)
161
- libv8 (3.16.14.19)
161
+ libv8 (3.16.14.19-x86_64-darwin-16)
162
162
  loofah (2.0.3)
163
163
  nokogiri (>= 1.5.9)
164
164
  mail (2.6.6)
@@ -277,7 +277,7 @@ GEM
277
277
  ref
278
278
  thor (0.19.4)
279
279
  thread_safe (0.3.6)
280
- tilt (2.0.7)
280
+ tilt (2.0.8)
281
281
  trustygems (0.2.1)
282
282
  rake
283
283
  tzinfo (1.2.3)
@@ -313,4 +313,4 @@ DEPENDENCIES
313
313
  trustygems (~> 0.2.0)
314
314
 
315
315
  BUNDLED WITH
316
- 1.15.2
316
+ 1.15.3
@@ -3,7 +3,7 @@ class SocialMailerController < ApplicationController
3
3
  no_login_required
4
4
 
5
5
  def create_social_mail
6
-
6
+
7
7
  mailer_options = {
8
8
  :to => params[:to],
9
9
  :from => params[:from],
@@ -0,0 +1,2 @@
1
+ class ApplicationMailer < ActionMailer::Base
2
+ end
@@ -1,4 +1,4 @@
1
- class PasswordMailer < ActionMailer::Base
1
+ class PasswordMailer < ApplicationMailer
2
2
 
3
3
  default :from => ENV['ORG_FROM_EMAIL'] ||= "admin@trustycms.com"
4
4
 
@@ -1,5 +1,4 @@
1
- require 'mail'
2
- class RadSocialMailer < ActionMailer::Base
1
+ class RadSocialMailer < ApplicationMailer
3
2
  include Roadie::Rails::Automatic
4
3
 
5
4
  def social_mail options
@@ -0,0 +1,8 @@
1
+ !!!
2
+ %html
3
+ %head
4
+ %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}/
5
+ :css
6
+ /* Email styles need to be inline */
7
+ %body
8
+ = yield
@@ -0,0 +1 @@
1
+ = yield
@@ -131,7 +131,6 @@ module TrustyCms
131
131
  #
132
132
  def initialize_views
133
133
  initialize_default_admin_tabs
134
- initialize_framework_views
135
134
  admin.load_default_regions
136
135
  end
137
136
 
@@ -141,20 +140,6 @@ module TrustyCms
141
140
  admin.initialize_nav
142
141
  end
143
142
 
144
- # This adds extension view paths to the standard Rails::Initializer method.
145
- # In environments that don't cache templates it reloads the path set on each request,
146
- # so that new extension paths are noticed without a restart.
147
- #
148
- def initialize_framework_views
149
- view_paths = extension_loader.paths(:view) #.push(TrustyCms::Application.config.view_path)
150
- if ActionController::Base.view_paths.count == 0 || !ActionView::Base.cache_template_loading
151
- ActionController::Base.view_paths = ActionView::PathSet.new(Array.wrap(view_paths))
152
- end
153
- if ActionMailer::Base.view_paths.count == 0 || !ActionView::Base.cache_template_loading
154
- ActionMailer::Base.view_paths = ActionView::PathSet.new(Array.wrap(view_paths))
155
- end
156
- end
157
-
158
143
  # Extends the Rails initializer to make sure that extension controller paths are available when routes
159
144
  # are initialized.
160
145
  #
data/lib/trusty_cms.rb CHANGED
@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
2
2
 
3
3
  unless defined? TrustyCms::VERSION
4
4
  module TrustyCms
5
- VERSION = "3.0.7"
5
+ VERSION = "3.0.8"
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.7
4
+ version: 3.0.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - TrustyCms CMS dev team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-07-21 00:00:00.000000000 Z
11
+ date: 2017-07-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: tzinfo
@@ -1288,7 +1288,9 @@ files:
1288
1288
  - app/helpers/application_helper.rb
1289
1289
  - app/helpers/rad_social_helper.rb
1290
1290
  - app/helpers/site_helper.rb
1291
+ - app/mailers/application_mailer.rb
1291
1292
  - app/mailers/password_mailer.rb
1293
+ - app/mailers/rad_social_mailer.rb
1292
1294
  - app/models/deprecated_tags.rb
1293
1295
  - app/models/file_not_found_page.rb
1294
1296
  - app/models/layout.rb
@@ -1297,7 +1299,6 @@ files:
1297
1299
  - app/models/page_context.rb
1298
1300
  - app/models/page_field.rb
1299
1301
  - app/models/page_part.rb
1300
- - app/models/rad_social_mailer.rb
1301
1302
  - app/models/standard_tags.rb
1302
1303
  - app/models/status.rb
1303
1304
  - app/models/text_filter.rb
@@ -1340,6 +1341,8 @@ files:
1340
1341
  - app/views/admin/users/remove.html.haml
1341
1342
  - app/views/admin/welcome/login.html.haml
1342
1343
  - app/views/layouts/application.html.haml
1344
+ - app/views/layouts/mail.html.haml
1345
+ - app/views/layouts/mailer.text.haml
1343
1346
  - app/views/password_mailer/password_reset.html.haml
1344
1347
  - app/views/rad_social_mailer/social_mail.html.haml
1345
1348
  - app/views/rad_social_mailer/social_mail_form.html.haml