Commit ad436c73

mo k <mo@mokhan.ca>
2012-08-07 13:34:12
clean up the search page.
master
1 parent c00c4f0
Changed files (3)
app
controllers
creations_controller.rb
search_controller.rb
views
search
index.html.erb
app/controllers/creations_controller.rb
@@ -27,11 +27,7 @@ class CreationsController < ApplicationController
     @creation.category_ids = params[:creation][:category_ids] ||= []
     respond_to do |format|
       if @creation.save
-        if params[:creation][:image].blank? 
-          format.html { redirect_to(@creation, :notice => 'Creation was successfully created.') }
-        else
-          format.html { render :action => "crop" }
-        end
+        format.html { render :action => "crop" }
       else
         flash[:error] = @creation.errors.full_messages
         format.html { render :action => "new" }
app/controllers/search_controller.rb
@@ -5,8 +5,8 @@ class SearchController < ApplicationController
         format.html { redirect_to(home_index_url) }
       else
         sql = "%"+params[:q]+"%"
-        @creations = Creation.where("upper(name) like upper(?) OR upper(story) like upper(?)", sql, sql).page(params[:page]).per(8)
-        @members = User.where("upper(name) like upper(?)", sql).page(params[:page]).per(8)
+        @creations = Creation.where("upper(name) like upper(?) OR upper(story) like upper(?)", sql, sql).page(params[:page]).per(100)
+        @members = User.where("upper(name) like upper(?)", sql)
         @search = params[:q]
         format.html
       end
app/views/search/index.html.erb
@@ -5,7 +5,11 @@
     <hr />
   </div>
 </div>
+<h3>Creations</h3>
+<hr />
 <%= render "shared/a_12_column_gallery" %>
+<h3>Artists</h3>
+<hr />
 <div class="row">
   <% @members.each do |artist| %>
     <div class="span3">
@@ -18,8 +22,3 @@
     </div>
   <% end %>
 </div>
-<div class="row">
-  <div class="span3"> &nbsp; </div>
-  <div class="span6"> <p> <%= paginate @members %> </p> </div>
-  <div class="span3"> &nbsp; </div>
-</div>