Permalink
Browse files

Merge branch 'master' of github.com:Jarred-Sumner/FundingList.us

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/application.css.scss
	app/controllers/companies_controller.rb
  • Loading branch information...
2 parents 89c630c + 8c44c2d commit 5b3912306660f665494fcffa7a732974099dad70 Jarred Sumner committed Feb 18, 2012
View
@@ -1,154 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- actionmailer (3.2.1)
- actionpack (= 3.2.1)
- mail (~> 2.4.0)
- actionpack (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- builder (~> 3.0.0)
- erubis (~> 2.7.0)
- journey (~> 1.0.1)
- rack (~> 1.4.0)
- rack-cache (~> 1.1)
- rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.1)
- activesupport (= 3.2.1)
- builder (~> 3.0.0)
- activerecord (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- arel (~> 3.0.0)
- tzinfo (~> 0.3.29)
- activeresource (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- activesupport (3.2.1)
- i18n (~> 0.6)
- multi_json (~> 1.0)
- arel (3.0.0)
- bootstrap-sass (2.0.1)
- bourbon (1.3.6)
- sass (>= 3.1)
- builder (3.0.0)
- capistrano (2.9.0)
- highline
- net-scp (>= 1.0.0)
- net-sftp (>= 2.0.0)
- net-ssh (>= 2.0.14)
- net-ssh-gateway (>= 1.1.0)
- coderay (1.0.5)
- coffee-rails (3.2.2)
- coffee-script (>= 2.2.0)
- railties (~> 3.2.0)
- coffee-script (2.2.0)
- coffee-script-source
- execjs
- coffee-script-source (1.2.0)
- erubis (2.7.0)
- execjs (1.3.0)
- multi_json (~> 1.0)
- highline (1.6.11)
- hike (1.2.1)
- i18n (0.6.0)
- journey (1.0.1)
- jquery-rails (2.0.0)
- railties (>= 3.2.0.beta, < 5.0)
- thor (~> 0.14)
- json (1.6.5)
- libv8 (3.3.10.4)
- mail (2.4.1)
- i18n (>= 0.4.0)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- method_source (0.7.0)
- mime-types (1.17.2)
- multi_json (1.0.4)
- net-scp (1.0.4)
- net-ssh (>= 1.99.1)
- net-sftp (2.0.5)
- net-ssh (>= 2.0.9)
- net-ssh (2.3.0)
- net-ssh-gateway (1.1.0)
- net-ssh (>= 1.99.1)
- nokogiri (1.5.0)
- pg (0.12.2)
- pjax-rails (0.1.4)
- jquery-rails
- polyglot (0.3.3)
- pry (0.9.8.1)
- coderay (~> 1.0.5)
- method_source (~> 0.7)
- slop (>= 2.4.3, < 3)
- rabl (0.5.4)
- activesupport (>= 2.3.14)
- multi_json (~> 1.0.3)
- rack (1.4.1)
- rack-cache (1.1)
- rack (>= 0.4)
- rack-ssl (1.3.2)
- rack
- rack-test (0.6.1)
- rack (>= 1.0)
- rails (3.2.1)
- actionmailer (= 3.2.1)
- actionpack (= 3.2.1)
- activerecord (= 3.2.1)
- activeresource (= 3.2.1)
- activesupport (= 3.2.1)
- bundler (~> 1.0)
- railties (= 3.2.1)
- railties (3.2.1)
- actionpack (= 3.2.1)
- activesupport (= 3.2.1)
- rack-ssl (~> 1.3.2)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (0.9.2.2)
- rdoc (3.12)
- json (~> 1.4)
- sass (3.1.14)
- sass-rails (3.2.4)
- railties (~> 3.2.0)
- sass (>= 3.1.10)
- tilt (~> 1.3)
- slop (2.4.3)
- sprockets (2.1.2)
- hike (~> 1.2)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.5)
- therubyracer (0.9.9)
- libv8 (~> 3.3.10)
- thor (0.14.6)
- tilt (1.3.3)
- treetop (1.4.10)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (0.3.31)
- uglifier (1.2.3)
- execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- bootstrap-sass (~> 2.0.1)
- bourbon
- capistrano
- coffee-rails (~> 3.2.1)
- jquery-rails
- nokogiri
- pg
- pjax-rails
- pry
- rabl
- rails (= 3.2.1)
- sass-rails (~> 3.2.3)
- sqlite3
- therubyracer
- uglifier (>= 1.0.3)
@@ -14,7 +14,6 @@
//= require jquery_ujs
//= require jquery-ui
//= require pjax
-//= require jquery.textchange.min
//= require bootstrap-modal
//= require_self
$(document).ready(function()
@@ -4,7 +4,6 @@
*/
@import "bourbon/bourbon";
@import "bootstrap";
-@import 'bootstrap-responsive';
@import url(http://fonts.googleapis.com/css?family=Asap|Oswald);
#not_affiliated
@@ -36,3 +35,13 @@
-o-user-select: none;
user-select: none;
}
+#footer
+{
+ margin: 0 auto;
+ padding: 0;
+ text-align: center;
+ position: absolute;
+ bottom: 0px;
+ right: 25%;
+ left: 25%;
+}
@@ -33,13 +33,13 @@ def subscribe
def unsubscribe
@email = EmailUpdate.where(:email => params[:email]).each { |email| email.destroy }
respond_to do |format|
- format.html { redirect_to '/' }
- format.json { render :json => @email }
+ format.html { redirect_to '/', :notice => "You won't receive any more emails from FundingList" }
+ format.json { render :json => nil}
end
end
def search
- @results = Company.where("name ilike ?", "#{params[:query]}%").limit(8) unless params[:query] == ''
+ @results = Company.where("name like ?", "#{params[:query]}%").limit(8) unless params[:query] == ''
respond_to do |format|
format.json
end
@@ -2,7 +2,7 @@
<div id='companies'>
<h1>Know your competitors</h1>
<h3>Find out and stay up to date on any startup's funding</h3>
- <input type='search' id='search' placeholder='Startup' value='<%= params[:search] %>'/>
+ <input type='search' id='search' placeholder='Featured Companies' value='<%= params[:search] %>'/>
<ul id='companies_list'>
<% @companies.each do |company| %>
<li class='company unselectable'>
@@ -19,12 +19,23 @@
</div>
</div>
<div class='container' data-pjax-container>
+ <% if flash[:notice] %>
+ <div class='alert alert-success unselectable' id='success_alert'>
+ <div id='success_alert_text'><%= flash[:notice] %></div>
+ <a class="close">&times;</a>
+ </div>
+ <% else %>
<div class='alert alert-success hidden unselectable' id='success_alert'>
- <div id='success_alert_text'></div>
- <a class="close">&times;</a><%= flash[:notice] %></div>
+ <div id='success_alert_text'><%= flash[:notice] %></div>
+ <a class="close">&times;</a>
+ </div>
+ <% end %>
<%= yield %>
</div>
- <div id="not_affiliated">Companies, rounds, and related persons are retrieved from SEC filings. This website is not affiliated with the SEC in any other way.</div>
+ <div id='footer'>
+ <div id='created_by'>Created by <a href='http://jarredsumner.com'>Jarred Sumner</a>. Source code available on <a href='https://github.com/Jarred-Sumner/FundingList.us'>GitHub</a></div>
+ <div id="not_affiliated">Companies, rounds, and related persons are retrieved from SEC filings. This website is not affiliated with the SEC in any other way.</div>
+ </div>
</body>
</html>

0 comments on commit 5b39123

Please sign in to comment.