locked.rhtml in instiki-0.10.0

- old
+ new
@@ -1,14 +1,23 @@
-<% @title = "#{@page.plain_name} is locked" %><%= sub_template "top" %>
-
-<% if @page.lock_duration(Time.now) == 0 %>
-  <p><%= @page.locked_by_link %> just started editing this page.</p>
-<% else %>
-  <p><%= @page.locked_by_link %> has been editing this page for <%= @page.lock_duration(Time.now) %> minutes.</p>
-<% end %>
-
-<p>
-  <a href="<%= @page.name %>?break_lock=1">Edit the page anyway</a> |
-  <a href="../show/<%= @page.name %>">Cancel</a>
-</p>
-
-<%= sub_template "bottom" %>
\ No newline at end of file
+<% @title = "#{@page.plain_name} is locked" %>
+
+<p>
+  <%= link_to_page(@page.locked_by) %>
+  <% if @page.lock_duration(Time.now) == 0 %>
+    just started editing this page.
+  <% else %>
+    has been editing this page for <%= @page.lock_duration(Time.now) %> minutes.
+  <% end %>
+</p>
+
+<p>
+  <%= link_to 'Edit the page anyway',
+        {:web => @web_name, :action => 'edit', :id => @page.name, :params => {'break_lock' => '1'} },
+        {:accesskey => 'E'}
+  %>
+
+  <%= link_to 'Cancel',
+        {:web => @web_name, :action => 'show', :id => @page.name},
+        {:accesskey => 'C'}
+  %>
+
+</p>