moved out search pages

app/views/artists/_search.html.erb

@@ -1,6 +0,0 @@
-<div id="search-form" style="margin-bottom: 1em;">
-  <%= form_tag(artists_path, :method => :get) do %>
-    <%= text_field_tag "name", params[:name], :size => 40 %>
-    <%= submit_tag "Search" %>
-  <% end %>
-</div>

app/views/artists/_secondary_links.html.erb

@@ -1,6 +1,7 @@
 <% content_for(:secondary_links) do %>
   <menu>
     <li><%= link_to "Listing", artists_path %></li>
+    <li><%= link_to "Search", search_artists_path %></li>
     <li><%= link_to "New", new_artist_path %></li>
     <li><%= link_to "Recent changes", artist_versions_path %></li>
     <% if @artist && !@artist.new_record? %>

app/views/artists/index.html.erb

@@ -1,8 +1,6 @@
-<div id="artists">
-  <div id="index">
-    <%= render "search" %>
-
-    <table class="highlightable" width="100%">
+<div id="c-artists">
+  <div id="a-index">
+    <table class="striped" width="100%">
       <thead>
         <tr>
           <th width="5%"></th>
@@ -20,7 +18,7 @@
             <td>
               <%= link_to h(artist.name), artist_path(artist) %>
               <% if !artist.group_name.blank? %>
-                [<%= link_to(artist.group_name, artist_path(artist)) %>]
+                (group:<%= link_to(artist.group_name, artist_path(artist)) %>)
               <% end %>
             </td>
           <% end %>

app/views/artists/search.html.erb

@@ -0,0 +1,17 @@
+<div id="c-artists">
+  <div id="a-search">
+    <h1>Search Artists</h1>
+    
+    <div id="search-form" style="margin-bottom: 1em;">
+      <%= simple_form_for(@search) do |f| %>
+        <%= f.input :name_contains, :label => "Name" %>
+        <%= f.input :other_names_match, :label => "Other Names" %>
+        <%= f.input :group_name_contains, :label => "Group Name" %>
+        <%= f.input :url_match, :label => "URL" %>
+        <%= f.button :submit, "Search" %>
+      <% end %>
+    </div>
+  </div>
+</div>
+
+<%= render "secondary_links" %>

app/views/comments/index_by_comment.html.erb

@@ -1,5 +1,5 @@
-<div class="comments">
-  <div class="index">
+<div id="c-comments">
+  <div id="a-index">
     <% @comments.each do |comment| %>
       <%= render :partial => "comments/partials/index/list", :locals => {:post => comment.post, :comments => [comment], :show_header => false} %>
     <% end %>

app/views/comments/partials/index/_header.html.erb

@@ -1,7 +1,7 @@
 <div class="header">
   <div class="row">
     <span class="info">
-      <time>Date</time>
+      <strong>Date</strong>
       <%= compact_time(post.created_at) %>
     </span>
     <span class="info">
@@ -14,7 +14,7 @@
     </span>
     <span class="info">
       <strong>Score</strong>
-      <span id="score-for-post-<%= post.id %>"%>
+      <span id="score-for-post-<%= post.id %>">
         <span><%= post.score %></span>
         <% if CurrentUser.user.is_privileged? %>
           (vote <%= link_to("up", post_votes_path(:score => "up", :post_id => post.id), :remote => true, :method => :post) %>/<%= link_to("down", post_votes_path(:score => "down", :post_id => post.id), :remote => true, :method => :post) %>)

app/views/comments/partials/show/_comment.html.erb

@@ -2,9 +2,7 @@
   <div class="author">
     <h1><%= link_to comment.creator_name, user_path(comment.creator_id) %></h1>
     <p>
-      <time datetime="<%= comment.created_at %>">
-        <%= time_ago_in_words(comment.created_at) %> ago
-      </time>
+      <%= time_ago_in_words(comment.created_at) %> ago
     </p>
   </div>
   <div class="content">

app/views/favorites/index.html.erb

@@ -1,5 +1,5 @@
-<div class="favorites">
-  <div class="index">
+<div id="c-favorites">
+  <div id="a-index">
     <aside id="sidebar">
       <section id="search-box">
         <h1>Search Favorites</h1>

app/views/notes/index.html.erb

@@ -1,3 +1,9 @@
+<div id="c-notes">
+  <div id="a-index">
+    
+  </div>
+</div>
+
 <div id="note-list">
   <%= render :partial => "post/posts", :locals => {:posts => @posts} %>
 

app/views/tags/_search.html.erb

@@ -1,8 +0,0 @@
-<div>
-  <%= simple_form_for(@search) do |f| %>
-    <%= f.input :name_matches, :required => false, :label => "Name" %>
-    <%= f.input :category_equals, :required => false, :label => "Category" %>
-    <%= f.input :meta_sort, :collection => [["Name", "name.asc"], ["Count", "post_count.desc"], ["Date", "created_at.desc"]], :label => "Sort", :required => false %>
-    <%= f.button :submit, "Search" %>
-  <% end %>
-</div>

app/views/tags/_secondary_links.html.erb

@@ -1,6 +1,7 @@
 <% content_for(:secondary_links) do %>
   <menu>
     <li><%= link_to "Listing", tags_path %></li>
+    <li><%= link_to "Search", search_tags_path %></li>
     <li><%= link_to "Aliases", tag_aliases_path %></li>
     <li><%= link_to "Implications", tag_implications_path %></li>
     <li><%= link_to "Help", wiki_pages_path(:search => {:title_equals => "help:tags"}) %></li>    

app/views/tags/index.html.erb

@@ -1,6 +1,4 @@
-<%= render "search" %>
-
-<table width="100%" class="highlightable"> 
+<table width="100%" class="striped"> 
   <thead>
     <tr>
       <th>Count</th>

app/views/tags/search.html.erb

@@ -0,0 +1,10 @@
+<div id="c-tags">
+  <div id="a-search">
+    <%= simple_form_for(@search) do |f| %>
+      <%= f.input :name_matches, :required => false, :label => "Name" %>
+      <%= f.input :category_equals, :required => false, :label => "Category" %>
+      <%= f.input :meta_sort, :collection => [["Name", "name.asc"], ["Count", "post_count.desc"], ["Date", "created_at.desc"]], :label => "Sort", :required => false %>
+      <%= f.button :submit, "Search" %>
+    <% end %>
+  </div>
+</div>