refinerycms-brushart_logo 0.1.4 → 0.1.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/app/views/admin/_head.html.erb +41 -28
  2. data/lib/refinerycms-brushart_logo.rb +1 -1
  3. data/public/stylesheets/refinery/custom.css +1 -0
  4. metadata +6 -6
data/app/views/admin/_head.html.erb CHANGED
@@ -1,44 +1,57 @@
1
1
  <%
2
- if (yielded_head = yield(:head)).present?
3
- logger.warn "\n-- DEPRECATION WARNING --"
4
- logger.warn "The use of 'content_for :head' is DEPRECATED for the admin layouts."
5
- logger.warn "For stylesheets, use content_for :stylesheets"
6
- logger.warn "For javascripts, use content_for :javascripts"
7
- logger.warn "For meta tags, use content_for :meta"
8
- logger.warn "This change is necessary so that we can deliver a performant experience for the user."
9
- logger.warn "Called from: #{caller.detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first}\n\n"
10
- end
11
- if (yielded_head_libraries = yield(:head)).present?
12
- logger.warn "\n-- DEPRECATION WARNING --"
13
- logger.warn "The use of 'content_for :head_libraries' is DEPRECATED for the admin layouts."
14
- logger.warn "Please use content_for :before_javascript_libraries or content_for :after_javascript_libraries instead."
15
- logger.warn "This change is necessary so that we can deliver a performant experience for the user."
16
- logger.warn "Called from: #{caller.detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first}\n\n"
17
- end
2
+ # Internet Explorer is fine with JS caching, but cache CSS and kaboom.
3
+ # Would be great if someone could fix this?
4
+ js_caching = RefinerySetting.find_or_set(:use_resource_caching, Rails.root.writable?)
5
+ css_caching = js_caching && request.env['HTTP_USER_AGENT'] !~ /MSIE/
6
+ login = defined?(login) ? login : login?
18
7
  -%>
19
8
  <head>
20
- <meta charset='<%= ::Refinery::Application.config.encoding %>' />
9
+ <meta charset='<%= Refinery::Application.config.encoding %>' />
21
10
  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
22
- <%= yield :meta %>
23
11
  <title><%= RefinerySetting.find_or_set(:site_name, 'Company Name') -%> - Refinery</title>
24
12
  <%= csrf_meta_tag %>
13
+ <%= render(:partial => '/shared/html5_for_ie.js').html_safe if request.env['HTTP_USER_AGENT'] =~ /MSIE/ %>
25
14
 
26
15
  <%= stylesheet_link_tag 'refinery/site_bar',
27
16
  'refinery/refinery',
28
- 'refinery/custom',
17
+ 'refinery/custom.css',
29
18
  'refinery/ui',
30
- 'refinery/submenu',
31
19
  'refinery/tooltips',
32
20
  'wymeditor/skins/refinery/skin',
33
- :cache => ("cache/refinery" if Rails.root.writable? and
34
- RefinerySetting.find_or_set(:use_resource_caching, true) and
35
- request.env['HTTP_USER_AGENT'] !~ /MSIE/) -%>
21
+ :cache => (css_caching ? "cache/refinery" : false) -%>
36
22
 
37
- <%= yield :stylesheets %>
23
+ <%= yield :head_before_javascript_libraries -%>
24
+ <%= javascript_include_tag 'refinery/i18n' -%>
25
+ <script type='text/javascript'>I18n.locale = '<%= I18n.locale %>';</script>
38
26
 
39
- <%= javascript_include_tag 'modernizr-min' %>
27
+ <%= jquery_include_tags(:caching => js_caching) -%>
40
28
 
41
- <% #TODO: REMOVE yielded_head and yielded_head_libraries and deprecation notice 0.9.9 <=> 1.0 %>
42
- <%= yielded_head_libraries %>
43
- <%= yielded_head %>
29
+ <% #TODO: Find out why the master branch doesn't work! %>
30
+ <%#= javascript_include_tag 'http://github.com/rails/jquery-ujs/raw/master/src/rails.js' %>
31
+ <%= javascript_include_tag 'http://github.com/rails/jquery-ujs/raw/f01a685c8200b76c4cc2c606accb135da5ad5444/src/rails.js' %>
32
+
33
+
34
+ <%= javascript_include_tag 'jquery/jquery.corner.js',
35
+ 'jquery/jquery.textTruncate.js',
36
+ 'jquery/jquery.html5-placeholder-shim.js',
37
+ 'jquery/jquery.timers.js',
38
+ 'jquery/jquery.jcarousel.js',
39
+ :cache => (js_caching ? "cache/jquery-plugins" : false) unless login -%>
40
+
41
+ <%= yield :head_after_javascript_libraries -%>
42
+
43
+ <%= javascript_include_tag 'wymeditor/jquery.refinery.wymeditor.js',
44
+ 'admin',
45
+ 'refinery/boot_wym',
46
+ 'refinery/core',
47
+ 'refinery/admin',
48
+ :cache => (js_caching ? "cache/admin" : false) unless login -%>
49
+ <%= javascript_include_tag 'refinery/core' if login -%>
50
+
51
+ <% if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
52
+ <%= "<!--[if lt IE 8]>#{stylesheet_link_tag 'refinery/ie-less-than-8'}<![endif]-->".html_safe -%>
53
+ <%= "<!--[if IE 8]>#{stylesheet_link_tag 'refinery/ie-less-than-9'}<![endif]-->".html_safe -%>
54
+ <% end -%>
55
+
56
+ <%= yield :head -%>
44
57
  </head>
data/lib/refinerycms-brushart_logo.rb CHANGED
@@ -3,7 +3,7 @@ require 'refinery'
3
3
  module Refinery
4
4
  module BrushartLogo
5
5
  def self.version
6
- %{0.1.4}
6
+ %{0.1.6}
7
7
  end
8
8
 
9
9
  if defined?(Rails)
data/public/stylesheets/refinery/custom.css CHANGED
@@ -4,3 +4,4 @@
4
4
  #site_bar{background:#e5e6e7}
5
5
  #site_bar_branding *{color:#77787b}
6
6
  #site_bar_branding a{color:#ee7237}
7
+ #site_bar #editor_switch{height:40px;overflow:hidden}
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: refinerycms-brushart_logo
3
3
  version: !ruby/object:Gem::Version
4
- hash: 19
5
- prerelease: false
4
+ hash: 23
5
+ prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 1
9
- - 4
10
- version: 0.1.4
9
+ - 6
10
+ version: 0.1.6
11
11
  platform: ruby
12
12
  authors:
13
13
  - Jacob Swanner
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-02-02 00:00:00 -05:00
18
+ date: 2011-02-22 00:00:00 -05:00
19
19
  default_executable:
20
20
  dependencies: []
21
21
 
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
64
64
  requirements: []
65
65
 
66
66
  rubyforge_project:
67
- rubygems_version: 1.3.7
67
+ rubygems_version: 1.4.1
68
68
  signing_key:
69
69
  specification_version: 3
70
70
  summary: Brushart Logo engine for Refinery CMS.