muck-engine 3.3.4 → 3.3.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. data/Rakefile +0 -3
  2. data/VERSION +1 -1
  3. data/app/views/layouts/admin/_head.html.erb +0 -1
  4. data/app/views/layouts/admin.html.erb +1 -0
  5. data/app/views/layouts/default.html.erb +1 -2
  6. data/app/views/layouts/frame.html.erb +2 -1
  7. data/app/views/layouts/global/_head.html.erb +0 -1
  8. data/app/views/layouts/popup.html.erb +1 -0
  9. data/muck-engine.gemspec +1 -1
  10. metadata +3 -3
data/Rakefile CHANGED
@@ -79,9 +79,6 @@ begin
79
79
  gem.files.exclude 'test/**'
80
80
  gem.test_files.exclude 'test/**' # exclude test directory
81
81
  end
82
- Jeweler::RubyforgeTasks.new do |rubyforge|
83
- rubyforge.doc_task = "rdoc"
84
- end
85
82
  Jeweler::GemcutterTasks.new
86
83
  rescue LoadError
87
84
  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
data/VERSION CHANGED
@@ -1 +1 @@
1
- 3.3.4
1
+ 3.3.5
data/app/views/layouts/admin/_head.html.erb CHANGED
@@ -6,7 +6,6 @@
6
6
  <meta name="resource-type" content="document" />
7
7
  <meta name="MSSmartTagsPreventParsing" content="true" />
8
8
  <%= include_stylesheets :admin -%>
9
- <%= include_javascripts :admin -%>
10
9
  <%= javascript_tag %[const AUTH_TOKEN = #{form_authenticity_token.inspect};] if protect_against_forgery? %>
11
10
  <%= yield :head -%>
12
11
  <%= csrf_meta_tag %>
data/app/views/layouts/admin.html.erb CHANGED
@@ -15,6 +15,7 @@
15
15
  </div>
16
16
  </div>
17
17
  <%= render :partial => 'layouts/admin/footer' %>
18
+ <%= include_javascripts :admin %>
18
19
  <%= yield :javascript %>
19
20
  </body>
20
21
  </html>
data/app/views/layouts/default.html.erb CHANGED
@@ -14,9 +14,8 @@
14
14
  </div>
15
15
  </div>
16
16
  </div>
17
- <script type="text/javascript" language="JavaScript">
17
+ <%= include_javascripts :site %>
18
18
  <%= yield :javascript %>
19
- </script>
20
19
  <%= render :partial => 'layouts/global/google_analytics' %>
21
20
  </body>
22
21
  </html>
data/app/views/layouts/frame.html.erb CHANGED
@@ -7,7 +7,8 @@
7
7
  </style>
8
8
  </head>
9
9
  <body scroll="no" style="overflow: hidden">
10
- <%= yield :layout %>
10
+ <%= yield :layout %>
11
+ <%= include_javascripts :site %>
11
12
  <%= yield :javascript %>
12
13
  <%= render :partial => 'layouts/global/google_analytics' %>
13
14
  </body>
data/app/views/layouts/global/_head.html.erb CHANGED
@@ -6,7 +6,6 @@
6
6
  <meta name="resource-type" content="document" />
7
7
  <meta name="MSSmartTagsPreventParsing" content="true" />
8
8
  <%= include_stylesheets :site %>
9
- <%= include_javascripts :site %>
10
9
  <%= javascript_tag %[const AUTH_TOKEN = #{form_authenticity_token.inspect};] if protect_against_forgery? %>
11
10
  <%= yield :head -%>
12
11
  <%= csrf_meta_tag %>
data/app/views/layouts/popup.html.erb CHANGED
@@ -11,6 +11,7 @@
11
11
  </div>
12
12
  </div>
13
13
  </div>
14
+ <%= include_javascripts :site %>
14
15
  <%= yield :javascript %>
15
16
  <%= render :partial => 'layouts/global/google_analytics' %>
16
17
  </body>
data/muck-engine.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{muck-engine}
8
- s.version = "3.3.4"
8
+ s.version = "3.3.5"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Justin Ball", "Joel Duffin"]
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: muck-engine
3
3
  version: !ruby/object:Gem::Version
4
- hash: 3
4
+ hash: 1
5
5
  prerelease:
6
6
  segments:
7
7
  - 3
8
8
  - 3
9
- - 4
10
- version: 3.3.4
9
+ - 5
10
+ version: 3.3.5
11
11
  platform: ruby
12
12
  authors:
13
13
  - Justin Ball