refinerycms 0.9.5.27 → 0.9.5.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. data/.gitignore +3 -1
  2. data/VERSION +1 -1
  3. data/config/environment.rb +0 -1
  4. data/public/javascripts/refinery/admin.js +2 -8
  5. data/vendor/plugins/refinery/app/views/admin/_head.html.erb +16 -29
  6. data/vendor/plugins/refinery/app/views/layouts/application.html.erb +1 -1
  7. data/vendor/plugins/refinery/app/views/shared/_google_analytics.html.erb +10 -9
  8. data/vendor/plugins/refinery/lib/tasks/refinery.rake +9 -1
  9. metadata +2 -2
data/.gitignore CHANGED
@@ -11,4 +11,6 @@ index/**/*
11
11
  db/*.sqlite3
12
12
  *.tmproj
13
13
  *.autobackupbyrefinery.*
14
- refinerycms*.gem
14
+ refinerycms*.gem
15
+ public/javascripts/cache
16
+ public/stylesheets/cache
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.9.5.27
1
+ 0.9.5.28
data/config/environment.rb CHANGED
@@ -68,7 +68,6 @@ eval("#{(defined? Refinery::Initializer) ? Refinery : Rails}::Initializer").run
68
68
  config.gem "will_paginate", :version => ">= 2.3.11", :lib => "will_paginate", :source => "http://gemcutter.org"
69
69
  config.gem "rails", :version => ">= 2.3.5", :lib => "rails"
70
70
  config.gem "aasm", :version => ">= 2.1.3", :lib => "aasm", :source => "http://gemcutter.org"
71
- config.gem "unicode", :version => ">= 0.1", :lib => "unicode"
72
71
  config.gem "slim_scrooge", :version => ">= 1.0.3", :lib => "slim_scrooge", :source => "http://gemcutter.org" #unless RUBY_PLATFORM =~ /mswin|mingw/ # kill gem when windows is running.
73
72
  config.gem "hpricot", :version => "= 0.8.1", :lib => "hpricot", :source => "http://gemcutter.org"
74
73
  #===REFINERY END OF REQUIRED GEMS===
data/public/javascripts/refinery/admin.js CHANGED
@@ -35,19 +35,13 @@ FastInit.addOnLoad(function()
35
35
  }
36
36
 
37
37
  jQuery('#continue_editing').val(true);
38
-
39
- if ((flash=$('flash')) != null) {
40
- flash.hide();
41
- }
38
+ jQuery('#flash').fadeOut(250)
42
39
 
43
40
  jQuery.post(this.form.action, this.form.serialize(), function(data) {
44
41
  if ((flash_container = $('flash_container')) != null) {
45
42
  flash_container.update(data);
46
43
 
47
- if ((flash = $('flash')) != null) {
48
- flash.style.width = 'auto';
49
- flash.appear();
50
- }
44
+ jQuery('#flash').css('width', 'auto').fadeIn(550);
51
45
 
52
46
  jQuery('.errorExplanation').each(function(i, node) {
53
47
  if (node.parentNode.id != 'flash_container') {
data/vendor/plugins/refinery/app/views/admin/_head.html.erb CHANGED
@@ -1,34 +1,21 @@
1
+ <% use_caching = RefinerySetting.find_or_set(:use_resource_caching, false) -%>
1
2
  <head>
2
3
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
3
- <title>
4
- <%= RefinerySetting.find_or_set(:site_name, 'Company Name').titleize %> - Refinery
5
- </title>
6
- <%= stylesheet_link_tag 'refinery/thickbox', 'refinery/refinery', 'refinery/tooltips' %>
7
- <%= render :partial => "/shared/admin/head_before_javascript_libraries" %>
8
- <% if RefinerySetting.find_or_set(:use_google_ajax_libraries, true) %>
9
- <% unless local_request? %>
10
- <script type='text/javascript' src="http://www.google.com/jsapi"></script>
11
- <script type='text/javascript'>
12
- google.load("prototype", "1.6.1");
13
- google.load("scriptaculous", "1.8.3");
14
- google.load("jquery", "1.3");
15
- </script>
16
- <% else %>
17
- <%= javascript_include_tag 'prototype', 'scriptaculous', 'jquery/jquery' %>
18
- <% end %>
19
- <% else%>
20
- <%= javascript_include_tag 'prototype', 'scriptaculous', 'jquery/jquery' %>
4
+ <title><%= RefinerySetting.find_or_set(:site_name, 'Company Name').titleize %> - Refinery</title>
5
+ <%= stylesheet_link_tag 'refinery/thickbox', 'refinery/refinery', 'refinery/tooltips', :cache => (use_caching ? "cache/refinery" : false) %>
6
+ <%= render :partial => "/shared/admin/head_before_javascript_libraries" -%>
7
+ <% if (using_google_libs = RefinerySetting.find_or_set(:use_google_ajax_libraries, true)) and !local_request? -%>
8
+ <script type='text/javascript' src="http://www.google.com/jsapi"></script>
9
+ <script type='text/javascript'>
10
+ google.load("prototype", "1.6.1");
11
+ google.load("scriptaculous", "1.8.3");
12
+ google.load("jquery", "1.3");
13
+ </script>
21
14
  <% end %>
15
+ <%= javascript_include_tag('prototype', 'scriptaculous', 'jquery/jquery', :cache => (use_caching ? "cache/libraries" : false)) if !using_google_libs or local_request? %>
22
16
  <script type='text/javascript'>jQuery.noConflict();</script>
23
- <%= javascript_include_tag 'refinery/prototype.enhancements.js', 'fastinit', 'refinery/tooltips', 'livepipe', 'tabs', 'thickbox', "wymeditor/jquery.refinery.wymeditor.js", 'refinery/boot_wym', 'refinery/admin' %>
24
- <%= "<script type='text/javascript' src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>" if RefinerySetting.find_or_set(:show_firebug_lite, false) == true %>
25
- <% unless flash.empty? %>
26
- <script type='text/javascript'>
27
- FastInit.addOnLoad(function()
28
- {
29
- $('flash').appear();
30
- });
31
- </script>
32
- <% end %>
17
+ <%= javascript_include_tag 'refinery/prototype.enhancements.js', 'fastinit', 'refinery/tooltips', 'livepipe', 'tabs', 'thickbox', "wymeditor/jquery.refinery.wymeditor.js", 'refinery/boot_wym', 'refinery/admin', :cache => (use_caching ? "cache/admin" : false) %>
18
+ <%= "<script type='text/javascript' src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>" if RefinerySetting.find_or_set(:show_firebug_lite, false) == true -%>
19
+ <%= "<script type='text/javascript'>jQuery(document).ready(function(){ jQuery('#flash').fadeIn(550); });</script>" unless flash.empty? -%>
33
20
  <%= yield :head %>
34
- </head>
21
+ </head>
data/vendor/plugins/refinery/app/views/layouts/application.html.erb CHANGED
@@ -12,6 +12,7 @@
12
12
  <link rel="shortcut icon" href="/favicon.ico" />
13
13
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
14
14
  <%= yield :head %>
15
+ <%= render :partial => 'shared/google_analytics' unless local_request? %>
15
16
  </head>
16
17
  <body>
17
18
  <%= render :partial => "/shared/ie6check" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ %>
@@ -28,6 +29,5 @@
28
29
  </div>
29
30
  </div>
30
31
  </div>
31
- <%= render :partial => 'shared/google_analytics' unless local_request? %>
32
32
  </body>
33
33
  </html>
data/vendor/plugins/refinery/app/views/shared/_google_analytics.html.erb CHANGED
@@ -1,12 +1,13 @@
1
- <% unless RefinerySetting[:analytics_page_code] == 'UA-xxxxxx-x' -%>
1
+ <% unless (page_code = RefinerySetting[:analytics_page_code]) == 'UA-xxxxxx-x' -%>
2
2
  <script type="text/javascript">
3
- var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
4
- document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
5
- </script>
6
- <script type="text/javascript">
7
- try {
8
- var pageTracker = _gat._getTracker("<%= RefinerySetting[:analytics_page_code] %>");
9
- pageTracker._trackPageview();
10
- } catch(err) {}
3
+ var _gaq = _gaq || [];
4
+ _gaq.push(['_setAccount', '<%= page_code %>']);
5
+ _gaq.push(['_trackPageview']);
6
+
7
+ (function() {
8
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
9
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
10
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
11
+ })();
11
12
  </script>
12
13
  <% end -%>
data/vendor/plugins/refinery/lib/tasks/refinery.rake CHANGED
@@ -22,6 +22,14 @@ namespace :refinery do
22
22
  end
23
23
 
24
24
  end
25
-
25
+
26
+ namespace :cache do
27
+ desc "Eliminate existing cache files for javascript and stylesheet resources in default directories"
28
+ task :clear => :environment do
29
+ FileUtils.rm(Dir[File.join(RAILS_ROOT, %w(public javascripts cache [^.]*))])
30
+ FileUtils.rm(Dir[File.join(RAILS_ROOT, %w(public stylesheets cache [^.]*))])
31
+ end
32
+ end
33
+
26
34
  end
27
35
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: refinerycms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.5.27
4
+ version: 0.9.5.28
5
5
  platform: ruby
6
6
  authors:
7
7
  - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
13
 
14
- date: 2009-12-17 00:00:00 +13:00
14
+ date: 2009-12-18 00:00:00 +13:00
15
15
  default_executable:
16
16
  dependencies: []
17
17