sync

app/views/posts/index.html.erb

@@ -1,4 +1,4 @@
-<% unless @post_set.suggestions.blank? %>
+<% if @post_set.suggestions.any? %>
   <div class="notice">
     Maybe you meant: <%= @post_set.suggestions.map {|x| link_to(x, posts_path(:tags => x), :class => "tag-type-#{Tag.type_name(x)}" )}.to_sentence(:last_word_connector => ", or ", :two_words_connector => " or ") %>
   </div>
@@ -13,7 +13,7 @@
     <% end %>    
   </section>
   
-  <% if @current_user.is_privileged? %>
+  <% if CurrentUser.user.is_privileged? %>
     <section id="mode-box">
       <h1>Mode</h1>
       <form action="/">
@@ -31,7 +31,7 @@
           <option value="lock-note">Lock notes</option>
           <option value="edit-tag-script">Edit tag script</option>
           <option value="apply-tag-script">Apply tag script</option>
-          <% if @current_user.is_janitor? %>
+          <% if CurrentUser.user.is_janitor? %>
             <option value="approve">Approve</option>
           <% end %>
           <option value="unapprove">Unapprove</option>
@@ -60,7 +60,7 @@
     
     <section id="wiki-box">
       <h2>Wiki</h2>
-      <%= @post_set.presenter.wiki_html %>
+      <%= @post_set.presenter.wiki_html(self) %>
     </section>
   </div>
 </aside>
@@ -78,4 +78,4 @@
   / <%= @post_set.tags %>
 <% end %>
 
-<%= render :partial => "posts/common_secondary_nav_links" %>
+<%= render :partial => "posts/partials/common/secondary_links" %>

app/views/posts/partials/common/_secondary_links.html.erb

@@ -1,4 +1,4 @@
-<% content_for(:secondary_nav_links) do %>
+<% content_for(:secondary_links) do %>
   <menu>
     <li><%= link_to "Listing", posts_path %></li>
     <li><%= link_to "Upload", new_upload_path %></li>

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

@@ -1,5 +1,5 @@
 <div id="edit">
-  <% unless @current_user.is_contributor? %>
+  <% unless CurrentUser.user.is_contributor? %>
     <div style="margin-bottom: 1em;">
       <p>Before editing, read the <%= link_to "how to tag guide", wiki_page_path(:id => "howto:tag") %>.</p>
     </div>
@@ -23,7 +23,7 @@
       <% end %>
     </p>
     
-    <% if @current_user.is_privileged? %>
+    <% if CurrentUser.user.is_privileged? %>
       <p>
         <%= f.label :is_note_locked, "Lock notes" %>
         <%= f.check_box :is_note_locked %>

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

@@ -1,2 +1,2 @@
 <%= render :partial => "posts/partials/show/notes", :locals => {:post => post, :notes => post.notes.active} %>
-<%= image_tag(post.file_url_for(@current_user), :alt => post.tag_string, :width => post.image_width_for(@current_user), :height => post.image_height_for(@current_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") %>

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

@@ -1,10 +1,10 @@
 <ul>
-  <%= resize_image_links(post, @current_user) %>
+  <%= resize_image_links(post, CurrentUser.user) %>
   <li><%= link_to "Favorite", "#" %></li>
   <li><%= link_to "Unfavorite", "#" %></li>
   <li><%= link_to "Translate", "#" %></li>
   <li><%= link_to "Unapprove", "#" %></li>
-  <% if @current_user.is_janitor? %>
+  <% if CurrentUser.user.is_janitor? %>
     <li><%= link_to "Approve", "#" %></li>
     <li><%= link_to "Undelete", "#" %></li>
     <li><%= link_to "Delete", "#" %></li>

app/views/posts/show.html.erb

@@ -6,7 +6,7 @@
   
   <section>
     <h1>Tags</h1>
-    <%= @post.presenter.tag_list_html(self, @current_user) %>
+    <%= @post.presenter.tag_list_html(self) %>
   </section>
   
   <section>
@@ -25,7 +25,7 @@
   
   <section>
     <h2>Image</h2>
-    <%= @post.presenter.image_html(self, @current_user) %>
+    <%= @post.presenter.image_html(self) %>
   </section>
   
   <section>
@@ -54,4 +54,4 @@
   <meta name="pools" content="<%= @post.pool_string %>">
 <% end %>
 
-<%= render :partial => "posts/common_secondary_nav_links" %>
+<%= render :partial => "posts/partials/common/secondary_links" %>