_head.html.erb in refinerycms-0.9.5.28

- old
+ new
@@ -1,34 +1,21 @@
+<% use_caching = RefinerySetting.find_or_set(:use_resource_caching, false) -%>
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <title>
-    <%= RefinerySetting.find_or_set(:site_name, 'Company Name').titleize %> - Refinery
-  </title>
-  <%= stylesheet_link_tag 'refinery/thickbox', 'refinery/refinery', 'refinery/tooltips' %>
-  <%= render :partial => "/shared/admin/head_before_javascript_libraries" %>
-  <% if RefinerySetting.find_or_set(:use_google_ajax_libraries, true) %>
-    <% unless local_request? %>
-      <script type='text/javascript' src="http://www.google.com/jsapi"></script>
-      <script type='text/javascript'>
-        google.load("prototype", "1.6.1");
-        google.load("scriptaculous", "1.8.3");
-        google.load("jquery", "1.3");
-      </script>
-    <% else %>
-      <%= javascript_include_tag 'prototype', 'scriptaculous', 'jquery/jquery' %>
-    <% end %>
-  <% else%>
-    <%= javascript_include_tag 'prototype', 'scriptaculous', 'jquery/jquery' %>
+  <title><%= RefinerySetting.find_or_set(:site_name, 'Company Name').titleize %> - Refinery</title>
+  <%= stylesheet_link_tag 'refinery/thickbox', 'refinery/refinery', 'refinery/tooltips', :cache => (use_caching ? "cache/refinery" : false) %>
+  <%= render :partial => "/shared/admin/head_before_javascript_libraries" -%>
+  <% if (using_google_libs = RefinerySetting.find_or_set(:use_google_ajax_libraries, true)) and !local_request? -%>
+    <script type='text/javascript' src="http://www.google.com/jsapi"></script>
+    <script type='text/javascript'>
+      google.load("prototype", "1.6.1");
+      google.load("scriptaculous", "1.8.3");
+      google.load("jquery", "1.3");
+    </script>
   <% end %>
+  <%= javascript_include_tag('prototype', 'scriptaculous', 'jquery/jquery', :cache => (use_caching ? "cache/libraries" : false)) if !using_google_libs or local_request? %>
   <script type='text/javascript'>jQuery.noConflict();</script>
-  <%= javascript_include_tag 'refinery/prototype.enhancements.js', 'fastinit', 'refinery/tooltips', 'livepipe', 'tabs', 'thickbox', "wymeditor/jquery.refinery.wymeditor.js", 'refinery/boot_wym', 'refinery/admin' %>
-  <%= "<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 %>
-<% unless flash.empty? %>
-  <script type='text/javascript'>
-    FastInit.addOnLoad(function()
-    {
-      $('flash').appear();
-    });
-  </script>
-<% end %>
+  <%= 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) %>
+  <%= "<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 -%>
+  <%= "<script type='text/javascript'>jQuery(document).ready(function(){ jQuery('#flash').fadeIn(550); });</script>" unless flash.empty? -%>
   <%= yield :head %>
-</head>
+</head>
\ No newline at end of file