Permalink
Browse files

Layout Adjustments

  • Loading branch information...
1 parent 3c658ed commit 4a5e9b01c76dfa31e94d43738e6c83e773ce42df @andey committed Feb 9, 2013
View
@@ -28,7 +28,9 @@ gem 'rspec-rails', :group => [:test, :development]
group :test do
gem 'factory_girl_rails'
gem 'capybara'
+ gem 'spork'
gem 'guard-rspec'
+ gem 'guard-spork'
gem 'rb-inotify', '~> 0.8.8'
end
View
@@ -98,6 +98,10 @@ GEM
guard-rspec (2.4.0)
guard (>= 1.1)
rspec (~> 2.11)
+ guard-spork (1.4.1)
+ childprocess (>= 0.2.3)
+ guard (>= 1.1)
+ spork (>= 0.8.4)
high_voltage (1.2.1)
hike (1.2.1)
htmlentities (4.3.1)
@@ -209,6 +213,7 @@ GEM
sitemap_generator (3.4)
builder
slop (3.4.3)
+ spork (0.9.2)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
@@ -249,6 +254,7 @@ DEPENDENCIES
factory_girl_rails
fog
guard-rspec
+ guard-spork
high_voltage
htmlentities
iron_cache_rails
@@ -262,6 +268,7 @@ DEPENDENCIES
rspec-rails
sass-rails (~> 3.2.3)
sitemap_generator (~> 3.4)
+ spork
thin
uglifier (>= 1.0.3)
will_paginate
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
No changes.
Deleted file not rendered
@@ -13,21 +13,6 @@ def redirect
end
end
- # GET /
- #
- # The current root_path, which displays:
- # - 5 x AMAs over 1000 karma
- # - 5 x most recent AMAs
-
- def homepage
- @featured = Ama.where('responses > ? AND karma > ?', 0, 1000).order(:date).limit(5).reverse_order
- @recent = Ama.where('responses > ?', 0).order(:date).limit(5).reverse_order
-
- respond_to do |format|
- format.html
- end
- end
-
# GET /amas
#
# List AMAs, can be ordered by:
@@ -1,44 +0,0 @@
-<% content_for :title, "Archive of Ask me Anything's :: BestofAMA" %>
-<div class="row">
- <div class="span12">
- <h3>Featured &quot;Ask Me Anything&rsquo;s&quot;
- <small> with 1000+ karma</small>
- </h3>
- <% @featured.each do |a| %>
- <div class="row">
- <div class="span1 ama-karma-meter-small">
- <%= karma_meter(a.karma).html_safe %>
- </div>
- <div class="span11">
- <h4><%= link_to a.title.html_safe, ama_path(a) %></h4>
-
- <p class="muted">
- <b>Comments:</b> <%= a.comments %> | <b>Responses:</b> <%= a.responses %> |
- <b>Date:</b> <%= a.date %>
- </p>
- </div>
- </div>
- <% end %>
- </div>
-</div>
-
-<div class="row">
- <div class="span12">
- <h3>Recently Added</h3>
- <% @recent.each do |a| %>
- <div class="row">
- <div class="span1 ama-karma-meter-small">
- <%= karma_meter(a.karma).html_safe %>
- </div>
- <div class="span11">
- <h4><%= link_to a.title.html_safe, ama_path(a) %></h4>
-
- <p class="muted">
- <b>Comments:</b> <%= a.comments %> | <b>Responses:</b> <%= a.responses %> |
- <b>Date:</b> <%= a.date %>
- </p>
- </div>
- </div>
- <% end %>
- </div>
-</div>
@@ -1,10 +1,9 @@
<% content_for :title, "AMA Directory Ordered By '" + @order.to_s + "' Page " + params[:page].to_s + " :: BestofAMA" %>
<div class="row">
- <div class="span6">
- <h1>AMA's Directory</h1>
- </div>
+ <%= image_tag "homepage.png", :class => "span3", :alt => "Created by Rashik Patel (http://rashikpateldesign.co)" %>
<div class="span6" style="padding-top: 15px;">
+ <h1>BestofAMA Directory</h1>
<ul class="breadcrumb">
<li><strong>Order by:</strong></li>
<li style="margin-left: 20px;"><%= link_to "Date", amas_path %> <span class="divider">|</span></li>
@@ -13,9 +13,8 @@
<div class="container">
<%= link_to "BestofAMA", root_path, :class => "brand" %>
<ul class="nav">
- <li><%= link_to "AMAs", amas_path %></li>
<li><%= link_to "Redditors", entities_path %></li>
- <li><%= link_to "Tags", tags_path %></li>
+ <li><%= link_to "Categories", tags_path %></li>
<li><%= link_to "Submit", submit_path %></li>
<li id="li-navbar-search-button">
<a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Search</a>
View
@@ -42,6 +42,6 @@
get ":id" => 'pages#show', :as => :page, :format => false
# Root
- root :to => 'amas#homepage'
+ root :to => 'amas#index'
end

0 comments on commit 4a5e9b0

Please sign in to comment.