work

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

@@ -4,7 +4,11 @@
   <% end %>
 
   <div class="list-of-comments">
-    <%= render :partial => "comments/partials/show/comment", :collection => comments %>
+    <% if comments.empty? %>
+      <p>There are no comments.</p>
+    <% else %>
+      <%= render :partial => "comments/partials/show/comment", :collection => comments %>
+    <% end %>
   </div>
   
   <div class="clearfix"></div>

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

@@ -1,6 +1,6 @@
 <article data-comment-id="<%= comment.id %>">
   <div class="author">
-    <h4><%= link_to comment.creator_name, user_path(comment.creator_id) %></h4>
+    <h1><%= link_to comment.creator_name, user_path(comment.creator_id) %></h1>
     <p>
       <%= time_ago_in_words(comment.created_at) %> ago
     </p>

app/views/posts/partials/show/_image.html.erb

@@ -1,2 +1 @@
-<%= render :partial => "posts/partials/show/notes", :locals => {:post => post, :notes => post.notes.active} %>
-<%= image_tag(post.file_url_for(CurrentUser.user), :alt => post.tag_string, :width => post.image_width_for(CurrentUser.user), :height => post.image_height_for(CurrentUser.user), :id => "image") %>
+<%= image_tag(post.file_url_for(CurrentUser.user), :alt => post.tag_string, :width => post.image_width_for(CurrentUser.user), :height => post.image_height_for(CurrentUser.user), :id => "image", "data-width" => post.image_width, "data-height" => post.image_height) %>

app/views/posts/partials/show/_notes.html.erb

@@ -1,3 +1,3 @@
 <% notes.each do |note| %>
-  <%= content_tag(:article, "data-width" => note.width, "data-height" => note.height, "data-x" => note.x, "data-y" => note.y, "data-body" => note.formatted_body) %>
+  <%= content_tag(:article, "", "data-width" => note.width, "data-height" => note.height, "data-x" => note.x, "data-y" => note.y, "data-body" => note.body) %>
 <% end %>

app/views/posts/partials/show/_options.html.erb

@@ -2,7 +2,7 @@
   <%= resize_image_links(post, CurrentUser.user) %>
   <li><%= link_to "Favorite", favorite_path(post), :remote => true, :method => :post, :id => "add-to-favorites" %></li>
   <li><%= link_to "Unfavorite", favorite_path(post), :remote => true, :method => :delete, :id => "remove-from-favorites" %></li>
-  <li><%= link_to "Translate", "#", :id => "translate" %></li>
+  <li><%= link_to "Translate", "#", :id => "translate", :title => "Shortcut is CTRL+N" %></li>
   <li><%= link_to "Flag", new_post_flag_path(:post_id => post.id), :id => "flag" %></li>
   <li><%= link_to "Appeal", new_post_appeal_path(:post_id => post.id), :id => "appeal" %></li>
   <% if CurrentUser.is_janitor? %>

app/views/posts/show.html.erb

@@ -30,12 +30,9 @@
     </aside>
 
     <section id="content">
-      <h1>Post</h1>
-      
       <%= render :partial => "posts/partials/show/notices", :locals => {:post => @post} %>
 
       <section id="image-container">
-        <h2>Image</h2>
         <div id="note-container"></div>
         <%= @post.presenter.image_html(self) %>
       </section>
@@ -47,17 +44,14 @@
       </menu>
 
       <section id="comments">
-        <h2>Comments</h2>
         <%= render :partial => "comments/partials/index/list", :locals => {:comments => @post.comments, :post => @post, :show_header => false} %>
       </section>
 
       <section id="notes">
-        <h2>Notes</h2>
         <%= render :partial => "notes/note", :collection => @post.notes.active %>
       </section>
 
       <section id="edit">
-        <h2>Edit</h2>
         <%= render :partial => "posts/partials/show/edit", :locals => {:post => @post} %>
       </section>
     </section>    

app/views/sessions/new.html.erb

@@ -1,36 +1,28 @@
 <div id="sessions">
   <div id="new">
     <section>
-      <h3>Sign In</h3>
-      <%= form_tag(session_path) do %>
+      <h1>Login</h1>
+      <%= form_tag(session_path, :class => "simple_form") do %>
         <%= hidden_field_tag "url", params[:url] %>
-        <table width="100%">
-          <tfoot>
-            <tr>
-              <td></td>
-              <td><%= submit_tag "Login" %></td>
-            </tr>
-          </tfoot>
-          <tbody>
-            <tr>
-              <th width="15%">
-                <%= label_tag :name %>
-              </th>
-              <td width="85%">
-                <%= text_field_tag :name %>
-              </td>
-            </tr>
-            <tr>
-              <th><%= label_tag :password %></th>
-              <td><%= password_field_tag :password %></td>
-            </tr>
-          </tbody>
-        </table>
+
+        <div class="input">
+          <label for="name">Name</label>
+          <%= text_field_tag :name %>
+        </div>
+        
+        <div class="input">
+          <label for="password">Password</label>
+          <%= password_field_tag :password %>
+        </div>
+        
+        <div class="input">
+          <%= submit_tag "Submit" %>
+        </div>
       <% end %>
     </section>
 
     <aside>
-      <h3>Help</h3>
+      <h1>Help</h1>
       <ul>
         <li><%= link_to "I don't have an account", new_user_path %></li>
         <li><%= link_to "I forgot my password", reset_password_path %></li>
@@ -41,5 +33,5 @@
 </div>
 
 <% content_for(:page_title) do %>
- /sign in
+ /login
 <% end %>

app/views/users/new.html.erb

@@ -1,6 +1,6 @@
-<div class="users">
-  <div class="new">
-    <h3>Registration</h3>
+<div id="c-users">
+  <div id="a-new">
+    <h1>Registration</h1>
 
     <div id="p1">
       <p><%= Danbooru.config.app_name %> is ad-sponsored and does not require an account to view. But in order to start uploading, editing, or creating content on this site, you will need to register. <em>Make sure you read and agree to the <%= link_to "terms of service", terms_of_service_path %> before registering. <strong>This site is open to web crawlers, therefore any name you choose will be public!</strong></em></p>
@@ -64,33 +64,14 @@
         </li>
       </ul>
 
-      <% form_for(@user) do |f| %>
+      <%= simple_form_for(@user) do |f| %>
         <%= error_messages_for("user") %>
-
-        <table width="100%">
-          <tbody>
-            <tr>
-              <th width="15%"><%= f.label :name %></th>
-              <td width="85%"><%= f.text_field :name %></td>
-            </tr>
-            <tr>
-              <th><%= f.label :password %></th>
-              <td><%= f.password_field :password %></td>
-            </tr>
-            <tr>
-              <th><%= f.label :password_confirmation %></th>
-              <td><%= f.password_field :password_confirmation %></td>
-            </tr>
-            <tr>
-              <th><%= f.label :email %></th>
-              <td><%= f.text_field :email %></td>
-            </tr>
-            <tr>
-              <td></td>
-              <td><%= submit_tag "Submit" %></td>
-            </tr>
-          </tbody>
-        </table>
+        
+        <%= f.input :name %>
+        <%= f.input :password %>
+        <%= f.input :password_confirmation %>
+        <%= f.input :email %>
+        <%= f.button :submit %>
       <% end %>
 
       <footer class="nav-links">
@@ -100,3 +81,6 @@
   </div>
 </div>
 
+<% content_for(:page_title) do %>
+  /users/signup
+<% end %>

app/views/wiki_pages/_excerpt.html.erb

@@ -4,16 +4,22 @@
  -->
 
 <div id="wiki-page-excerpt">
-  <span class="ui-icon ui-icon-closethick" id="close-wiki-page-excerpt"></span>
   <h1>Wiki</h1>
+  
+  <div id="hide-or-show-wiki-page-excerpt">
+    <span id="hide-wiki-page-excerpt">(hide)</span>
+    <span id="show-wiki-page-excerpt">(show)</span>
+  </div>
 
-  <% if wiki_page %>
-    <div id="wiki-page-excerpt" class="prose">
-      <%= format_text(wiki_page.presenter.excerpt) %>
+  <div id="wiki-page-excerpt-content">
+    <% if wiki_page %>
+      <div class="prose">
+        <%= format_text(wiki_page.presenter.excerpt) %>
 
-      <p>Read the <%= link_to "full article", wiki_page_path(wiki_page.id) %>.</p>
-    </div>
-  <% else %>
-    <p>There is currently no wiki page for the tag "<%= tag %>". You can <%= link_to "create one", new_wiki_page_path(:wiki_page => {:title => tag}) %>.</p>
-  <% end %>
+        <p>Read the <%= link_to "full article", wiki_page_path(wiki_page.id) %>.</p>
+      </div>
+    <% else %>
+      <p>There is currently no wiki page for the tag "<%= tag %>". You can <%= link_to "create one", new_wiki_page_path(:wiki_page => {:title => tag}) %>.</p>
+    <% end %>
+  </div>
 </div>