add cancel button back, remove right alignment of form buttons

flask_admin/templates/bootstrap2/admin/lib.html

@@ -195,7 +195,7 @@
 
 {% macro render_form_buttons(cancel_url, extra=None, is_modal=False) %}
     <hr>
-    <div class="control-group pull-right">
+    <div class="control-group">
       <div class="controls">
         <input type="submit" class="btn btn-primary" value="{{ _gettext('Save') }}" />
         {% if extra %}

flask_admin/templates/bootstrap2/admin/model/create.html

@@ -23,7 +23,7 @@
   </ul>
   {% endblock %}
 
-  {{ lib.render_form(form, cancel_url=None, extra=extra(), form_opts=form_opts) }}
+  {{ lib.render_form(form, return_url, extra(), form_opts) }}
 {% endblock %}
 
 {% block tail %}

flask_admin/templates/bootstrap2/admin/model/edit.html

@@ -33,7 +33,7 @@
   </ul>
   {% endblock %}
 
-  {{ lib.render_form(form, cancel_url=None, extra=extra(), form_opts=form_opts) }}
+  {{ lib.render_form(form, return_url, extra(), form_opts) }}
 {% endblock %}
 
 {% block tail %}

flask_admin/templates/bootstrap3/admin/lib.html

@@ -186,7 +186,7 @@
 {% macro render_form_buttons(cancel_url, extra=None, is_modal=False) %}
     <hr>
     <div class="form-group">
-      <div class="col-md-offset-2 col-md-10 submit-row text-right">
+      <div class="col-md-offset-2 col-md-10 submit-row">
         <input type="submit" class="btn btn-primary" value="{{ _gettext('Save') }}" />
         {% if extra %}
         {{ extra }}

flask_admin/templates/bootstrap3/admin/model/create.html

@@ -23,7 +23,7 @@
   </ul>
   {% endblock %}
 
-  {{ lib.render_form(form, cancel_url=None, extra=extra(), form_opts=form_opts) }}
+  {{ lib.render_form(form, return_url, extra(), form_opts) }}
 {% endblock %}
 
 {% block tail %}

flask_admin/templates/bootstrap3/admin/model/edit.html

@@ -33,7 +33,7 @@
   </ul>
   {% endblock %}
 
-  {{ lib.render_form(form, cancel_url=None, extra=extra(), form_opts=form_opts) }}
+  {{ lib.render_form(form, return_url, extra(), form_opts) }}
 {% endblock %}
 
 {% block tail %}