From 77dfd9170219e9f6192a4b7f2eac40b48f63ed80 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Sat, 25 May 2013 19:49:19 -0400
Subject: [PATCH] fixes #1658; fixes #1592

---
 app/views/artist_versions/index.html.erb       | 2 +-
 app/views/note_versions/index.html.erb         | 4 ++--
 app/views/pool_versions/index.html.erb         | 2 +-
 app/views/post_versions/_listing.html.erb      | 4 ++--
 app/views/wiki_page_versions/show.html.erb     | 4 ----
 app/views/wiki_pages/_secondary_links.html.erb | 3 +++
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/views/artist_versions/index.html.erb b/app/views/artist_versions/index.html.erb
index 6d092e284..c2e8aee25 100644
--- a/app/views/artist_versions/index.html.erb
+++ b/app/views/artist_versions/index.html.erb
@@ -38,7 +38,7 @@
               </td>
               <% if CurrentUser.is_member? %>
                 <td>
-                  <%= link_to "Revert", revert_artist_path(artist_version.artist_id, :version_id => artist_version.id), :method => :put, :confirm => "Are you sure you want to revert this artist?" %>
+                  <%= link_to "Revert to", revert_artist_path(artist_version.artist_id, :version_id => artist_version.id), :method => :put, :confirm => "Are you sure you want to revert to this version?" %>
                 </td>
               <% end %>
             </tr>
diff --git a/app/views/note_versions/index.html.erb b/app/views/note_versions/index.html.erb
index b21035602..dc20624c1 100644
--- a/app/views/note_versions/index.html.erb
+++ b/app/views/note_versions/index.html.erb
@@ -15,7 +15,7 @@
           <th width="10%">Edited By</th>
           <th width="10%">Date</th>
           <% if CurrentUser.is_member? %>
-            <th width="5%"></th>
+            <th width="7%"></th>
           <% end %>
         </tr>
       </thead>
@@ -35,7 +35,7 @@
             <td><%= compact_time note_version.updated_at %></td>
             <% if CurrentUser.is_member? %>
               <td>
-                <%= link_to "Revert", revert_note_path(note_version.note_id, :version_id => note_version.id), :remote => true, :method => :put, :confirm => "Do you really want to revert to this version?" %>
+                <%= link_to "Revert to", revert_note_path(note_version.note_id, :version_id => note_version.id), :remote => true, :method => :put, :confirm => "Are you sure you want to revert to this version?" %>
               </td>
             <% end %>
           </tr>
diff --git a/app/views/pool_versions/index.html.erb b/app/views/pool_versions/index.html.erb
index 4fb00410b..06230e305 100644
--- a/app/views/pool_versions/index.html.erb
+++ b/app/views/pool_versions/index.html.erb
@@ -33,7 +33,7 @@
             <td><%= compact_time pool_version.updated_at %></td>
             <% if CurrentUser.is_member? %>
               <td>
-                <%= link_to "Revert", revert_pool_path(pool_version.pool_id, :version_id => pool_version.id), :method => :put, :remote => true %>
+                <%= link_to "Revert to", revert_pool_path(pool_version.pool_id, :version_id => pool_version.id), :method => :put, :remote => true %>
               </td>
             <% end %>
           </tr>
diff --git a/app/views/post_versions/_listing.html.erb b/app/views/post_versions/_listing.html.erb
index 2d10e98e8..e716a6626 100644
--- a/app/views/post_versions/_listing.html.erb
+++ b/app/views/post_versions/_listing.html.erb
@@ -12,7 +12,7 @@
         <% end %>
         <th>Tags</th>
         <% if CurrentUser.is_member? %>
-          <th width="5%"></th>
+          <th width="7%"></th>
         <% end %>
       </tr>
     </thead>
@@ -36,7 +36,7 @@
           <td><%= post_version_diff(post_version) %></td>
           <% if CurrentUser.is_member? %>
             <td>
-              <%= link_to "Revert", revert_post_path(post_version.post_id, :version_id => post_version.id), :method => :put, :remote => true %>
+              <%= link_to "Revert to", revert_post_path(post_version.post_id, :version_id => post_version.id), :method => :put, :remote => true %>
             </td>
           <% end %>
         </tr>
diff --git a/app/views/wiki_page_versions/show.html.erb b/app/views/wiki_page_versions/show.html.erb
index 1192f0774..b8fdb58be 100644
--- a/app/views/wiki_page_versions/show.html.erb
+++ b/app/views/wiki_page_versions/show.html.erb
@@ -8,10 +8,6 @@
       <div id="wiki-page-body" class="dtext prose">
         <%= format_text(@wiki_page_version.body) %>
       </div>
-      
-      <% if CurrentUser.is_member? %>
-        <p><%= link_to "Revert to this version", revert_wiki_page_path(@wiki_page_version.wiki_page_id, :version_id => @wiki_page_version.id), :method => :put %></p>
-      <% end %>
     </section>
   </div>
 </div>
diff --git a/app/views/wiki_pages/_secondary_links.html.erb b/app/views/wiki_pages/_secondary_links.html.erb
index de791d74c..a71429138 100644
--- a/app/views/wiki_pages/_secondary_links.html.erb
+++ b/app/views/wiki_pages/_secondary_links.html.erb
@@ -26,6 +26,9 @@
     <% if @wiki_page_version %>
       <li>|</li>
       <li><%= link_to "Newest", wiki_page_path(@wiki_page_version.wiki_page_id) %></li>
+      <% if CurrentUser.is_member? %>
+        <li><%= link_to "Revert to", revert_wiki_page_path(@wiki_page_version.wiki_page_id, :version_id => @wiki_page_version.id), :method => :put, :confirm => "Are you sure you want to revert to this version?" %></li>
+      <% end %>
     <% end %>
   </menu>
 <% end %>