Commit d230a754

@@ -19,40 +19,7 @@
         </div>
       </div> <!-- /container -->
     </div>
-    <footer>
-    <div class="container">
-      <div class="row">
-        <div class="span4">
-          <h3>CakeSide</h3>
-          <ul class="unstyled">
-            <li> <a href="/">Home</a></li>
-            <li> <a href="<%= url_for new_user_session_path %>">Sign-Up</a> </li>
-            <li> <a href="<%= url_for new_user_session_path %>">About Us</a> </li>
-            <li> <a href="<%= url_for new_user_session_path %>">Why CakeSide?</a> </li>
-          </ul>
-        </div>
-        <div class="span4">
-          <h3>Contact Us</h3>
-          <ul class="unstyled">
-            <li> <a href="http://cakeside.uservoice.com/" target="_blank">Send Feedback</a> </li>
-            <li> <a href="http://twitter.com/cakeside">Twitter</a> </li>
-            <li> <a href="https://www.facebook.com/pages/CakeSide/214607468615074">Facebook</a> </li>
-            <li> <a href="/"></a> </li>
-          </ul>
-        </div>
-        <div class="span4"></div>
-      </div>
-    </div>		
-    <div id="footer-floor">		
-      <div class="container">
-        <div class="row">
-          <div class="span12">
-            <p>Copyright &copy; 2012 CakeSide Inc. | <a href="/terms.html"> Terms</a> &amp; <a href="/privacy.html"> Privacy</a> | Contact Us <a href="http://twitter.com/cakeside">@cakeside</a> | <a href="https://www.facebook.com/pages/CakeSide/214607468615074">facebook</a></p>
-          </div>
-        </div>
-      </div>
-    </div>	
-    </footer>
+    <%= render "shared/footer" %>
     <%= render "shared/google_analytics" %>
   </body>
 </html>

@@ -9,8 +9,8 @@
         <% unless user_signed_in? %>
           <li> <a href="<%= url_for new_user_session_path %>">Sign-Up</a> </li>
         <% end %>
-        <li> <a href="/home/about_us">About Us</a> </li>
-        <li> <a href="/home/why_cakeside">Why CakeSide?</a> </li>
+        <li> <a href="<%= url_for about_us_path %>">About Us</a> </li>
+        <li> <a href="<%= url_for why_cakeside_path %>">Why CakeSide?</a> </li>
       </ul>
     </div>
     <div class="span4">

@@ -7,8 +7,8 @@ Cake::Application.routes.draw do
   root :to => "creations#index"
 
   # /home
-  get "home/about_us"
-  get "home/why_cakeside"
+  match "about_us" => "home#about_us"
+  match "why_cakeside" => "home#why_cakeside"
 
   # /creations
   resources :creations do
@@ -19,15 +19,10 @@ Cake::Application.routes.draw do
   match 'creations/crop_update/:id' => 'creations#crop_update', :as => 'creations_crop_update', :method => 'POST'
 
   # /profiles
-  get "profiles/index"
-  get "profiles/favorites"
-  get "profiles/mine"
+  match "profiles" => "profiles#index", :as => 'profiles', :method => "GET"
   match 'profiles/:id' => 'profiles#show', :as => 'profile', :method => 'GET'
-  match 'profiles/mine' => 'profiles#mine', :as => 'profiles_mine', :method => 'GET'
-
-  # /artists
-  match 'artists' => 'profiles#index', :as => 'all_profiles', :method => 'GET'
-  match 'artists/:id' => 'profiles#show', :as => 'artist', :method => 'GET'
+  match 'mine' => 'profiles#mine', :as => 'profiles_mine', :method => 'GET'
+  match 'favorites' => 'profiles#favorites', :as => 'profiles_favorites', :method => 'GET'
 
   # /categories
   match 'categories/:id' => 'categories#show', :method => 'GET'