CSS rewrite continuing apace woo

Signed-off-by: Lim Lim <[email protected]>
otwcode · Oct 8, 2011 · d5ea3de · d5ea3de
1 parent 4a27a28
commit d5ea3de
Show file tree

Hide file tree

Showing 89 changed files with 1,096 additions and 1,160 deletions.
diff --git a/app/helpers/series_helper.rb b/app/helpers/series_helper.rb
@@ -19,7 +19,7 @@ def show_series_data(work)
 
   def work_series_description(work, series)
     serial = SerialWork.where(:work_id => work.id, :series_id => series.id).first
-    ("Part #{serial.position} of " + link_to(series.title, series)).html_safe
+    ("Part <strong>#{serial.position}</strong> of the series " + link_to(series.title, series)).html_safe 
   end
 
   def series_list_for_feeds(work)

diff --git a/app/views/abuse_reports/new.html.erb b/app/views/abuse_reports/new.html.erb
@@ -7,7 +7,9 @@
 
 <!--main content-->
 <%= form_for(@abuse_report) do |f| %>
-  <dl>
+  <fieldset>
+	<legend>Link and Describe Abuse</legend>
+	<dl>
   	<dt><%= f.label :url, t('.link', :default => "Link to the page you are reporting (required):") %></dt>
   	<dd><%= f.text_field :url, :size => 60 %>
 		  <p class="footnote"><%=h t('.pre_filled', :default => "If you came here from the abuse link at the bottom of the page, this will be filled in for you.") %></p>
@@ -30,15 +32,18 @@
 	  <dt><%= f.label :email, t('.your_email', :default => "Your email (optional):") %></dt>
     <dd><%= f.text_field :email, :size => 60 %>
 		  <p class="footnote"><%=h t('.anonymous_report', :default => "Leave this blank to file an anonymous report.") %></p>
-		</dd>
 
       <p><%= label_tag('cc_me', "Email me a copy of my message (optional): ") %><%= check_box_tag('cc_me', false) %></p>
 
 
     <%= f.hidden_field :ip_address, :value => request.remote_ip %>
-
- 	  <dt><%=h t('.submit_message', :default => "Submit your message to the abuse team:") %></dt>
-	  <dd class="submit"><%= f.submit t('.submit', :default => "Submit") %></dd>
-	</dl>
+	</dd>		
+ </dl>
+</fieldset>
+<fieldset>
+	<legend>Send Message to Abuse Team</legend>
+		  <p class="submit"><%= f.submit t('.submit', :default => "Submit") %></p>
+</fieldset>
+
 <% end %>
 <!--/content-->
diff --git a/app/views/admin/_admin_nav.html.erb b/app/views/admin/_admin_nav.html.erb
@@ -1,17 +1,17 @@
 <h3 class="landmark">Admin Navigation</h3>
 <ul class="navigation" role="navigation">
-  <li><% if current_page?(admin_posts_path) %><span class="current"><% end %>
-    <%= link_to_unless_current "AO3 News", admin_posts_path %>
-    <% if current_page?(admin_posts_path) %></span><% end %></li>
-  <li><% if current_page?(new_admin_post_path) %><span class="current"><% end %>
-    <%= link_to "Post AO3 News", new_admin_post_path %>
-    <% if current_page?(new_admin_post_path) %></span><% end %></li>
-  <li><% if current_page?(archive_faqs_path) %><span class="current"><% end %>
-    <%= link_to_unless_current "Archive FAQ", archive_faqs_path %>
-    <% if current_page?(archive_faqs_path) %></span><% end %></li>
-  <li><% if current_page?(known_issues_path) %><span class="current"><% end %>
-    <%= link_to_unless_current "Known Issues", known_issues_path %>
-    <% if current_page?(known_issues_path) %></span><% end %></li>
+  <li>
+    <%= span_if_current "AO3 News", admin_posts_path %>
+   </li>
+  <li>
+    <%= span_if_current "Post AO3 News", new_admin_post_path %>
+</li>
+  <li>
+    <%= span_if_current "Archive FAQ", archive_faqs_path %>
+</li>
+  <li>
+    <%= span_if_current "Known Issues", known_issues_path %>
+</li>
 </ul>
 
 

diff --git a/app/views/admin_posts/_admin_index.html.erb b/app/views/admin_posts/_admin_index.html.erb
@@ -7,33 +7,33 @@
 
 <!--main content-->
 <div class="wrapper">
-  <table summary="This table lists News posts by title, date posted and date updated, and lets you show, edit, and delete each post. You can also make a new post.">
-    <caption>Manage News Postings</caption>
-    <colgroup>
-      <col class="name" />
-      <col span="5" />
-    </colgroup>
-    <thead>
-      <tr>
-        <th scope="col"><%= ts("Title") %></th>
-        <th scope="col"><%= ts("Posted") %></th>
-        <th scope="col"><%= ts("Updated") %></th>
-        <th scope="col" colspan="3"><%= ts("Actions") %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @admin_posts.each do |admin_post| %>
-        <tr>
-          <td><%= link_to admin_post.title, admin_post %></td>
-          <td><%=h admin_post.created_at %></td>
-          <td><%=h admin_post.updated_at %></td>
-          <td><%= link_to ts("Show"), admin_post %></td>
-          <td><%= link_to ts("Edit"), edit_admin_post_path(admin_post) %></td>
-          <td><%= link_to ts("Delete"), admin_post, :confirm => 'Are you sure?', :method => :delete %></td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
+	<table summary="This table lists News posts by title, date posted and date updated, and lets you show, edit, and delete each post. You can also make a new post.">
+	<caption>Manage News Postings</caption>
+	<colgroup>
+	<col class="name" />
+	<col span="5" />
+	</colgroup>
+	<thead>
+		<tr>
+      <th scope="col"><%= ts("Title") %></th>
+      <th scope="col"><%= ts("Posted") %></th>
+      <th scope="col"><%= ts("Updated") %></th>
+      <th scope="col" colspan="3"><%= ts("Actions") %></th>
+		</tr>
+	</thead>
+	<tbody>	
+  <% @admin_posts.each do |admin_post| %>
+    <tr class="navigation">
+      <td><%= link_to admin_post.title, admin_post %></td>
+      <td><%= admin_post.created_at %></td>
+      <td><%= admin_post.updated_at %></td>
+      <td><%= link_to ts("Show"), admin_post %></td>
+      <td><%= link_to ts("Edit"), edit_admin_post_path(admin_post) %></td>
+      <td><%= link_to ts("Delete"), admin_post, :confirm => 'Are you sure?', :method => :delete %></td>
+    </tr>
+  <% end %> 
+</tbody>
+</table>
 </div>
 <!--/content-->
 <!--subnav-->

diff --git a/app/views/admin_posts/_admin_post_form.html.erb b/app/views/admin_posts/_admin_post_form.html.erb
@@ -1,7 +1,7 @@
 <div id="work-form">
-  <%= form_for(@admin_post) do |f| %>
-    <%= error_messages_for @admin_post %>
-
+	<%= form_for(@admin_post) do |f| %>
+	<%= error_messages_for @admin_post %>
+	
     <input type="hidden" name="admin_post[admin_id]" value="<%= current_admin.id %>" />
     <p class="notice required"><%= ts("* Required information") %></p>
       <p>

diff --git a/app/views/admin_posts/_sidebar.html.erb b/app/views/admin_posts/_sidebar.html.erb
@@ -1,6 +1,6 @@
 <div id="dashboard" class="admin">
 	<h3 class="landmark">Page Summary</h3>
-	<ul role="navigation">
+	<ul class="navigation" role="navigation">
 	  <% @admin_posts.each do |admin_post| %>
   		<li><%= span_if_current admin_post.title + " (#{admin_post.count_visible_comments})", admin_post %></li>
     <% end %>

diff --git a/app/views/admin_posts/edit.html.erb b/app/views/admin_posts/edit.html.erb
@@ -3,6 +3,7 @@
 <!--/descriptions-->
 
 <!--subnav-->
+<%= render :partial => 'admin/admin_nav' %>
 <!--/subnav-->
 
 <!--main content-->

diff --git a/app/views/admin_posts/show.html.erb b/app/views/admin_posts/show.html.erb
@@ -11,7 +11,7 @@
 
 <!--main content-->
 <div class="admin" role="article">
-  <div class="admin-header">
+  <div class="header">
     <h3>
       <%= @admin_post.title %>
     </h3>
@@ -37,7 +37,7 @@
       </dl>
     <% end %>
   </div>
-  <div class="admin-content userstuff">
+  <div class="userstuff">
       <%=raw sanitize_field(@admin_post, :content) %>
   </div>
 </div>

diff --git a/app/views/bookmarks/_bookmark_form.html.erb b/app/views/bookmarks/_bookmark_form.html.erb
@@ -5,19 +5,23 @@
 <% end %>
 
 <%= form_for([bookmarkable, bookmark], :url => {:controller => 'bookmarks', :action => action}) do |f| %>
-<p><label><%= ts("Pseud") %>:</label>
-    <% if current_user.pseuds.count > 1 %>
+<fieldset>
+<dl>
+<dt class="landmark"><label><%= ts("Pseud") %>:</label></dt>
+    <dd>
+	<% if current_user.pseuds.count > 1 %>
       <%= select_tag "bookmark[pseud_id]", options_for_select(current_user.pseuds.map{|pseud| [pseud.name, pseud.id]}, bookmark.pseud ? bookmark.pseud.id : current_user.default_pseud.id) %>
     <% else %>
     <%= current_user.default_pseud.name %>
       <%= f.hidden_field :pseud_id, :value => "#{current_user.default_pseud.id}" %>
     <% end %>
-</p>
+</dd>
+</dl>
+</fieldset>
 <% if bookmarkable.class == ExternalWork && bookmarkable.new_record? %>
   <%= fields_for 'bookmark[external]', bookmarkable do |ew| %>
   <fieldset>
-    <legend>Work Preface</legend>
-  <dl>
+ <dl>
     <dt><%= ew.label :url, ts("URL") %>:</dt>
     <dd>
       <% if !params[:url_from_external].blank? %>
@@ -63,7 +67,7 @@
   </dl>
   </fieldset>
   <fieldset>
-    <legend>Work Tags</legend>
+    <legend>Add tags</legend>
     <p><%= ts("Author's Tags (comma separated, %{max} characters per tag). Please note that only fandom is required.", :max => ArchiveConfig.TAG_MAX) %>
     <%= link_to_help "tagging-help" %></p>
   <dl>
@@ -102,25 +106,27 @@
   <% end %>
 <% end %>
 <fieldset>
-  <legend>Bookmark Comments</legend>
+  <legend>Write Comments</legend>
 <dl>
-  <dt><%= f.label :notes, ts("Your Notes") %></dt>
+  <dt class="landmark"><%= f.label :notes, ts("Notes") %></dt>
   <dd>
     <%= allowed_html_instructions %>
     <%= f.text_area :notes, :rows => 4, :class => "notes-field observe_textlength" %>
     <%= generate_countdown_html("bookmark_notes", ArchiveConfig.NOTES_MAX) %>
   </dd>
 
-  <dt><%= f.label :tag_string, ts("Your Tags") %></dt>
-  <dd>
-    <% dynamic ||= false %>
+	<dt class="landmark"><%= f.label :tag_string, ts("Your Tags") %></dt>
+	<dd>
+	  <% dynamic ||= false %>
     <%= f.text_field :tag_string, autocomplete_options('tag?type=all', :size => (dynamic ? 60 : 80)) %>
     <p class="character_counter">
       <%= ts("Comma separated, %{max} characters per tag", :max => ArchiveConfig.TAG_MAX) %>
     </p>
   </dd>
 </dl>
 </fieldset>
+<fieldset>
+<legend>Choose type and submit</legend>
 <% if bookmarkable.class != ExternalWork %>
   <p><%= ts("Please note that the author's summary and tags will be added automatically.") %>
 <% end %>
@@ -136,5 +142,6 @@
     <%= link_to ts("Back to My Bookmarks"), user_bookmarks_path(current_user) %>
   <% end %>
 </p>
+</fieldset>
 <% end %>
 </div>
diff --git a/app/views/bookmarks/_bookmark_full_info.html.erb b/app/views/bookmarks/_bookmark_full_info.html.erb
@@ -40,26 +40,21 @@
 </ul>
 
  <div class="user module<% if is_author_of?(bookmark) %> own<% end %>">
-
-<!--time, bookmarker-->
-  <p class="datetime"><%= set_format_for_date(bookmark.created_at) %></p>
-  <h5 class="byline">
-    <%= ts("Bookmarked by ") %>
+<!--bookmarker, time-->
+<h5 class="byline">
+    <%= ts("Last bookmarked by ") %>
     <%= link_to(bookmark.pseud.byline, user_pseud_path(bookmark.pseud.user, bookmark.pseud)) %>
   </h5>
+  <p class="datetime"><%= set_format_for_date(bookmark.created_at) %></p>
 
 <!--tags-->
  <% unless bookmark.tag_string.blank? %>
-      <dl class="tags">
-        <dt><%= ts "Bookmarker's Tags:" %></dt>
-        <dd>
-          <ul>
+      <h6 class="landmark">Tags</h6>
+		<ul class="tags">
             <% bookmark.tags.each do |tag| %>
               <li><%= link_to(tag.name, link_to_tag_bookmarks(tag), :class => 'tag') %><% unless tag == bookmark.tags.last %><%= "," %><% end %></li>
             <% end %>
           </ul>
-        </dd>
-      </dl>
   <% end %>
 
 <!--notes-->

diff --git a/app/views/bookmarks/_bookmark_user_info.html.erb b/app/views/bookmarks/_bookmark_user_info.html.erb
@@ -1,28 +1,25 @@
 <!-- This partial requires local variable 'bookmark' -->
-<li class="user<% if is_author_of?(bookmark) %> own<% end %>">
+<li class="user<% if is_author_of?(bookmark) %> own<% end %> picture blurb">
 	<div class="header module">
   	<h5 class="byline">
       <%= ts("Bookmarked by ") %>
       <%= link_to(bookmark.pseud.byline, user_pseud_path(bookmark.pseud.user, bookmark.pseud)) %>
     </h5>
-    <p class="datetime"><%= set_format_for_date(bookmark.created_at) %></p>
-  	<%= get_symbol_for_bookmark(bookmark) %>
+  	 <div class="icon"></div>
+	<p class="datetime"><%= set_format_for_date(bookmark.created_at) %></p>
 	</div>
 <!--tags-->
     <% unless bookmark.tag_string.blank? %>
-        <dl class="tags">
-          <dt><%= ts "Bookmarker's Tags:" %></dt>
-          <dd>
-            <ul class="tags">
+        <h6 class="landmark"><%= ts "Bookmarker's Tags:" %></h6>
+          <ul class="tags">
               <% bookmark.tags.each do |tag| %>
                 <li><%= link_to(tag.name, link_to_tag_bookmarks(tag), :class => 'tag') %><% unless tag == bookmark.tags.last %><%= "," %><% end %></li>
               <% end %>
             </ul>
-          </dd>
-        </dl>
     <% end %>
 <!--summary-->    
 	<% unless bookmark.notes.blank? %>
+        <h6 class="landmark">Notes</h6>
     <blockquote class="userstuff summary" title="notes">
 		<%=raw sanitize_field(bookmark, :notes) %>
 	  </blockquote>

diff --git a/app/views/bookmarks/_bookmarks.html.erb b/app/views/bookmarks/_bookmarks.html.erb
@@ -24,7 +24,7 @@
 
 <% elsif params[:show_recent] %>
 <!-- The javascript expanded view that shows more bookmarks for a particular work on an aggregated view -->  
-   <ul class="recent-bookmarks">
+   <ul class="recent">
    <% for bookmark in @recent_bookmarks %>
      <%= render :partial => 'bookmarks/bookmark_user_info', :locals => {:bookmark => bookmark} %>         
    <% end %>

diff --git a/app/views/bookmarks/_search_form.html.erb b/app/views/bookmarks/_search_form.html.erb
@@ -56,10 +56,8 @@
       <%= text_field_tag "query[text]", @query[:text], :id => 'refine_text' %>
       <%= link_to_help "bookmark-search-text-help" %>
     </dd> 
-  </dl>
-  </p>
-  <span class="submit">
-    <%= submit_tag t('.bookmarks.search', :default => 'Search bookmarks'), :name => nil %>
-  </span>
+	<dt class="landmark">Submit</dt>
+	<dd class="submit"><%= submit_tag t('.bookmarks.search', :default => 'Search bookmarks'), :name => nil %></dd>
+</dl>
 </fieldset>
 <% end %>
diff --git a/app/views/collection_items/_collection_item_form.html.erb b/app/views/collection_items/_collection_item_form.html.erb
@@ -2,8 +2,7 @@
 <% @collection_item ||= CollectionItem.new %>
 <% dynamic ||= false %>
 <div id="collection-form">
-  <h3><% ts("Add %{title} to collections", :title => item.title) %>
-  </h3>
+  <h3><% ts("Add %{title} to collections", :title => item.title) %></h3>
 
 <%= form_for([item, @collection_item], :url => {:controller => 'collection_items', :action => :create}) do |form| %>
   <p>

diff --git a/app/views/collection_items/index.html.erb b/app/views/collection_items/index.html.erb
@@ -7,7 +7,7 @@
 <!--/subnav-->
 
 <!--main content-->
-  <table id="collection_items_table" summary="This table shows the items you have submitted to collections; you can approve or reject or remove them.">
+  <div class="wrapper"><table id="collection_items_table" summary="This table shows the items you have submitted to collections; you can approve or reject or remove them.">
   <caption><%=h t('.ci_index.list', :default => "List of items in collections by %{user}", :user => @user.login) %></caption>  
 
 <% else %>
@@ -49,7 +49,7 @@
   <th scope="col"><%= link_to(ts("Word Count"), controller.request.fullpath.split('?').first + "?sort=word_count") %></th>  
   <th scope="col"><%= link_to(ts("Date Last Updated"), controller.request.fullpath.split('?').first + "?sort=date") %></th>  
 
-  <th scope="col" class="twobutton"><%=h t('.ci_index.manage', :default => "Manage") %></th>
+  <th scope="col"><%=h t('.ci_index.manage', :default => "Manage") %></th>
 </tr>
 </thead>
 <tbody>
@@ -58,4 +58,5 @@
 <% end %>
 </tbody>
 </table>
+</div>
 <!--/content-->
diff --git a/app/views/collection_participants/_add_participants_form.html.erb b/app/views/collection_participants/_add_participants_form.html.erb
@@ -4,6 +4,6 @@
 <%= text_field_tag :participants_to_invite, nil, autocomplete_options("pseud", :size => 60) %>
 </td>
 <td><!--missing select role dropdown?-->&nbsp;</td>
-	<td><%= submit_tag ts("Submit") %></td>
+	<td><span class="submit"><%= submit_tag ts("Submit") %></span></td>
 <% end %>
 </tr>