edit_web.rhtml in instiki-0.10.2

- old
+ new

@@ -1,9 +1,11 @@
 <% @title = "Edit Web" %>
 
-<form action="edit_web" id="setup" method="post" 
-      onSubmit="cleanAddress(); return validateEditWebForm()">
+<%= form_tag({ :controller => 'admin', :action => 'edit_web', :web => @web.address },
+             {'id' => 'setup', 'method' => 'post', 'onSubmit' => 'cleanAddress(); return validateSetup()'})
+%>
+
   <h2 style="margin-bottom: 3px">Name and address</h2>
   <div class="help">
     The name of the web is included in the title on all pages. 
     The address is the base path that all pages within the web live beneath. 
     Ex: the address "rails" gives URLs like <i>/rails/show/HomePage</i>.
@@ -111,11 +113,11 @@
     <br/><br/>
     ...or forget changes and <%= link_to 'create a new web', :action => 'create_web' %>
   </small>
 </p>
 
-</form>
+<%= end_form_tag %>
 
 <br/>
 <h1>Other administrative tasks</h1>
 
 <%= form_tag({:controller => 'admin', :web => @web.address, :action => 'remove_orphaned_pages'},
@@ -131,7 +133,6 @@
       <input type="submit" value="Delete Orphan Pages" />
     </small>
   </p>
 <%= end_form_tag %>
 
-<script type="text/javascript" src="/javascripts/edit_web.js" />
-<script type="text/javascript">overrideAutocomplete()</script>
+<%= javascript_include_tag 'edit_web' %>