Created
June 20, 2011 14:36
-
-
Save jamescook/1035723 to your computer and use it in GitHub Desktop.
josh_sucks.diff
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/.gitignore b/.gitignore | |
| index fb67f16..2a41efe 100644 | |
| --- a/.gitignore | |
| +++ b/.gitignore | |
| @@ -10,6 +10,8 @@ db/*.sqlite3-journal | |
| tmp | |
| tmp/**/* | |
| +vendor/ruby | |
| + | |
| # Documentation | |
| doc/api | |
| doc/app | |
| diff --git a/Gemfile b/Gemfile | |
| index 8a6bef7..73c6c3c 100644 | |
| --- a/Gemfile | |
| +++ b/Gemfile | |
| @@ -1,6 +1,7 @@ | |
| source 'http://rubygems.org' | |
| gem 'rails', '3.1.0.rc4' | |
| +gem 'therubyracer' | |
| gem 'forem', :git => 'git://github.com/isotope11/forem' | |
| gem 'forem-theme-base', :git => 'git://github.com/radar/forem-theme-base' | |
| @@ -14,6 +15,8 @@ gem 'sass-rails', '~> 3.1.0.rc' | |
| gem 'coffee-script' | |
| gem 'uglifier' | |
| +gem 'jquery-rails' | |
| + | |
| # Use unicorn as the web server | |
| # gem 'unicorn' | |
| diff --git a/Gemfile.lock b/Gemfile.lock | |
| index a64e12a..c6b6b2d 100644 | |
| --- a/Gemfile.lock | |
| +++ b/Gemfile.lock | |
| @@ -130,8 +130,12 @@ GEM | |
| activerecord (>= 3.0.0) | |
| hike (1.1.0) | |
| i18n (0.6.0) | |
| + jquery-rails (1.0.11) | |
| + railties (~> 3.0) | |
| + thor (~> 0.14) | |
| kaminari (0.12.4) | |
| rails (>= 3.0.0) | |
| + libv8 (3.3.10.2) | |
| mail (2.3.0) | |
| i18n (>= 0.4.0) | |
| mime-types (~> 1.16) | |
| @@ -184,6 +188,8 @@ GEM | |
| rack (~> 1.0) | |
| tilt (!= 1.3.0, ~> 1.1) | |
| sqlite3 (1.3.3) | |
| + therubyracer (0.9.1) | |
| + libv8 (~> 3.3.10) | |
| thor (0.14.6) | |
| tilt (1.3.2) | |
| treetop (1.4.9) | |
| @@ -203,9 +209,11 @@ DEPENDENCIES | |
| coffee-script | |
| forem! | |
| forem-theme-base! | |
| + jquery-rails | |
| rails (= 3.1.0.rc4) | |
| refinerycms! | |
| refinerycms-i18n! | |
| sass-rails (~> 3.1.0.rc) | |
| sqlite3 | |
| + therubyracer | |
| uglifier | |
| diff --git a/app/views/refinery/_head.html.erb b/app/views/refinery/_head.html.erb | |
| new file mode 100644 | |
| index 0000000..d02232e | |
| --- /dev/null | |
| +++ b/app/views/refinery/_head.html.erb | |
| @@ -0,0 +1,25 @@ | |
| +<head> | |
| + <meta charset='<%= ::Refinery::Application.config.encoding %>' /> | |
| + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> | |
| + <title><%= browser_title(yield(:title)) %></title> | |
| + <%= raw "<meta name=\"description\" content=\"#{@meta.meta_description}\" />" if @meta.meta_description.present? -%> | |
| + <%= raw "<meta name=\"keywords\" content=\"#{@meta.meta_keywords}\">" if @meta.meta_keywords.present? -%> | |
| + <%= csrf_meta_tag if ::Refinery::Setting.find_or_set(:authenticity_token_on_frontend, true)-%> | |
| + <%= yield :meta %> | |
| + | |
| + <% stylesheets_for_head(stylesheets||=%w(application formatting theme), theme ||= nil).each do |ss| %> | |
| + <%= stylesheet_link_tag ss %> | |
| + <% end %> | |
| + <%= forem_theme_tag %> | |
| + <%# TODO: remove caching because sprockets will do it for us | |
| + :cache => ("cache/application" if Rails.root.writable? and | |
| + ::Refinery::Setting.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 => '/refinery/google_analytics' %> | |
| + | |
| + <%= javascript_include_tag 'modernizr-min' %> | |
| +</head> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment