massive changes to asset pipeline

jodyalbritton · Sep 30, 2012 · 24c07cb · 24c07cb
1 parent 9fe7995
commit 24c07cb
Show file tree

Hide file tree

Showing 10,161 changed files with 1,287,898 additions and 15 deletions.
diff --git a/app/assets/images/apple-touch-icon-114x114-precomposed.png b/app/assets/images/apple-touch-icon-114x114-precomposed.png
diff --git a/app/assets/images/apple-touch-icon-144x144-precomposed.png b/app/assets/images/apple-touch-icon-144x144-precomposed.png
diff --git a/app/assets/images/apple-touch-icon-57x57-precomposed.png b/app/assets/images/apple-touch-icon-57x57-precomposed.png
diff --git a/app/assets/images/apple-touch-icon-72x72-precomposed.png b/app/assets/images/apple-touch-icon-72x72-precomposed.png
diff --git a/app/assets/images/apple-touch-icon-precomposed.png b/app/assets/images/apple-touch-icon-precomposed.png
diff --git a/app/assets/images/apple-touch-icon.png b/app/assets/images/apple-touch-icon.png
diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
@@ -1,12 +1,6 @@
 class PostsController < ApplicationController
 
-  before_filter :load
 
-  def load
-
-
-    @post = Post.new
-  end
 
   def index
      @user = User.find(current_user)
@@ -20,6 +14,7 @@ def new
 
   def create
 
+
 
     @post = current_user.posts.build(params[:post])
 
@@ -35,7 +30,7 @@ def create
           following_ids = following.collect{|f| f.followable_id}
           mycircles =  current_user.relationships.collect{|g| g.circle_id}
           mycircles.push(0)
-          aoi = Activity.where(:target_type => ["Post"], :scope => mycircles )
+          aoi = Activity.where(:target_type => ["Post", "Stat", "Pactivity", "Meal"], :scope => mycircles )
           @activities = aoi.where(:user_id => [following_ids, current_user] ).page params[:page]
           flash[:notice] = "Successfully created post"
           flash.discard
@@ -58,6 +53,7 @@ def create
 
 
 
+
   end
 
   def edit

diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
@@ -31,6 +31,7 @@
     		<%= f.input :content, :label => false, :input_html => {:class=> "text_area"}%>
     		<%= f.input :reply_to_id, :as => 'hidden' %>
     		<%= f.input :parent_id, :as => 'hidden', :input_html =>{:value => @parent}%>
+    		<%= f.input :scope, :as => 'hidden', :input_html =>{:value => 0}%>
     		</div>
     	</div>
     	<div class="modal-footer">

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -16,23 +16,23 @@
 
     <!-- For third-generation iPad with high-resolution Retina display: -->
     <!-- Size should be 144 x 144 pixels -->
-    <%= favicon_link_tag 'images/apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144' %>
+    <%= favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144' %>
 
     <!-- For iPhone with high-resolution Retina display: -->
     <!-- Size should be 114 x 114 pixels -->
-    <%= favicon_link_tag 'images/apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114' %>
+    <%= favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114' %>
 
     <!-- For first- and second-generation iPad: -->
     <!-- Size should be 72 x 72 pixels -->
-    <%= favicon_link_tag 'images/apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72' %>
+    <%= favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72' %>
 
     <!-- For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: -->
     <!-- Size should be 57 x 57 pixels -->
-    <%= favicon_link_tag 'images/apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png' %>
+    <%= favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png' %>
 
     <!-- For all other devices -->
     <!-- Size should be 32 x 32 pixels -->
-    <%= favicon_link_tag 'images/favicon.ico', :rel => 'shortcut icon' %>
+    <%= favicon_link_tag 'favicon.ico', :rel => 'shortcut icon' %>
   </head>
   <body>
 

diff --git a/app/views/posts/create.js.erb b/app/views/posts/create.js.erb
@@ -12,14 +12,14 @@
    $("#post-form-cont").hide(0);
    $("#post-form-small").show(0);
   /*Clear the entire form*/
-  $("#post-form-cont-form.content").val("");
+  $('#post-form-cont-form.text').val("");
 
   /*Replace the html of the div post_lists with the updated new one*/
   $("#messages").html("<%= escape_javascript( render "layouts/messages" ) %>");
   $("#activity_feed").html("<%= escape_javascript( render "activities/index" ) %>");
 
   <% if @post.in_reply_to %>
-  $("#rt-modal").modal('toggle')
+  $("#rt-modal").modal('hide')
   <% end %>
 
 

diff --git a/app/views/posts/new.js.erb b/app/views/posts/new.js.erb
@@ -1,3 +1,4 @@
 $("#post_reply_to_id").val("<%= @rtpost.id %>");
 $("#post_content").val("@<%= @rtpost.user.username %>");
-$("#rt-modal").modal('toggle')
+$('input[post_scope]').val("@<%= @rtpost.scope %>");
+$("#rt-modal").modal('show')
diff --git a/vendor/bundle/ruby/1.9.1/bin/autospec b/vendor/bundle/ruby/1.9.1/bin/autospec
@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'rspec-core' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'rspec-core', version
+load Gem.bin_path('rspec-core', 'autospec', version)
diff --git a/vendor/bundle/ruby/1.9.1/bin/cucumber b/vendor/bundle/ruby/1.9.1/bin/cucumber
@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'cucumber' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'cucumber', version
+load Gem.bin_path('cucumber', 'cucumber', version)
diff --git a/vendor/bundle/ruby/1.9.1/bin/erubis b/vendor/bundle/ruby/1.9.1/bin/erubis
@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'erubis' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'erubis', version
+load Gem.bin_path('erubis', 'erubis', version)
diff --git a/vendor/bundle/ruby/1.9.1/bin/heroku b/vendor/bundle/ruby/1.9.1/bin/heroku
@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'heroku' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'heroku', version
+load Gem.bin_path('heroku', 'heroku', version)
diff --git a/vendor/bundle/ruby/1.9.1/bin/htmldiff b/vendor/bundle/ruby/1.9.1/bin/htmldiff
@@ -0,0 +1,25 @@
+#!/bin/sh
+'exec' "ruby" '-x' "$0" "$@"
+#!/home/jody/.rvm/rubies/ruby-1.9.3-p194/bin/ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'diff-lcs' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'diff-lcs', version
+load Gem.bin_path('diff-lcs', 'htmldiff', version)
diff --git a/vendor/bundle/ruby/1.9.1/bin/launchy b/vendor/bundle/ruby/1.9.1/bin/launchy
@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'launchy' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'launchy', version
+load Gem.bin_path('launchy', 'launchy', version)
diff --git a/vendor/bundle/ruby/1.9.1/bin/ldiff b/vendor/bundle/ruby/1.9.1/bin/ldiff
@@ -0,0 +1,25 @@
+#!/bin/sh
+'exec' "ruby" '-x' "$0" "$@"
+#!/home/jody/.rvm/rubies/ruby-1.9.3-p194/bin/ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'diff-lcs' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'diff-lcs', version
+load Gem.bin_path('diff-lcs', 'ldiff', version)
diff --git a/vendor/bundle/ruby/1.9.1/bin/lessc b/vendor/bundle/ruby/1.9.1/bin/lessc
@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'less' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'less', version
+load Gem.bin_path('less', 'lessc', version)
diff --git a/vendor/bundle/ruby/1.9.1/bin/nokogiri b/vendor/bundle/ruby/1.9.1/bin/nokogiri
@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'nokogiri' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'nokogiri', version
+load Gem.bin_path('nokogiri', 'nokogiri', version)
diff --git a/vendor/bundle/ruby/1.9.1/bin/oauth b/vendor/bundle/ruby/1.9.1/bin/oauth
@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'oauth' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'oauth', version
+load Gem.bin_path('oauth', 'oauth', version)
diff --git a/vendor/bundle/ruby/1.9.1/bin/rackup b/vendor/bundle/ruby/1.9.1/bin/rackup
@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'rack' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'rack', version
+load Gem.bin_path('rack', 'rackup', version)
diff --git a/vendor/bundle/ruby/1.9.1/bin/rails b/vendor/bundle/ruby/1.9.1/bin/rails
@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'railties' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'railties', version
+load Gem.bin_path('railties', 'rails', version)