Permalink
Browse files

update gemfile and back to non-static js

  • Loading branch information...
alx committed Sep 16, 2011
1 parent 67a126f commit 9ee273e9452a487792cd8e59e360a37d37b5fd98
Showing with 47 additions and 14 deletions.
  1. +1 −3 Gemfile
  2. +2 −3 Gemfile.lock
  3. +34 −0 log/development.log
  4. +10 −8 themes/tetalab/views/shared/_head.html.erb
View
@@ -1,7 +1,5 @@
source 'http://rubygems.org'
-gem 'rails', '~> 3.0.5'
-
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -58,6 +56,6 @@ gem 'refinerycms-page-images', '~> 1.0'
gem 'refinerycms-calendar', '~>1.0'
# Add i18n support (optional, you can remove this if you really want to).
-gem 'refinerycms-i18n', '~> 0.9.9.16'
+gem 'refinerycms-i18n', '~> 1.0.0'
# END USER DEFINED
View
@@ -135,7 +135,7 @@ GEM
refinerycms-dashboard (1.0.8)
refinerycms-core (= 1.0.8)
refinerycms-generators (1.0.4)
- refinerycms-i18n (0.9.9.16)
+ refinerycms-i18n (1.0.0)
refinerycms-core (>= 0.9.9.12)
routing-filter (>= 0.2.3)
refinerycms-images (1.0.8)
@@ -187,11 +187,10 @@ PLATFORMS
DEPENDENCIES
capistrano
kramdown
- rails (~> 3.0.5)
refinerycms (= 1.0.8)
refinerycms-blog (~> 1.3)
refinerycms-calendar (~> 1.0)
- refinerycms-i18n (~> 0.9.9.16)
+ refinerycms-i18n (~> 1.0.0)
refinerycms-page-images (~> 1.0)
refinerycms-portfolio (~> 0.9.9)
refinerycms-search (~> 0.9.8)
View
@@ -2820,3 +2820,37 @@ DEPRECATION WARNING: config.action_view.debug_rjs will be removed in 3.1, from 3
SQL (0.5ms) SELECT name
FROM sqlite_master
WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+DEPRECATION WARNING: config.action_view.debug_rjs will be removed in 3.1, from 3.1 onwards you will need to install prototype-rails to continue to use RJS templates . (called from /Volumes/data/dev/tetalab/refinery/config/environment.rb:5)
+ SQL (18.2ms)  SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+ RefinerySetting Load (1.5ms) SELECT "refinery_settings".* FROM "refinery_settings"
+ SQL (0.5ms)  SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+ SQL (0.5ms) SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+ SQL (0.8ms)  SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+ SQL (0.5ms) SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+ SQL (0.5ms)  SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+ SQL (0.4ms) SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+ SQL (0.5ms)  SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+ SQL (0.5ms) SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
@@ -7,12 +7,14 @@
<%= csrf_meta_tag if RefinerySetting.find_or_set(:authenticity_token_on_frontend, true)-%>
<%= yield :meta %>
- <link href="/stylesheets/refinery/application.css" media="screen" rel="stylesheet" type="text/css" />
- <link href="/theme/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
- <link href="/stylesheets/refinery/formatting.css" media="screen" rel="stylesheet" type="text/css" />
- <link href="/theme/stylesheets/formatting.css" media="screen" rel="stylesheet" type="text/css" />
- <link href="/stylesheets/refinery/theme.css" media="screen" rel="stylesheet" type="text/css" />
- <link href="/theme/stylesheets/theme.css" media="screen" rel="stylesheet" type="text/css" />
- <link href="/theme/stylesheets/home.css?1316212543" media="screen" rel="stylesheet" type="text/css" />
- <link href="/stylesheets/refinery/site_bar.css" media="screen" rel="stylesheet" type="text/css" />
+ <%= stylesheet_link_tag stylesheets_for_head(stylesheets||=%w(application formatting theme), theme ||= nil),
+ :cache => ("cache/application" if Rails.root.writable? and
+ RefinerySetting.find_or_set(:use_resource_caching, true) and
+ request.env['HTTP_USER_AGENT'] !~ /MSIE/ and (theme ||= nil).blank?) %>
+ <%= stylesheet_link_tag "home", :theme => theme if home_page? %>
+
+ <%= yield :stylesheets %>
+ <%= render :partial => '/shared/google_analytics' unless local_request? %>
+
+ <%= javascript_include_tag 'modernizr-min' %>
</head>

0 comments on commit 9ee273e

Please sign in to comment.