Merge branch 'master' of github.com:mrjoes/flask-admin into examples

README.rst

@@ -23,7 +23,8 @@ Out-of-the-box, Flask-Admin plays nicely with various ORM's, including
 
 It also boasts a simple file management interface and a `redis client <http://redis.io/>`_ console.
 
-Several usage examples are included in the */examples* folder. Feel free to add your own examples, or improve some of the existing ones, and submit them as a *pull-request*.
+Several usage examples are included in the */examples* folder. Please feel free to add your own examples, or improve
+on some of the existing ones, and then submit them via GitHub as a *pull-request*.
 
 The biggest feature of Flask-Admin is flexibility. It aims to provide a set of simple tools that can be used for
 building admin interfaces of any complexity. So, to start off with you can create a very simple application in no time,
@@ -36,7 +37,8 @@ Documentation
 -------------
 Flask-Admin is extensively documented, you can find all of the documentation at `http://readthedocs.org/docs/flask-admin <http://readthedocs.org/docs/flask-admin>`_.
 
-The docs are auto-generated for the *.rst* files in the */doc* folder. So if you come across any errors, or think of anything that should be included, then please make the changes and submit them as a *pull-request*.
+The docs are auto-generated from the *.rst* files in the */doc* folder. So if you come across any errors, or
+if you think of anything else that should be included, then please make the changes and submit them as a *pull-request*.
 
 Installation
 ------------
@@ -63,8 +65,9 @@ and then::
     cd flask-admin
     nosetests
 
-You should see output such as::
+You should see output similar to::
 
+    ...
     ----------------------------------------------------------------------
     Ran 41 tests in 2.092s
 

doc/changelog.rst

@@ -4,7 +4,7 @@ Changelog
 1.0.7
 -----
 
-Full change log and feature walkthrough can be found `here <http://mrjoes.github.io/2013/03/22/flask-admin-107.html>`_.
+Full change log and feature walkthrough can be found `here <http://mrjoes.github.io/2013/10/21/flask-admin-107.html>`_.
 
 Highlights:
 

doc/db.rst

 Database backends
 =================
 
+The purpose of Flask-Admin is to help you manage your data. For this, it needs some database backend in order to be
+able to access that data in the first place. At present, there are four different backends for you to choose
+from, depending on which database you would like to use for your application.
+
 .. toctree::
    :maxdepth: 2
 
@@ -8,3 +12,17 @@ Database backends
    db_mongoengine
    db_peewee
    db_pymongo
+
+If you don't know where to start, but you're familiar with relational databases, then you should probably look at using
+`SQLAlchemy <http://www.sqlalchemy.org/>`_. It is a full-featured toolkit, with support for SQLite, PostgreSQL, MySQL,
+Oracle and MS-SQL amongst others. It really comes into its own once you have lots of data, and a fair amount of
+relations between your data models.
+
+If you're looking for something simpler, or your data models are reasonably self-contained, then
+`MongoEngine <http://mongoengine.org/>`_ could be a better option. It is a python wrapper around the popular
+*NoSQL* database called `MongoDB <http://www.mongodb.org/>`_.
+
+Of course, if you feel that there's an awesome database wrapper that is missing from the list above, we'd greatly
+appreciate it if you could write the plugin for it and submit it as a pull request. A special section of these docs
+are dedicated to helping you through this process. See :doc:`model_guidelines`.
+

doc/form_rules.rst

 Form rendering rules
---------------------
+====================
 
-Before version 1.0.7, all model backends were rendering the creation and editing forms
-using the special Jinja2 macro, which was looping over WTForms form object fields and displaying
-them one by one.
+Before version 1.0.7, all model backends were rendering the *create* and *edit* forms
+using a special Jinja2 macro, which was looping over the fields of a WTForms form object and displaying
+them one by one. This works well, but it is difficult to customize.
 
-Starting from version 1.0.7, Flask-Admin supports so called form rendering rules.
+Starting from version 1.0.7, Flask-Admin supports form rendering rules, to give you fine grained control of how
+the forms for your modules should be displayed.
 
-Idea is pretty simple: instead of having non-configurable macro that renders the form,
-have a set of rules that tell Flask-Admin how form should be rendered. As an extension
-of the idea, rules can output HTML, call Jinja2 macros, render fields and so on.
+The basic idea is pretty simple: the customizable rendering rules replace a static macro, so that you can tell
+Flask-Admin how each form should be rendered. As an extension, however, the rendering rules also let you do a
+bit more: You can use them to output HTML, call Jinja2 macros, render fields and so on.
 
-Essentially, form rendering rules abstract form rendering away from the form definition. And it
-no longer matters what is sequence of the fields in the form.
+Essentially, form rendering rules abstract the rendering, so that it becomes separate from the form definition. So,
+for example, it no longer matters in which sequence yur form fields are defined.
 
 Getting started
 ---------------
 
-To start using form rendering rules, you need to put list of form field names into `form_create_rules`
-property of your administrative view::
+To start using the form rendering rules, put a list of form field names into the `form_create_rules`
+property one of your admin views::
 
 	class RuleView(sqla.ModelView):
 	    form_create_rules = ('email', 'first_name', 'last_name')
 
 In this example, only three fields will be rendered and `email` field will be above other two fields.
 
-Whenever Flask-Admin sees string as a value in `form_create_rules`, it automatically assumes that it is
-form field reference and created :class:`flask.ext.admin.form.rules.Field` class instance.
+Whenever Flask-Admin sees a string value in `form_create_rules`, it automatically assumes that it is a
+form field reference and creates a :class:`flask.ext.admin.form.rules.Field` class instance for that field.
 
-Lets say we want to display 'Foobar' text between `email` and `first_name` fields. This can be accomplished by
-using :class:`flask.ext.admin.form.rules.Text` class::
+Lets say we want to display some text between the `email` and `first_name` fields. This can be accomplished by
+using the :class:`flask.ext.admin.form.rules.Text` class::
 
 	from flask.ext.admin.form import rules
 
 	class RuleView(sqla.ModelView):
 	    form_create_rules = ('email', rules.Text('Foobar'), 'first_name', 'last_name')
 
-Flask-Admin comes with few built-in rules that can be found in :mod:`flask.ext.admin.form.rules` module:
+Built-in rules
+--------------
 
+Flask-Admin comes with few built-in rules that can be found in the :mod:`flask.ext.admin.form.rules` module:
+
+======================================================= ========================================================
+Form Rendering Rule                                     Description
 ======================================================= ========================================================
 :class:`flask.ext.admin.form.rules.BaseRule`            All rules derive from this class
 :class:`flask.ext.admin.form.rules.NestedRule`          Allows rule nesting, useful for HTML containers
@@ -50,5 +56,8 @@ Flask-Admin comes with few built-in rules that can be found in :mod:`flask.ext.a
 :class:`flask.ext.admin.form.rules.FieldSet`            Renders form header and child rules
 ======================================================= ========================================================
 
+Further reading
+---------------
+
 For additional documentation, check :mod:`flask.ext.admin.form.rules` module source code (it is quite short) and
-look at the `forms` example.
+look at the `forms example <https://github.com/mrjoes/flask-admin/tree/master/examples/forms>`_ on GitHub.

doc/index.rst

@@ -17,8 +17,8 @@ Browse through the documentation below to learn more about what you can do with
    localization
    tips
    db
-   form_rules
    model_guidelines
+   form_rules
    api/index
    changelog
    renamed_columns

flask_admin/static/admin/js/form.js

@@ -187,8 +187,8 @@
       };
     };
 
-    // Add live event handler
-    $('.fa-remove-field').live('click', function(e) {
+    // Add on event handler
+    $('body').on('click', '.fa-remove-field' , function(e) {
         e.preventDefault();
 
         var form = $(this).closest('.fa-inline-field');