diff .svn/pristine/d1/d12fedcbe9f8547cfa6f4a11afa8ce1f7c83ddcf.svn-base @ 935:fe0249c097f6 live

Merge from the default branch
author Chris Cannam
date Wed, 11 Jul 2012 13:33:14 +0100
parents cbb26bc654de
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/d1/d12fedcbe9f8547cfa6f4a11afa8ce1f7c83ddcf.svn-base	Wed Jul 11 13:33:14 2012 +0100
@@ -0,0 +1,12 @@
+<h2><%= link_to l(:label_user_plural), users_path %> &#187; <%=l(:label_user_new)%></h2>
+
+<% form_for @user, :builder => TabularFormBuilder do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <% if email_delivery_enabled? %>
+  <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
+  <% end %>
+  <p>
+    <%= submit_tag l(:button_create) %>
+    <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
+  </p>
+<% end %>