Merge branch 'master' of github.com:mrjoes/flask-admin into exc-message-fix

Conflicts:
	flask_admin/contrib/sqla/view.py

doc/api/mod_actions.rst

-``flask.ext.admin.actions``
+``flask_admin.actions``
 ===========================
 
-.. automodule:: flask.ext.admin.actions
+.. automodule:: flask_admin.actions
 
     .. autofunction:: action
 

doc/api/mod_base.rst

-``flask.ext.admin.base``
+``flask_admin.base``
 ========================
 
-.. automodule:: flask.ext.admin.base
+.. automodule:: flask_admin.base
 
     Base View
     ---------

doc/api/mod_contrib_fileadmin.rst

-``flask.ext.admin.contrib.fileadmin``
+``flask_admin.contrib.fileadmin``
 =====================================
 
-.. automodule:: flask.ext.admin.contrib.fileadmin
+.. automodule:: flask_admin.contrib.fileadmin
 
     .. autoclass:: FileAdmin
         :members:

doc/api/mod_contrib_mongoengine.rst

-``flask.ext.admin.contrib.mongoengine``
+``flask_admin.contrib.mongoengine``
 =======================================
 
 MongoEngine model backend implementation.
 
-.. automodule:: flask.ext.admin.contrib.mongoengine
+.. automodule:: flask_admin.contrib.mongoengine
 
     .. autoclass:: ModelView
         :members:
@@ -12,7 +12,7 @@ MongoEngine model backend implementation.
                           filter_converter, model_form_converter
                           allowed_search_types, form_subdocuments
 
-		Class inherits configuration options from :class:`~flask.ext.admin.model.BaseModelView` and they're not displayed here.
+		Class inherits configuration options from :class:`~flask_admin.model.BaseModelView` and they're not displayed here.
 
         .. autoattribute:: column_filters
         .. autoattribute:: column_type_formatters

doc/api/mod_contrib_mongoengine_fields.rst

-``flask.ext.admin.contrib.mongoengine.fields``
+``flask_admin.contrib.mongoengine.fields``
 ==============================================
 
-.. automodule:: flask.ext.admin.contrib.mongoengine.fields
+.. automodule:: flask_admin.contrib.mongoengine.fields
 
 	.. autoclass:: ModelFormField
 		:members:
@@ -11,4 +11,3 @@
 
 	.. autoclass:: MongoImageField
 		:members:
-

doc/api/mod_contrib_peewee.rst

-``flask.ext.admin.contrib.peewee``
+``flask_admin.contrib.peewee``
 ==================================
 
 Peewee model backend implementation.
 
-.. automodule:: flask.ext.admin.contrib.peewee
+.. automodule:: flask_admin.contrib.peewee
 
     .. autoclass:: ModelView
         :members:
@@ -11,7 +11,7 @@ Peewee model backend implementation.
         :exclude-members: column_filters, filter_converter, model_form_converter,
                           inline_model_form_converter, fast_mass_delete, inline_models
 
-        Class inherits configuration options from :class:`~flask.ext.admin.model.BaseModelView` and they're not displayed here.
+        Class inherits configuration options from :class:`~flask_admin.model.BaseModelView` and they're not displayed here.
 
         .. autoattribute:: column_filters
         .. autoattribute:: filter_converter

doc/api/mod_contrib_pymongo.rst

-``flask.ext.admin.contrib.pymongo``
+``flask_admin.contrib.pymongo``
 ===================================
 
 PyMongo model backend implementation.
 
-.. automodule:: flask.ext.admin.contrib.pymongo
+.. automodule:: flask_admin.contrib.pymongo
 
     .. autoclass:: ModelView
         :members:
         :inherited-members:
         :exclude-members: column_filters
 
-		Class inherits configuration options from :class:`~flask.ext.admin.model.BaseModelView` and they're not displayed here.
+		Class inherits configuration options from :class:`~flask_admin.model.BaseModelView` and they're not displayed here.
 
         .. autoattribute:: column_filters

doc/api/mod_contrib_sqla.rst

-``flask.ext.admin.contrib.sqla``
+``flask_admin.contrib.sqla``
 ================================
 
 SQLAlchemy model backend implementation.
 
-.. automodule:: flask.ext.admin.contrib.sqla
+.. automodule:: flask_admin.contrib.sqla
 
     .. autoclass:: ModelView
         :members:
@@ -15,7 +15,7 @@ SQLAlchemy model backend implementation.
                           inline_models, form_choices,
                           form_optional_types
 
-        Class inherits configuration options from :class:`~flask.ext.admin.model.BaseModelView` and they're not displayed here.
+        Class inherits configuration options from :class:`~flask_admin.model.BaseModelView` and they're not displayed here.
 
         .. autoattribute:: column_auto_select_related
         .. autoattribute:: column_select_related_list

doc/api/mod_form.rst

-``flask.ext.admin.form``
+``flask_admin.form``
 ========================
 
-.. automodule:: flask.ext.admin.form
+.. automodule:: flask_admin.form
 
     .. autoclass:: BaseForm
         :members:

doc/api/mod_form_fields.rst

-``flask.ext.admin.form.fields``
-===============================
+``flask_admin.form.fields``
+===========================
 
-.. automodule:: flask.ext.admin.form.fields
+.. automodule:: flask_admin.form.fields
 
 	.. autoclass:: TimeField
 		:members:

doc/api/mod_form_rules.rst

-``flask.ext.admin.form.rules``
-==============================
+``flask_admin.form.rules``
+==========================
 
-.. automodule:: flask.ext.admin.form.rules
+.. automodule:: flask_admin.form.rules
 
 	.. autoclass:: BaseRule
 		:members: __init__
@@ -35,4 +35,3 @@
 
 	.. autoclass:: FieldSet
 		:members: __init__
-

doc/api/mod_form_upload.rst

-``flask.ext.admin.form.upload``
+``flask_admin.form.upload``
 ===============================
 
-.. automodule:: flask.ext.admin.form.upload
+.. automodule:: flask_admin.form.upload
 
 	.. autoclass:: FileUploadField
 		:members: __init__

doc/api/mod_helpers.rst

-``flask.ext.admin.helpers``
+``flask_admin.helpers``
 ===========================
 
-.. automodule:: flask.ext.admin.helpers
+.. automodule:: flask_admin.helpers
 
     .. autofunction:: get_current_view
 
@@ -17,4 +17,3 @@
 
     .. autofunction:: resolve_ctx
     .. autofunction:: get_render_ctx
-

doc/api/mod_model.rst

-``flask.ext.admin.model``
+``flask_admin.model``
 =========================
 
-.. automodule:: flask.ext.admin.model
+.. automodule:: flask_admin.model
 
     .. autoclass:: BaseModelView
         :members:

doc/api/mod_model_template.rst

-``flask.ext.admin.model.template``
+``flask_admin.model.template``
 ==================================
 
-.. automodule:: flask.ext.admin.model.template
+.. automodule:: flask_admin.model.template
 
 	.. autofunction:: macro
-
-

doc/api/mod_tools.rst

-``flask.ext.admin.tools``
+``flask_admin.tools``
 =========================
 
-.. automodule:: flask.ext.admin.tools
+.. automodule:: flask_admin.tools
 
     .. autofunction:: import_module
     .. autofunction:: import_attribute
     .. autofunction:: module_not_found
     .. autofunction:: rec_getattr
-

doc/db_geoa.rst

@@ -37,12 +37,12 @@ Creating simple model
 ---------------------
 
 GeoAlchemy comes with a `Geometry`_ field that is carefully divorced from the
-`Shapely`_ library. Flask-Admin will use this field so that there are no 
-changes necessary to other code. ``ModelView`` should be imported from 
+`Shapely`_ library. Flask-Admin will use this field so that there are no
+changes necessary to other code. ``ModelView`` should be imported from
 ``geoa`` rather than the one imported from ``sqla``::
 
     from geoalchemy2 import Geometry
-    from flask.ext.admin.contrib.geoa import ModelView
+    from flask_admin.contrib.geoa import ModelView
 
     # .. flask initialization
     db = SQLAlchemy(app)

doc/db_pymongo.rst

@@ -11,7 +11,7 @@ with PyMongo:
 
  1. Provide list of columns by setting `column_list` property
  2. Provide form to use by setting `form` property
- 3. When instantiating :class:`flask.ext.admin.contrib.pymongo.ModelView` class, you have to provide PyMongo collection object
+ 3. When instantiating :class:`flask_admin.contrib.pymongo.ModelView` class, you have to provide PyMongo collection object
 
 This is minimal PyMongo view::
 

doc/db_sqla.rst

@@ -22,9 +22,9 @@ If you use Flask-SQLAlchemy, this is how you initialize Flask-Admin
 and get session from the `SQLAlchemy` object::
 
     from flask import Flask
-    from flask.ext.sqlalchemy import SQLAlchemy
-    from flask.ext.admin import Admin
-    from flask.ext.admin.contrib.sqla import ModelView
+    from flask_sqlalchemy import SQLAlchemy
+    from flask_admin import Admin
+    from flask_admin.contrib.sqla import ModelView
 
     app = Flask(__name__)
     # .. read settings
@@ -73,7 +73,7 @@ Customizing administrative interface
 List view can be customized in different ways.
 
 First of all, you can use various class-level properties to configure
-what should be displayed and how. For example, :attr:`~flask.ext.admin.contrib.sqla.ModelView.column_list` can be used to show some of
+what should be displayed and how. For example, :attr:`~flask_admin.contrib.sqla.ModelView.column_list` can be used to show some of
 the column or include extra columns from related models.
 
 For example::
@@ -89,7 +89,7 @@ For example::
         # Add filters for name and email columns
         column_filters = ('name', 'email')
 
-Alternatively, you can override some of the :class:`~flask.ext.admin.contrib.sqla.ModelView` methods and implement your custom logic.
+Alternatively, you can override some of the :class:`~flask_admin.contrib.sqla.ModelView` methods and implement your custom logic.
 
 For example, if you need to contribute additional field to the generated form,
 you can do something like this::

doc/django_migration.rst

@@ -43,9 +43,9 @@ Let's write a bit of code to create a simple CRUD interface for the `Post` SQLAl
 Flask-SQLAlchemy extension, but you don't have to use it (you could also use the SQLAlchemy declarative extension)::
 
     from flask import Flask
-    from flask.ext.admin import Admin
-    from flask.ext.admin.contrib.sqla import ModelView
-    from flask.ext.sqlalchemy import SQLAlchemy
+    from flask_admin import Admin
+    from flask_admin.contrib.sqla import ModelView
+    from flask_sqlalchemy import SQLAlchemy
 
     app = Flask(__name__)
     db = SQLAlchemy(app)
@@ -91,17 +91,17 @@ SQLAlchemy backend. You can also see which *django-admin* properties they corres
 Django                                      Flask-Admin
 =========================================== ==============================================
 actions										:doc:`api/mod_actions`
-exclude										:attr:`~flask.ext.admin.model.BaseModelView.form_excluded_columns`
-fields										:attr:`~flask.ext.admin.model.BaseModelView.form_columns`
-form 										:attr:`~flask.ext.admin.model.BaseModelView.form`
-formfield_overrides 						:attr:`~flask.ext.admin.model.BaseModelView.form_args`
-inlines										:attr:`~flask.ext.admin.contrib.sqlalchemy.ModelView.inline_models`
-list_display 								:attr:`~flask.ext.admin.model.BaseModelView.column_list`
-list_filter									:attr:`~flask.ext.admin.contrib.sqlalchemy.ModelView.column_filters`
-list_per_page 								:attr:`~flask.ext.admin.model.BaseModelView.page_size`
-search_fields								:attr:`~flask.ext.admin.model.BaseModelView.column_searchable_list`
-add_form_template							:attr:`~flask.ext.admin.model.BaseModelView.create_template`
-change_form_template						:attr:`~flask.ext.admin.model.BaseModelView.change_form_template`
+exclude										:attr:`~flask_admin.model.BaseModelView.form_excluded_columns`
+fields										:attr:`~flask_admin.model.BaseModelView.form_columns`
+form 										:attr:`~flask_admin.model.BaseModelView.form`
+formfield_overrides 						:attr:`~flask_admin.model.BaseModelView.form_args`
+inlines										:attr:`~flask_admin.contrib.sqlalchemy.ModelView.inline_models`
+list_display 								:attr:`~flask_admin.model.BaseModelView.column_list`
+list_filter									:attr:`~flask_admin.contrib.sqlalchemy.ModelView.column_filters`
+list_per_page 								:attr:`~flask_admin.model.BaseModelView.page_size`
+search_fields								:attr:`~flask_admin.model.BaseModelView.column_searchable_list`
+add_form_template							:attr:`~flask_admin.model.BaseModelView.create_template`
+change_form_template						:attr:`~flask_admin.model.BaseModelView.change_form_template`
 =========================================== ==============================================
 
 You might want to check :doc:`api/mod_model` for basic model configuration options (reused by all model
@@ -158,4 +158,3 @@ Tips and hints
 
  5. There's a so called "index view". By default it is empty, but you can put any information you need there. It is displayed
     under the *Home* menu option.
-

doc/form_rules.rst

@@ -27,12 +27,12 @@ property one of your admin views::
 In this example, only three fields will be rendered and `email` field will be above other two fields.
 
 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.
+form field reference and creates a :class:`flask_admin.form.rules.Field` class instance for that field.
 
 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::
+using the :class:`flask_admin.form.rules.Text` class::
 
-    from flask.ext.admin.form import rules
+    from flask_admin.form import rules
 
     class RuleView(sqla.ModelView):
         form_create_rules = ('email', rules.Text('Foobar'), 'first_name', 'last_name')
@@ -40,25 +40,25 @@ using the :class:`flask.ext.admin.form.rules.Text` class::
 Built-in rules
 --------------
 
-Flask-Admin comes with few built-in rules that can be found in the :mod:`flask.ext.admin.form.rules` module:
+Flask-Admin comes with few built-in rules that can be found in the :mod:`flask_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
-:class:`flask.ext.admin.form.rules.Text`                Simple text rendering rule
-:class:`flask.ext.admin.form.rules.HTML`                Same as `Text` rule, but does not escape the text
-:class:`flask.ext.admin.form.rules.Macro`               Calls macro from current Jinja2 context
-:class:`flask.ext.admin.form.rules.Container`           Wraps child rules into container rendered by macro
-:class:`flask.ext.admin.form.rules.Field`               Renders single form field
-:class:`flask.ext.admin.form.rules.Header`              Renders form header
-:class:`flask.ext.admin.form.rules.FieldSet`            Renders form header and child rules
+:class:`flask_admin.form.rules.BaseRule`                All rules derive from this class
+:class:`flask_admin.form.rules.NestedRule`              Allows rule nesting, useful for HTML containers
+:class:`flask_admin.form.rules.Text`                    Simple text rendering rule
+:class:`flask_admin.form.rules.HTML`                    Same as `Text` rule, but does not escape the text
+:class:`flask_admin.form.rules.Macro`                   Calls macro from current Jinja2 context
+:class:`flask_admin.form.rules.Container`               Wraps child rules into container rendered by macro
+:class:`flask_admin.form.rules.Field`                   Renders single form field
+:class:`flask_admin.form.rules.Header`                  Renders form header
+:class:`flask_admin.form.rules.FieldSet`                Renders form header and child rules
 ======================================================= ========================================================
 
-Enabling CSRF Validation 
----------------
-Adding CSRF validation will require overriding the :class:`flask.ext.admin.form.BaseForm` by using :attr:`flask.ext.admin.model.BaseModelView.form_base_class`.
+Enabling CSRF Validation
+------------------------
+Adding CSRF validation will require overriding the :class:`flask_admin.form.BaseForm` by using :attr:`flask_admin.model.BaseModelView.form_base_class`.
 
 WTForms >=2::
 
@@ -66,8 +66,8 @@ WTForms >=2::
     from wtforms.meta import DefaultMeta
     from flask import session
     from datetime import timedelta
-    from flask.ext.admin import form
-    from flask.ext.admin.contrib import sqla
+    from flask_admin import form
+    from flask_admin.contrib import sqla
 
     class SecureForm(form.BaseForm):
         class Meta(DefaultMeta):
@@ -75,11 +75,11 @@ WTForms >=2::
             csrf_class = SessionCSRF
             csrf_secret = b'EPj00jpfj8Gx1SjnyLxwBBSQfnQ9DJYe0Ym'
             csrf_time_limit = timedelta(minutes=20)
-            
+
             @property
             def csrf_context(self):
                 return session
-    
+
     class ModelAdmin(sqla.ModelView):
         form_base_class = SecureForm
 
@@ -122,5 +122,5 @@ For WTForms 1, you can use use Flask-WTF's Form class::
 Further reading
 ---------------
 
-For additional documentation, check :mod:`flask.ext.admin.form.rules` module source code (it is quite short) and
+For additional documentation, check :mod:`flask_admin.form.rules` module source code (it is quite short) and
 look at the `forms example <https://github.com/mrjoes/flask-admin/tree/master/examples/forms>`_ on GitHub.

doc/localization.rst

@@ -21,7 +21,7 @@ How to enable localization
 2. Initialize Flask-BabelEx by creating instance of `Babel` class::
 
 	from flask import app
-	from flask.ext.babelex import Babel
+	from flask_babelex import Babel
 
 	app = Flask(__name__)
 	babel = Babel(app)

doc/model_guidelines.rst

@@ -14,7 +14,7 @@ and implementing the set of scaffolding methods listed below.
 Extending BaseModelView
 -------------------------
 
-    Start off by defining a new class, which derives from from :class:`~flask.ext.admin.model.BaseModelView`::
+    Start off by defining a new class, which derives from from :class:`~flask_admin.model.BaseModelView`::
 
         class MyDbModel(BaseModelView):
             pass
@@ -24,11 +24,11 @@ Extending BaseModelView
 
     Now, implement the following scaffolding methods for the new class:
 
-    1. :meth:`~flask.ext.admin.model.BaseModelView.get_pk_value`
+    1. :meth:`~flask_admin.model.BaseModelView.get_pk_value`
 
         This method returns a primary key value from
         the model instance. In the SQLAlchemy backend, it gets the primary key from the model
-        using :meth:`~flask.ext.admin.contrib.sqla.ModelView.scaffold_pk`, caches it
+        using :meth:`~flask_admin.contrib.sqla.ModelView.scaffold_pk`, caches it
         and then returns the value from the model whenever requested.
 
         For example::
@@ -37,7 +37,7 @@ Extending BaseModelView
                 def get_pk_value(self, model):
                     return self.model.id
 
-    2. :meth:`~flask.ext.admin.model.BaseModelView.scaffold_list_columns`
+    2. :meth:`~flask_admin.model.BaseModelView.scaffold_list_columns`
 
         Returns a list of columns to be displayed in a list view. For example::
 
@@ -52,7 +52,7 @@ Extending BaseModelView
 
                     return columns
 
-    3. :meth:`~flask.ext.admin.model.BaseModelView.scaffold_sortable_columns`
+    3. :meth:`~flask_admin.model.BaseModelView.scaffold_sortable_columns`
 
         Returns a dictionary of sortable columns. The keys in the dictionary should correspond to the model's
         field names. The values should be those variables that will be used for sorting.
@@ -64,7 +64,7 @@ Extending BaseModelView
         If your backend does not support sorting, return
         `None` or an empty dictionary.
 
-    4. :meth:`~flask.ext.admin.model.BaseModelView.init_search`
+    4. :meth:`~flask_admin.model.BaseModelView.init_search`
 
         Initialize search functionality. If your backend supports
         full-text search, do initializations and return `True`.
@@ -76,7 +76,7 @@ Extending BaseModelView
         it will add a join, etc) and caches this information for
         future use.
 
-    5. :meth:`~flask.ext.admin.model.BaseModelView.scaffold_form`
+    5. :meth:`~flask_admin.model.BaseModelView.scaffold_form`
 
         Generate `WTForms` form class from the model.
 
@@ -90,7 +90,7 @@ Extending BaseModelView
                     # Do something
                     return MyForm
 
-    6. :meth:`~flask.ext.admin.model.BaseModelView.get_list`
+    6. :meth:`~flask_admin.model.BaseModelView.get_list`
 
         This method should return list of model instances with paging,
         sorting, etc applied.
@@ -120,27 +120,27 @@ Extending BaseModelView
 
             6. Return count, list as a tuple
 
-    7. :meth:`~flask.ext.admin.model.BaseModelView.get_one`
+    7. :meth:`~flask_admin.model.BaseModelView.get_one`
 
         Return a model instance by its primary key.
 
-    8. :meth:`~flask.ext.admin.model.BaseModelView.create_model`
+    8. :meth:`~flask_admin.model.BaseModelView.create_model`
 
         Create a new instance of the model from the `Form` object.
 
-    9. :meth:`~flask.ext.admin.model.BaseModelView.update_model`
+    9. :meth:`~flask_admin.model.BaseModelView.update_model`
 
         Update the model instance with data from the form.
 
-    10. :meth:`~flask.ext.admin.model.BaseModelView.delete_model`
+    10. :meth:`~flask_admin.model.BaseModelView.delete_model`
 
         Delete the specified model instance from the data store.
 
-    11. :meth:`~flask.ext.admin.model.BaseModelView.is_valid_filter`
+    11. :meth:`~flask_admin.model.BaseModelView.is_valid_filter`
 
         Verify whether the given object is a valid filter.
 
-    12. :meth:`~flask.ext.admin.model.BaseModelView.scaffold_filters`
+    12. :meth:`~flask_admin.model.BaseModelView.scaffold_filters`
 
         Return a list of filter objects for one model field.
 
@@ -166,17 +166,17 @@ Implementing filters
     filters from SQLAlchemy models in a non-SQLAlchemy backend.
     This also means that different backends might have different set of available filters.
 
-    The filter is a class derived from :class:`~flask.ext.admin.model.filters.BaseFilter` which implements at least two methods:
+    The filter is a class derived from :class:`~flask_admin.model.filters.BaseFilter` which implements at least two methods:
 
-        1. :meth:`~flask.ext.admin.model.filters.BaseFilter.apply`
-        2. :meth:`~flask.ext.admin.model.filters.BaseFilter.operation`
+        1. :meth:`~flask_admin.model.filters.BaseFilter.apply`
+        2. :meth:`~flask_admin.model.filters.BaseFilter.operation`
 
     `apply` method accepts two parameters: `query` object and a value from the client. Here you can add
     filtering logic for the filter type.
 
     Lets take SQLAlchemy model backend as an example:
 
-    All SQLAlchemy filters derive from :class:`~flask.ext.admin.contrib.sqla.filters.BaseSQLAFilter` class.
+    All SQLAlchemy filters derive from :class:`~flask_admin.contrib.sqla.filters.BaseSQLAFilter` class.
 
     Each filter implements one simple filter SQL operation (like, not like, greater, etc) and accepts a column as
     input parameter.
@@ -213,4 +213,4 @@ Implementing filters
 
 
 Feel free ask questions if you have problems adding a new model backend.
-Also, if you get stuck, try taking a look at the SQLAlchemy model backend and use it as a reference.
+Also, if you get stuck, try taking a look at the SQLAlchemy model backend and use it as a reference.
\ No newline at end of file

doc/quickstart.rst

@@ -41,12 +41,12 @@ or extend existing functionality by adding more views.
 Initialization
 --------------
 
-To start using Flask-Admin, you have to create a :class:`~flask.ext.admin.base.Admin` class instance and associate it
+To start using Flask-Admin, you have to create a :class:`~flask_admin.base.Admin` class instance and associate it
 with the Flask
 application instance::
 
     from flask import Flask
-    from flask.ext.admin import Admin
+    from flask_admin import Admin
 
     app = Flask(__name__)
 
@@ -62,12 +62,12 @@ you should see an empty "Home" page with a navigation bar on top
         :target: ../_images/quickstart_1.png
 
 You can change the application name by passing a value for the *name* parameter to the
-:class:`~flask.ext.admin.base.Admin` class constructor::
+:class:`~flask_admin.base.Admin` class constructor::
 
     admin = Admin(app, name='My App')
 
 As an alternative to passing a Flask application object to the Admin constructor, you can also call the
-:meth:`~flask.ext.admin.base.Admin.init_app` function, after the Admin instance has been initialized::
+:meth:`~flask_admin.base.Admin.init_app` function, after the Admin instance has been initialized::
 
     admin = Admin(name='My App')
     # Add views here
@@ -77,10 +77,10 @@ Adding views
 ------------
 
 Now, lets add an administrative view. The next example will result in two items appearing in the navbar menu: *Home*
-and *Hello*. To do this, you need to derive from the :class:`~flask.ext.admin.base.BaseView` class::
+and *Hello*. To do this, you need to derive from the :class:`~flask_admin.base.BaseView` class::
 
     from flask import Flask
-    from flask.ext.admin import Admin, BaseView, expose
+    from flask_admin import Admin, BaseView, expose
 
     class MyView(BaseView):
         @expose('/')
@@ -130,7 +130,7 @@ the Admin instance. The category specifies the name of the top-level menu item,
 with it, will be accessible from a drop-down menu. For example::
 
     from flask import Flask
-    from flask.ext.admin import Admin, BaseView, expose
+    from flask_admin import Admin, BaseView, expose
 
     class MyView(BaseView):
         @expose('/')
@@ -170,7 +170,7 @@ To redirect the user to another page if authentication fails, you will need to s
     class MyView(BaseView):
         def is_accessible(self):
             return login.current_user.is_authenticated()
-            
+
         def _handle_view(self, name, **kwargs):
             if not self.is_accessible():
                 return redirect(url_for('login', next=request.url))
@@ -185,7 +185,7 @@ Model views allow you to add dedicated admin pages for each of the models in you
 instances of the *ModelView* class, which you can import from one of Flask-Admin's built-in ORM backends. An example
 is the SQLAlchemy backend, which you can use as follows::
 
-    from flask.ext.admin.contrib.sqla import ModelView
+    from flask_admin.contrib.sqla import ModelView
 
     # Flask and Flask-SQLAlchemy initialization here
 
@@ -204,7 +204,7 @@ class, or you can override its methods.
 For example, if you want to disable model creation and only show certain columns in the list view, you can do
 something like::
 
-    from flask.ext.admin.contrib.sqla import ModelView
+    from flask_admin.contrib.sqla import ModelView
 
     # Flask and Flask-SQLAlchemy initialization here
 
@@ -238,10 +238,10 @@ therefore should use a *SelectField*::
 
 
 It is relatively easy to add support for different database backends (Mongo, etc) by inheriting from
-:class:`~flask.ext.admin.model.BaseModelView`.
+:class:`~flask_admin.model.BaseModelView`.
 class and implementing database-related methods.
 
-Please refer to :mod:`flask.ext.admin.contrib.sqla` documentation on how to customize the behavior of model-based
+Please refer to :mod:`flask_admin.contrib.sqla` documentation on how to customize the behavior of model-based
 administrative views.
 
 File Admin
@@ -252,7 +252,7 @@ Flask-Admin comes with another handy battery - file admin. It gives you the abil
 
 Here is simple example::
 
-    from flask.ext.admin.contrib.fileadmin import FileAdmin
+    from flask_admin.contrib.fileadmin import FileAdmin
 
     import os.path as op
 
@@ -270,7 +270,7 @@ Sample screenshot:
         :target: ../_images/quickstart_5.png
 
 You can disable uploads, disable file or directory deletion, restrict file uploads to certain types and so on.
-Check :mod:`flask.ext.admin.contrib.fileadmin` documentation on how to do it.
+Check :mod:`flask_admin.contrib.fileadmin` documentation on how to do it.
 
 Generating URLs
 ---------------
@@ -298,7 +298,7 @@ If you want to generate a URL for a particular view method from outside, the fol
     admin = Admin(app)
     admin.add_view(MyView(endpoint='testadmin'))
 
-    In this case, you can generate links by concatenating the view method name with an endpoint::
+   In this case, you can generate links by concatenating the view method name with an endpoint::
 
     url_for('testadmin.index')
 
@@ -310,10 +310,10 @@ If you want to generate a URL for a particular view method from outside, the fol
 
     # List View
     url_for('user.index_view')
-    
+
     # Create View (redirect back to index_view)
     url_for('user.create_view', url=url_for('user.index_view'))
-    
+
     # Edit View for record #1 (redirect back to index_view)
     url_for('user.edit_view', id=1, url=url_for('user.index_view'))
 
@@ -354,4 +354,3 @@ Browse through them in the GitHub repo, and then run them locally to get yoursel
 - `Redis terminal <https://github.com/MrJoes/Flask-Admin/tree/master/examples/rediscli>`_
    If you use Redis for caching, then check this example to see how easy it is to add a Redis terminal to your Admin
    interface, so you can reach your Redis instance straight from a browser.
-

doc/templates.rst

@@ -122,7 +122,7 @@ admin_view           Current administrative view
 admin_base_template  Base template name
 _gettext             Babel gettext
 _ngettext            Babel ngettext
-h                    Helpers from :mod:`~flask.ext.admin.helpers` module
+h                    Helpers from :mod:`~flask_admin.helpers` module
 ==================== ================================
 
 
@@ -150,4 +150,4 @@ list_row_actions_header Actions header
 list_row                Single row
 list_row_actions        Row action cell with edit/remove/etc buttons
 empty_list_message      Message that will be displayed if there are no models found
-======================= ============================================
+======================= ============================================
\ No newline at end of file

doc/tips.rst

@@ -24,13 +24,13 @@ General tips
 
  3. To customize the overall look and feel of the default model forms, you have two options: Either, you could
     override the default create/edit templates. Or, alternatively, you could make use of the form rendering rules
-    (:mod:`flask.ext.admin.form.rules`) that were introduced in version 1.0.7.
+    (:mod:`flask_admin.form.rules`) that were introduced in version 1.0.7.
 
  4. To simplify the management of file uploads, Flask-Admin comes with a dedicated tool, for which you can find
-    documentation at: :mod:`flask.ext.admin.form.upload`.
+    documentation at: :mod:`flask_admin.form.upload`.
 
  5. If you don't want to the use the built-in Flask-Admin form scaffolding logic, you are free to roll your own
-    by simply overriding :meth:`~flask.ext.admin.model.base.scaffold_form`. For example, if you use
+    by simply overriding :meth:`~flask_admin.model.base.scaffold_form`. For example, if you use
     `WTForms-Alchemy <https://github.com/kvesteri/wtforms-alchemy>`_, you could put your form generation code
     into a `scaffold_form` method in your `ModelView` class.
 
@@ -51,4 +51,4 @@ MongoEngine
 -----------
 
 1. Flask-Admin supports GridFS-backed image- and file uploads, done through WTForms fields. Documentation can be found
-   at :mod:`flask.ext.admin.contrib.mongoengine.fields`.
+   at :mod:`flask_admin.contrib.mongoengine.fields`.

examples/auth-mongoengine/app.py

 from flask import Flask, url_for, redirect, render_template, request
-from flask.ext.mongoengine import MongoEngine
+from flask_mongoengine import MongoEngine
 
 from wtforms import form, fields, validators
 
-from flask.ext import admin, login
-from flask.ext.admin.contrib.mongoengine import ModelView
-from flask.ext.admin import helpers
+import flask_admin as admin
+import flask_login as login
+from flask_admin.contrib.mongoengine import ModelView
+from flask_admin import helpers
 
 # Create application
 app = Flask(__name__)

examples/auth/app.py

 import os
 from flask import Flask, url_for, redirect, render_template, request
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 from wtforms import form, fields, validators
-from flask.ext import admin, login
-from flask.ext.admin.contrib import sqla
-from flask.ext.admin import helpers, expose
+import flask_admin as admin
+import flask_login as login
+from flask_admin.contrib import sqla
+from flask_admin import helpers, expose
 from werkzeug.security import generate_password_hash, check_password_hash
 
 

examples/babel/app.py

 from flask import Flask, request, session
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 
-from flask.ext import admin
-from flask.ext.babelex import Babel
+import flask_admin as admin
+from flask_babelex import Babel
 
-from flask.ext.admin.contrib import sqla
+from flask_admin.contrib import sqla
 
 # Create application
 app = Flask(__name__)

examples/file/app.py

@@ -3,8 +3,8 @@ import os.path as op
 
 from flask import Flask
 
-from flask.ext import admin
-from flask.ext.admin.contrib import fileadmin
+import flask_admin as admin
+from flask_admin.contrib import fileadmin
 
 
 # Create flask app

examples/forms/app.py

@@ -2,14 +2,14 @@ import os
 import os.path as op
 
 from flask import Flask, url_for
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 
 from sqlalchemy.event import listens_for
 from jinja2 import Markup
 
-from flask.ext.admin import Admin, form
-from flask.ext.admin.form import rules
-from flask.ext.admin.contrib import sqla
+from flask_admin import Admin, form
+from flask_admin.form import rules
+from flask_admin.contrib import sqla
 
 
 # Create application
@@ -249,4 +249,4 @@ if __name__ == '__main__':
         build_sample_db()
 
     # Start app
-    app.run(debug=True)
+    app.run(debug=True)
\ No newline at end of file

examples/layout-bootstrap3/app.py

 import os
 import os.path as op
 from flask import Flask
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 
-from flask.ext import admin
-from flask.ext.admin.contrib.sqla import ModelView
+import flask_admin as admin
+from flask_admin.contrib.sqla import ModelView
 
 
 # Create application

examples/layout/app.py

 import os
 import os.path as op
 from flask import Flask
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 
-from flask.ext import admin
-from flask.ext.admin.contrib.sqla import ModelView
+import flask_admin as admin
+from flask_admin.contrib.sqla import ModelView
 
 
 # Create application

examples/menu-external-links/app.py

 from flask import Flask, redirect, url_for
 from flask.ext import login
-from flask.ext.login import current_user, UserMixin
-from flask.ext.admin.base import MenuLink, Admin, BaseView, expose
+from flask_login import current_user, UserMixin
+from flask_admin.base import MenuLink, Admin, BaseView, expose
 
 
 # Create fake user class for authentication

examples/methodview/app.py

 from flask import Flask, redirect, request
 
-from flask.ext import admin
+import flask_admin as admin
 from flask.views import MethodView
 
 

examples/mongoengine/app.py

@@ -2,10 +2,10 @@ import datetime
 
 from flask import Flask
 
-from flask.ext import admin
-from flask.ext.mongoengine import MongoEngine
-from flask.ext.admin.form import rules
-from flask.ext.admin.contrib.mongoengine import ModelView
+import flask_admin as admin
+from flask_mongoengine import MongoEngine
+from flask_admin.form import rules
+from flask_admin.contrib.mongoengine import ModelView
 
 # Create application
 app = Flask(__name__)

examples/multi/app.py

 from flask import Flask
 
-from flask.ext import admin
+import flask_admin as admin
 
 
 # Views

examples/peewee/app.py

@@ -2,8 +2,8 @@ from flask import Flask
 
 import peewee
 
-from flask.ext import admin
-from flask.ext.admin.contrib.peewee import ModelView
+import flask_admin as admin
+from flask_admin.contrib.peewee import ModelView
 
 
 app = Flask(__name__)

examples/pymongo/app.py

@@ -2,13 +2,13 @@ import pymongo
 from bson.objectid import ObjectId
 
 from flask import Flask
-from flask.ext import admin
+import flask_admin as admin
 
 from wtforms import form, fields
 
-from flask.ext.admin.form import Select2Widget
-from flask.ext.admin.contrib.pymongo import ModelView, filters
-from flask.ext.admin.model.fields import InlineFormField, InlineFieldList
+from flask_admin.form import Select2Widget
+from flask_admin.contrib.pymongo import ModelView, filters
+from flask_admin.model.fields import InlineFormField, InlineFieldList
 
 # Create application
 app = Flask(__name__)

examples/quickstart/app.py

 from flask import Flask
-from flask.ext.admin import Admin
+from flask_admin import Admin
 
 
 app = Flask(__name__)

examples/quickstart/app2.py

 from flask import Flask
-from flask.ext.admin import Admin, BaseView, expose
+from flask_admin import Admin, BaseView, expose
 
 
 class MyView(BaseView):

examples/quickstart/app3.py

 from flask import Flask
-from flask.ext.admin import Admin, BaseView, expose
+from flask_admin import Admin, BaseView, expose
 
 
 class MyView(BaseView):

examples/rediscli/app.py

@@ -2,8 +2,8 @@ from flask import Flask
 
 from redis import Redis
 
-from flask.ext import admin
-from flask.ext.admin.contrib import rediscli
+import flask_admin as admin
+from flask_admin.contrib import rediscli
 
 # Create flask app
 app = Flask(__name__)

examples/simple/app.py

 from flask import Flask
 
-from flask.ext import admin
+import flask_admin as admin
 
 
 # Create custom admin view

examples/sqla-custom-filter/app.py

 from flask import Flask
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 
-from flask.ext.admin.contrib import sqla
-from flask.ext.admin import expose, Admin
+from flask_admin.contrib import sqla
+from flask_admin import expose, Admin
 
 # required for creating custom filters
-from flask.ext.admin.contrib.sqla.filters import BaseSQLAFilter, FilterEqual
+from flask_admin.contrib.sqla.filters import BaseSQLAFilter, FilterEqual
 
 # Create application
 app = Flask(__name__)
@@ -26,7 +26,7 @@ class User(db.Model):
         self.last_name = last_name
         self.username = username
         self.email = email
-    
+
     id = db.Column(db.Integer, primary_key=True)
     first_name = db.Column(db.String(100))
     last_name = db.Column(db.String(100))
@@ -53,10 +53,10 @@ class UserAdmin(sqla.ModelView):
     # each filter in the list is a filter operation (equals, not equals, etc)
     # filters with the same name will appear as operations under the same filter
     column_filters = [
-        FilterEqual(User.last_name, 'Last Name'), 
+        FilterEqual(User.last_name, 'Last Name'),
         FilterLastNameBrown(User.last_name, 'Last Name', options=(('1', 'Yes'),('0', 'No')))
     ]
-    
+
 admin = Admin(app, template_mode="bootstrap3")
 admin.add_view(UserAdmin(User, db.session))
 
@@ -66,10 +66,10 @@ def build_sample_db():
     user_obj1 = User("Paul", "Brown", "pbrown", "paul@gmail.com")
     user_obj2 = User("Luke", "Brown", "lbrown", "luke@gmail.com")
     user_obj3 = User("Serge", "Koval", "skoval", "serge@gmail.com")
-        
+
     db.session.add_all([user_obj1, user_obj2, user_obj3])
     db.session.commit()
 
 if __name__ == '__main__':
     build_sample_db()
-    app.run(port=5000)
+    app.run(port=5000)
\ No newline at end of file

examples/sqla-inline/app.py

@@ -5,16 +5,16 @@ from werkzeug import secure_filename
 from sqlalchemy import event
 
 from flask import Flask, request, render_template
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 
 from wtforms import fields
 
-from flask.ext import admin
-from flask.ext.admin.form import RenderTemplateWidget
-from flask.ext.admin.model.form import InlineFormAdmin
-from flask.ext.admin.contrib.sqla import ModelView
-from flask.ext.admin.contrib.sqla.form import InlineModelConverter
-from flask.ext.admin.contrib.sqla.fields import InlineModelFormList
+import flask_admin as admin
+from flask_admin.form import RenderTemplateWidget
+from flask_admin.model.form import InlineFormAdmin
+from flask_admin.contrib.sqla import ModelView
+from flask_admin.contrib.sqla.form import InlineModelConverter
+from flask_admin.contrib.sqla.fields import InlineModelFormList
 
 # Create application
 app = Flask(__name__)

examples/sqla/app.py

 import os
 import os.path as op
 from flask import Flask
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 
 from wtforms import validators
 
-from flask.ext import admin
-from flask.ext.admin.contrib import sqla
-from flask.ext.admin.contrib.sqla import filters
+import flask_admin as admin
+from flask_admin.contrib import sqla
+from flask_admin.contrib.sqla import filters
 
 
 # Create application

examples/sqla/app2.py

 from flask import Flask
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 
-from flask.ext import admin
-from flask.ext.admin.contrib import sqla
+import flask_admin as admin
+from flask_admin.contrib import sqla
 
 
 # Create application

examples/wysiwyg/app.py

 from flask import Flask
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 
 from wtforms import fields, widgets
 
-from flask.ext import admin
-from flask.ext.admin.contrib import sqla
+import flask_admin as admin
+from flask_admin.contrib import sqla
 
 # Create application
 app = Flask(__name__)

flask_admin/_backwards.py

 # -*- coding: utf-8 -*-
 """
-    flask.ext.admin._backwards
+    flask_admin._backwards
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Backward compatibility helpers.

flask_admin/_compat.py

 # -*- coding: utf-8 -*-
 """
-    flask.ext.admin._compat
+    flask_admin._compat
     ~~~~~~~~~~~~~~~~~~~~~~~
 
     Some py2/py3 compatibility support based on a stripped down

flask_admin/actions.py

 from flask import request, redirect
 
 
-from flask.ext.admin import tools
-from flask.ext.admin._compat import text_type
+from flask_admin import tools
+from flask_admin._compat import text_type
 
 
 def action(name, text, confirmation=None):

flask_admin/babel.py

 try:
     from .helpers import get_current_view
 
-    from flask.ext.babelex import Domain
+    from flask_babelex import Domain
 
-    from flask.ext.admin import translations
+    from flask_admin import translations
 
     class CustomDomain(Domain):
         def __init__(self):

flask_admin/base.py

@@ -3,12 +3,12 @@ import os.path as op
 from functools import wraps
 
 from flask import Blueprint, current_app, render_template, abort, g, url_for
-from flask.ext.admin import babel
-from flask.ext.admin._compat import with_metaclass
-from flask.ext.admin import helpers as h
+from flask_admin import babel
+from flask_admin._compat import with_metaclass
+from flask_admin import helpers as h
 
 # For compatibility reasons import MenuLink
-from flask.ext.admin.menu import MenuCategory, MenuView, MenuLink
+from flask_admin.menu import MenuCategory, MenuView, MenuLink
 
 
 def expose(url='/', methods=('GET',)):
@@ -111,7 +111,7 @@ class BaseView(with_metaclass(AdminViewMeta, BaseViewClass)):
 
         Derive from this class to implement your administrative interface piece. For example::
 
-            from flask.ext.admin import BaseView, expose
+            from flask_admin import BaseView, expose
             class MyView(BaseView):
                 @expose('/')
                 def index(self):
@@ -179,9 +179,9 @@ class BaseView(with_metaclass(AdminViewMeta, BaseViewClass)):
             :param menu_icon_type:
                 Optional icon. Possible icon types:
 
-                 - `flask.ext.admin.consts.ICON_TYPE_GLYPH` - Bootstrap glyph icon
-                 - `flask.ext.admin.consts.ICON_TYPE_IMAGE` - Image relative to Flask static directory
-                 - `flask.ext.admin.consts.ICON_TYPE_IMAGE_URL` - Image with full URL
+                 - `flask_admin.consts.ICON_TYPE_GLYPH` - Bootstrap glyph icon
+                 - `flask_admin.consts.ICON_TYPE_IMAGE` - Image relative to Flask static directory
+                 - `flask_admin.consts.ICON_TYPE_IMAGE_URL` - Image with full URL
             :param menu_icon_value:
                 Icon glyph name or URL, depending on `menu_icon_type` setting
         """
@@ -233,7 +233,7 @@ class BaseView(with_metaclass(AdminViewMeta, BaseViewClass)):
             if not self.url.startswith('/'):
                 self.url = '%s/%s' % (self.admin.url, self.url)
 
-        
+
         # If we're working from the root of the site, set prefix to None
         if self.url == '/':
             self.url = None
@@ -241,8 +241,8 @@ class BaseView(with_metaclass(AdminViewMeta, BaseViewClass)):
             if not self.static_url_path:
                 self.static_folder='static'
                 self.static_url_path='/static/admin'
-            
-            
+
+
         # If name is not povided, use capitalized endpoint name
         if self.name is None:
             self.name = self._prettify_class_name(self.__class__.__name__)
@@ -396,8 +396,8 @@ class AdminIndexView(BaseView):
                     return self.render('admin/myhome.html', arg1=arg1)
 
             admin = Admin(index_view=MyHomeView())
-            
-            
+
+
         Also, you can change the root url from /admin to / with the following::
 
             admin = Admin(

flask_admin/contrib/appengine/view.py

 import logging
 
-from flask.ext.admin.model import BaseModelView
+from flask_admin.model import BaseModelView
 from wtforms_appengine import db as wt_db
 from wtforms_appengine import ndb as wt_ndb
 
@@ -176,4 +176,3 @@ def ModelView(model):
 		return DbModelView(model)
 	else:
 		raise ValueError("Unsupported model: %s" % model)
-

flask_admin/contrib/fileadmin.py

@@ -12,11 +12,11 @@ from flask import flash, redirect, abort, request, send_file
 
 from wtforms import fields, validators
 
-from flask.ext.admin import form, helpers
-from flask.ext.admin._compat import urljoin, as_unicode
-from flask.ext.admin.base import BaseView, expose
-from flask.ext.admin.actions import action, ActionsMixin
-from flask.ext.admin.babel import gettext, lazy_gettext
+from flask_admin import form, helpers
+from flask_admin._compat import urljoin, as_unicode
+from flask_admin.base import BaseView, expose
+from flask_admin.actions import action, ActionsMixin
+from flask_admin.babel import gettext, lazy_gettext
 
 
 class FileAdmin(BaseView, ActionsMixin):
@@ -34,8 +34,8 @@ class FileAdmin(BaseView, ActionsMixin):
 
             import os.path as op
 
-            from flask.ext.admin import Admin
-            from flask.ext.admin.contrib.fileadmin import FileAdmin
+            from flask_admin import Admin
+            from flask_admin.contrib.fileadmin import FileAdmin
 
             admin = Admin()
 
@@ -138,7 +138,7 @@ class FileAdmin(BaseView, ActionsMixin):
 
     def __init__(self, base_path, base_url=None,
                  name=None, category=None, endpoint=None, url=None,
-                 verify_path=True):
+                 verify_path=True, menu_class_name=None, menu_icon_type=None, menu_icon_value=None):
         """
             Constructor.
 
@@ -179,7 +179,9 @@ class FileAdmin(BaseView, ActionsMixin):
         if not op.exists(base_path):
             raise IOError('FileAdmin path "%s" does not exist or is not accessible' % base_path)
 
-        super(FileAdmin, self).__init__(name, category, endpoint, url)
+        super(FileAdmin, self).__init__(name, category, endpoint, url,
+                                        menu_class_name=menu_class_name, menu_icon_type=menu_icon_type,
+                                        menu_icon_value=menu_icon_value)
 
     def is_accessible_path(self, path):
         """

flask_admin/contrib/geoa/form.py

-from flask.ext.admin.model.form import converts
-from flask.ext.admin.contrib.sqla.form import AdminModelConverter as SQLAAdminConverter
+from flask_admin.model.form import converts
+from flask_admin.contrib.sqla.form import AdminModelConverter as SQLAAdminConverter
 from .fields import GeoJSONField
 
 

flask_admin/contrib/geoa/typefmt.py

-from flask.ext.admin.contrib.sqla.typefmt import DEFAULT_FORMATTERS as BASE_FORMATTERS
+from flask_admin.contrib.sqla.typefmt import DEFAULT_FORMATTERS as BASE_FORMATTERS
 import json
 from jinja2 import Markup
 from wtforms.widgets import html_params

flask_admin/contrib/geoa/view.py

-from flask.ext.admin.contrib.sqla import ModelView as SQLAModelView
-from flask.ext.admin.contrib.geoa import form, typefmt
+from flask_admin.contrib.sqla import ModelView as SQLAModelView
+from flask_admin.contrib.geoa import form, typefmt
 
 
 class ModelView(SQLAModelView):

flask_admin/contrib/mongoengine/__init__.py

 try:
-    import flask.ext.mongoengine
+    import flask_mongoengine
 except ImportError:
     raise Exception('Please install flask-mongoengine in order to use mongoengine backend')
 

flask_admin/contrib/mongoengine/ajax.py

 import mongoengine
 
-from flask.ext.admin._compat import string_types, as_unicode, iteritems
-from flask.ext.admin.model.ajax import AjaxModelLoader, DEFAULT_PAGE_SIZE
+from flask_admin._compat import string_types, as_unicode, iteritems
+from flask_admin.model.ajax import AjaxModelLoader, DEFAULT_PAGE_SIZE
 
 
 class QueryAjaxModelLoader(AjaxModelLoader):

flask_admin/contrib/mongoengine/fields.py

@@ -10,7 +10,7 @@ except ImportError:
     from wtforms.utils import unset_value
 
 from . import widgets
-from flask.ext.admin.model.fields import InlineFormField
+from flask_admin.model.fields import InlineFormField
 
 
 def is_empty(file_object):

flask_admin/contrib/mongoengine/filters.py

 import datetime
 
-from flask.ext.admin.babel import lazy_gettext
-from flask.ext.admin.model import filters
+from flask_admin.babel import lazy_gettext
+from flask_admin.model import filters
 
 from .tools import parse_like_term
 from mongoengine.queryset import Q

flask_admin/contrib/mongoengine/form.py

@@ -2,13 +2,13 @@ from mongoengine import ReferenceField
 from mongoengine.base import BaseDocument, DocumentMetaclass, get_document
 
 from wtforms import fields, validators
-from flask.ext.mongoengine.wtf import orm, fields as mongo_fields
+from flask_mongoengine.wtf import orm, fields as mongo_fields
 
-from flask.ext.admin import form
-from flask.ext.admin.model.form import FieldPlaceholder
-from flask.ext.admin.model.fields import InlineFieldList, AjaxSelectField, AjaxSelectMultipleField
-from flask.ext.admin.model.widgets import InlineFormWidget
-from flask.ext.admin._compat import iteritems
+from flask_admin import form
+from flask_admin.model.form import FieldPlaceholder
+from flask_admin.model.fields import InlineFieldList, AjaxSelectField, AjaxSelectMultipleField
+from flask_admin.model.widgets import InlineFormWidget
+from flask_admin._compat import iteritems
 
 from .fields import ModelFormField, MongoFileField, MongoImageField
 from .subdoc import EmbeddedForm
@@ -184,7 +184,7 @@ def get_form(model, converter,
     """
     Create a wtforms Form for a given mongoengine Document schema::
 
-        from flask.ext.mongoengine.wtf import model_form
+        from flask_mongoengine.wtf import model_form
         from myproject.myapp.schemas import Article
         ArticleForm = model_form(Article)
 

flask_admin/contrib/mongoengine/helpers.py

 from mongoengine import ValidationError
-from flask.ext.admin._compat import itervalues, as_unicode
+from flask_admin._compat import itervalues, as_unicode
 
 
 def make_gridfs_args(value):

flask_admin/contrib/mongoengine/subdoc.py

-from flask.ext.admin._compat import iteritems
-from flask.ext.admin.model.form import InlineBaseFormAdmin
+from flask_admin._compat import iteritems
+from flask_admin.model.form import InlineBaseFormAdmin
 
 
 class EmbeddedForm(InlineBaseFormAdmin):
@@ -18,6 +18,6 @@ def convert_subdocuments(values):
         elif isinstance(p, EmbeddedForm):
             result[name] = p
         else:
-            raise ValueError('Invalid subdocument type: expecting dict or instance of flask.ext.admin.contrib.mongoengine.EmbeddedForm, got %s' % type(p))
+            raise ValueError('Invalid subdocument type: expecting dict or instance of flask_admin.contrib.mongoengine.EmbeddedForm, got %s' % type(p))
 
     return result

flask_admin/contrib/mongoengine/typefmt.py

@@ -3,7 +3,7 @@ from jinja2 import Markup, escape
 from mongoengine.base import BaseList
 from mongoengine.fields import GridFSProxy, ImageGridFsProxy
 
-from flask.ext.admin.model.typefmt import BASE_FORMATTERS, list_formatter
+from flask_admin.model.typefmt import BASE_FORMATTERS, list_formatter
 
 from . import helpers
 

flask_admin/contrib/mongoengine/view.py

@@ -2,19 +2,19 @@ import logging
 
 from flask import request, flash, abort, Response
 
-from flask.ext.admin import expose
-from flask.ext.admin.babel import gettext, ngettext, lazy_gettext
-from flask.ext.admin.model import BaseModelView
-from flask.ext.admin.model.form import wrap_fields_in_fieldlist
-from flask.ext.admin.model.fields import ListEditableFieldList
-from flask.ext.admin._compat import iteritems, string_types
+from flask_admin import expose
+from flask_admin.babel import gettext, ngettext, lazy_gettext
+from flask_admin.model import BaseModelView
+from flask_admin.model.form import wrap_fields_in_fieldlist
+from flask_admin.model.fields import ListEditableFieldList
+from flask_admin._compat import iteritems, string_types
 
 import mongoengine
 import gridfs
 from mongoengine.connection import get_db
 from bson.objectid import ObjectId
 
-from flask.ext.admin.actions import action
+from flask_admin.actions import action
 from .filters import FilterConverter, BaseMongoEngineFilter
 from .form import get_form, CustomModelConverter
 from .typefmt import DEFAULT_FORMATTERS
@@ -53,7 +53,7 @@ class ModelView(BaseModelView):
         Collection of the column filters.
 
         Can contain either field names or instances of
-        :class:`flask.ext.admin.contrib.mongoengine.filters.BaseFilter`
+        :class:`flask_admin.contrib.mongoengine.filters.BaseFilter`
         classes.
 
         For example::
@@ -73,7 +73,7 @@ class ModelView(BaseModelView):
         field conversion logic.
 
         Custom class should be derived from the
-        `flask.ext.admin.contrib.mongoengine.form.CustomModelConverter`.
+        `flask_admin.contrib.mongoengine.form.CustomModelConverter`.
 
         For example::
 
@@ -125,7 +125,7 @@ class ModelView(BaseModelView):
         Subdocument configuration options.
 
         This field accepts dictionary, where key is field name and value is either dictionary or instance of the
-        `flask.ext.admin.contrib.EmbeddedForm`.
+        `flask_admin.contrib.EmbeddedForm`.
 
         Consider following example::
 
@@ -220,9 +220,9 @@ class ModelView(BaseModelView):
             :param menu_icon_type:
                 Optional icon. Possible icon types:
 
-                 - `flask.ext.admin.consts.ICON_TYPE_GLYPH` - Bootstrap glyph icon
-                 - `flask.ext.admin.consts.ICON_TYPE_IMAGE` - Image relative to Flask static directory
-                 - `flask.ext.admin.consts.ICON_TYPE_IMAGE_URL` - Image with full URL
+                 - `flask_admin.consts.ICON_TYPE_GLYPH` - Bootstrap glyph icon
+                 - `flask_admin.consts.ICON_TYPE_IMAGE` - Image relative to Flask static directory
+                 - `flask_admin.consts.ICON_TYPE_IMAGE_URL` - Image with full URL
 
             :param menu_icon_value:
                 Icon glyph name or URL, depending on `menu_icon_type` setting

flask_admin/contrib/mongoengine/widgets.py

@@ -4,7 +4,7 @@ from jinja2 import escape
 
 from mongoengine.fields import GridFSProxy, ImageGridFsProxy
 
-from flask.ext.admin.helpers import get_url
+from flask_admin.helpers import get_url
 from . import helpers
 
 

flask_admin/contrib/peewee/ajax.py

-from flask.ext.admin._compat import as_unicode, string_types
-from flask.ext.admin.model.ajax import AjaxModelLoader, DEFAULT_PAGE_SIZE
+from flask_admin._compat import as_unicode, string_types
+from flask_admin.model.ajax import AjaxModelLoader, DEFAULT_PAGE_SIZE
 
 from .tools import get_primary_key
 

flask_admin/contrib/peewee/filters.py

 import time
 import datetime
 
-from flask.ext.admin.babel import lazy_gettext
+from flask_admin.babel import lazy_gettext
 
-from flask.ext.admin.model import filters
+from flask_admin.model import filters
 from .tools import parse_like_term
 
 

flask_admin/contrib/peewee/form.py

@@ -5,10 +5,10 @@ from peewee import (CharField, DateTimeField, DateField, TimeField,
 
 from wtfpeewee.orm import ModelConverter, model_form
 
-from flask.ext.admin import form
-from flask.ext.admin._compat import iteritems, itervalues
-from flask.ext.admin.model.form import InlineFormAdmin, InlineModelConverterBase
-from flask.ext.admin.model.fields import InlineModelFormField, InlineFieldList, AjaxSelectField
+from flask_admin import form
+from flask_admin._compat import iteritems, itervalues
+from flask_admin.model.form import InlineFormAdmin, InlineModelConverterBase
+from flask_admin.model.fields import InlineModelFormField, InlineFieldList, AjaxSelectField
 
 from .tools import get_primary_key
 from .ajax import create_ajax_loader

flask_admin/contrib/peewee/view.py

@@ -2,16 +2,16 @@ import logging
 
 from flask import flash
 
-from flask.ext.admin._compat import string_types
-from flask.ext.admin.babel import gettext, ngettext, lazy_gettext
-from flask.ext.admin.model import BaseModelView
-from flask.ext.admin.model.form import wrap_fields_in_fieldlist
-from flask.ext.admin.model.fields import ListEditableFieldList
+from flask_admin._compat import string_types
+from flask_admin.babel import gettext, ngettext, lazy_gettext
+from flask_admin.model import BaseModelView
+from flask_admin.model.form import wrap_fields_in_fieldlist
+from flask_admin.model.fields import ListEditableFieldList
 
 from peewee import PrimaryKeyField, ForeignKeyField, Field, CharField, TextField
 
-from flask.ext.admin.actions import action
-from flask.ext.admin.contrib.peewee import filters
+from flask_admin.actions import action
+from flask_admin.contrib.peewee import filters
 
 from .form import get_form, CustomModelConverter, InlineModelConverter, save_inline
 from .tools import get_primary_key, parse_like_term
@@ -27,7 +27,7 @@ class ModelView(BaseModelView):
         Collection of the column filters.
 
         Can contain either field names or instances of
-        :class:`flask.ext.admin.contrib.peewee.filters.BaseFilter` classes.
+        :class:`flask_admin.contrib.peewee.filters.BaseFilter` classes.
 
         For example::
 

flask_admin/contrib/peeweemodel/__init__.py

 def setup():
     import warnings
-    warnings.warn('Flask-Admin peewee integration module was renamed as flask.ext.admin.contrib.peewee, please use it instead.')
+    warnings.warn('Flask-Admin peewee integration module was renamed as flask_admin.contrib.peewee, please use it instead.')
 
-    from flask.ext.admin._backwards import import_redirect
+    from flask_admin._backwards import import_redirect
     import_redirect(__name__, 'flask_admin.contrib.peewee')
 
 setup()

flask_admin/contrib/pymongo/filters.py

 import re
 
-from flask.ext.admin.babel import gettext
-from flask.ext.admin.model import filters
+from flask_admin.babel import gettext
+from flask_admin.model import filters
 
 from .tools import parse_like_term
 

flask_admin/contrib/pymongo/view.py

@@ -6,11 +6,11 @@ from bson.errors import InvalidId
 
 from flask import flash
 
-from flask.ext.admin._compat import string_types
-from flask.ext.admin.babel import gettext, ngettext, lazy_gettext
-from flask.ext.admin.model import BaseModelView
-from flask.ext.admin.actions import action
-from flask.ext.admin.helpers import get_form_data
+from flask_admin._compat import string_types
+from flask_admin.babel import gettext, ngettext, lazy_gettext
+from flask_admin.model import BaseModelView
+from flask_admin.actions import action
+from flask_admin.helpers import get_form_data
 
 from .filters import BasePyMongoFilter
 from .tools import parse_like_term
@@ -29,7 +29,7 @@ class ModelView(BaseModelView):
         Collection of the column filters.
 
         Should contain instances of
-        :class:`flask.ext.admin.contrib.pymongo.filters.BasePyMongoFilter`
+        :class:`flask_admin.contrib.pymongo.filters.BasePyMongoFilter`
         classes.
 
         For example::
@@ -59,9 +59,9 @@ class ModelView(BaseModelView):
             :param menu_icon_type:
                 Optional icon. Possible icon types:
 
-                 - `flask.ext.admin.consts.ICON_TYPE_GLYPH` - Bootstrap glyph icon
-                 - `flask.ext.admin.consts.ICON_TYPE_IMAGE` - Image relative to Flask static directory
-                 - `flask.ext.admin.consts.ICON_TYPE_IMAGE_URL` - Image with full URL
+                 - `flask_admin.consts.ICON_TYPE_GLYPH` - Bootstrap glyph icon
+                 - `flask_admin.consts.ICON_TYPE_IMAGE` - Image relative to Flask static directory
+                 - `flask_admin.consts.ICON_TYPE_IMAGE_URL` - Image with full URL
             :param menu_icon_value:
                 Icon glyph name or URL, depending on `menu_icon_type` setting
         """

flask_admin/contrib/rediscli.py

@@ -6,9 +6,9 @@ from flask import request
 
 from jinja2 import Markup
 
-from flask.ext.admin.base import BaseView, expose
-from flask.ext.admin.babel import gettext
-from flask.ext.admin._compat import VER
+from flask_admin.base import BaseView, expose
+from flask_admin.babel import gettext
+from flask_admin._compat import VER
 
 # Set up logger
 log = logging.getLogger("flask-admin.redis")

flask_admin/contrib/sqla/ajax.py

 from sqlalchemy import or_
 
-from flask.ext.admin._compat import as_unicode, string_types
-from flask.ext.admin.model.ajax import AjaxModelLoader, DEFAULT_PAGE_SIZE
+from flask_admin._compat import as_unicode, string_types
+from flask_admin.model.ajax import AjaxModelLoader, DEFAULT_PAGE_SIZE
 
 
 class QueryAjaxModelLoader(AjaxModelLoader):

flask_admin/contrib/sqla/fields.py

@@ -8,10 +8,10 @@ from wtforms.fields import SelectFieldBase
 from wtforms.validators import ValidationError
 
 from .tools import get_primary_key
-from flask.ext.admin._compat import text_type, string_types
-from flask.ext.admin.form import FormOpts
-from flask.ext.admin.model.fields import InlineFieldList, InlineModelFormField
-from flask.ext.admin.model.widgets import InlineFormWidget
+from flask_admin._compat import text_type, string_types
+from flask_admin.form import FormOpts
+from flask_admin.model.fields import InlineFieldList, InlineModelFormField
+from flask_admin.model.widgets import InlineFormWidget
 
 
 try:

flask_admin/contrib/sqla/filters.py

@@ -2,9 +2,9 @@ import warnings
 import time
 import datetime
 
-from flask.ext.admin.babel import lazy_gettext
-from flask.ext.admin.model import filters
-from flask.ext.admin.contrib.sqla import tools
+from flask_admin.babel import lazy_gettext
+from flask_admin.model import filters
+from flask_admin.contrib.sqla import tools
 from sqlalchemy.sql import not_, or_
 
 class BaseSQLAFilter(filters.BaseFilter):

flask_admin/contrib/sqla/form.py

 from wtforms import fields, validators
 from sqlalchemy import Boolean, Column
 
-from flask.ext.admin import form
-from flask.ext.admin.model.form import (converts, ModelConverterBase,
+from flask_admin import form
+from flask_admin.model.form import (converts, ModelConverterBase,
                                         InlineModelConverterBase, FieldPlaceholder)
-from flask.ext.admin.model.fields import AjaxSelectField, AjaxSelectMultipleField
-from flask.ext.admin.model.helpers import prettify_name
-from flask.ext.admin._backwards import get_property
-from flask.ext.admin._compat import iteritems
+from flask_admin.model.fields import AjaxSelectField, AjaxSelectMultipleField
+from flask_admin.model.helpers import prettify_name
+from flask_admin._backwards import get_property
+from flask_admin._compat import iteritems
 
 from .validators import Unique
 from .fields import QuerySelectField, QuerySelectMultipleField, InlineModelFormList

flask_admin/contrib/sqla/tools.py

@@ -3,8 +3,8 @@ from sqlalchemy.sql.operators import eq
 from sqlalchemy.exc import DBAPIError
 from ast import literal_eval
 
-from flask.ext.admin._compat import filter_list
-from flask.ext.admin.tools import iterencode, iterdecode, escape
+from flask_admin._compat import filter_list
+from flask_admin.tools import iterencode, iterdecode, escape
 
 
 def parse_like_term(term):

flask_admin/contrib/sqla/typefmt.py

-from flask.ext.admin.model.typefmt import BASE_FORMATTERS, list_formatter
+from flask_admin.model.typefmt import BASE_FORMATTERS, list_formatter
 from sqlalchemy.orm.collections import InstrumentedList
 
 

flask_admin/contrib/sqla/view.py

@@ -8,16 +8,16 @@ from sqlalchemy.exc import IntegrityError
 
 from flask import flash
 
-from flask.ext.admin._compat import string_types, text_type
-from flask.ext.admin.babel import gettext, ngettext, lazy_gettext
-from flask.ext.admin.model import BaseModelView
-from flask.ext.admin.model.form import wrap_fields_in_fieldlist
-from flask.ext.admin.model.fields import ListEditableFieldList
+from flask_admin._compat import string_types, text_type
+from flask_admin.babel import gettext, ngettext, lazy_gettext
+from flask_admin.model import BaseModelView
+from flask_admin.model.form import wrap_fields_in_fieldlist
+from flask_admin.model.fields import ListEditableFieldList
 
-from flask.ext.admin.actions import action
-from flask.ext.admin._backwards import ObsoleteAttr
+from flask_admin.actions import action
+from flask_admin._backwards import ObsoleteAttr
 
-from flask.ext.admin.contrib.sqla import form, filters, tools
+from flask_admin.contrib.sqla import form, filters as sqla_filters, tools
 from .typefmt import DEFAULT_FORMATTERS
 from .tools import get_query_for_ids
 from .ajax import create_ajax_loader
@@ -113,7 +113,7 @@ class ModelView(BaseModelView):
     """
         Collection of the column filters.
 
-        Can contain either field names or instances of :class:`flask.ext.admin.contrib.sqla.filters.BaseFilter` classes.
+        Can contain either field names or instances of :class:`flask_admin.contrib.sqla.filters.BaseFilter` classes.
 
         For example::
 
@@ -154,7 +154,7 @@ class ModelView(BaseModelView):
                 inline_model_form_converter = MyInlineModelConverter
     """
 
-    filter_converter = filters.FilterConverter()
+    filter_converter = sqla_filters.FilterConverter()
     """
         Field to filter converter.
 
@@ -265,9 +265,9 @@ class ModelView(BaseModelView):
             :param menu_icon_type:
                 Optional icon. Possible icon types:
 
-                 - `flask.ext.admin.consts.ICON_TYPE_GLYPH` - Bootstrap glyph icon
-                 - `flask.ext.admin.consts.ICON_TYPE_IMAGE` - Image relative to Flask static directory
-                 - `flask.ext.admin.consts.ICON_TYPE_IMAGE_URL` - Image with full URL
+                 - `flask_admin.consts.ICON_TYPE_GLYPH` - Bootstrap glyph icon
+                 - `flask_admin.consts.ICON_TYPE_IMAGE` - Image relative to Flask static directory
+                 - `flask_admin.consts.ICON_TYPE_IMAGE_URL` - Image with full URL
             :param menu_icon_value:
                 Icon glyph name or URL, depending on `menu_icon_type` setting
         """
@@ -535,7 +535,7 @@ class ModelView(BaseModelView):
 
                         if join_tables:
                             self._filter_joins[table.name] = join_tables
-                        elif self._need_join(table.name):
+                        elif self._need_join(table):
                             self._filter_joins[table.name] = [table]
                         filters.extend(flt)
 
@@ -576,21 +576,12 @@ class ModelView(BaseModelView):
 
             return flt
 
-    def is_valid_filter(self, filter):
-        """
-            Verify that the provided filter object is derived from the
-            SQLAlchemy-compatible filter class.
-
-            :param filter:
-                Filter object to verify.
-        """
-        return isinstance(filter, filters.BaseSQLAFilter)
-
     def handle_filter(self, filter):
-        column = filter.column
+        if isinstance(filter, sqla_filters.BaseSQLAFilter):
+            column = filter.column
 
-        if self._need_join(column.table):
-            self._filter_joins[column.table.name] = [column.table]
+            if self._need_join(column.table):
+                self._filter_joins[column.table.name] = [column.table]
 
         return filter
 
@@ -810,15 +801,16 @@ class ModelView(BaseModelView):
                 flt = self._filters[idx]
 
                 # Figure out joins
-                tbl = flt.column.table.name
+                if isinstance(flt, sqla_filters.BaseSQLAFilter):
+                    tbl = flt.column.table.name
 
-                join_tables = self._filter_joins.get(tbl, [])
+                    join_tables = self._filter_joins.get(tbl, [])
 
-                for table in join_tables:
-                    if table.name not in joins:
-                        query = query.join(table)
-                        count_query = count_query.join(table)
-                        joins.add(table.name)
+                    for table in join_tables:
+                        if table.name not in joins:
+                            query = query.join(table)
+                            count_query = count_query.join(table)
+                            joins.add(table.name)
 
                 # turn into python format with .clean() and apply filter
                 query = flt.apply(query, flt.clean(value))

flask_admin/contrib/sqlamodel/__init__.py

 def setup():
     import warnings
-    warnings.warn('Flask-Admin sqlalchemy integration module was renamed as flask.ext.admin.contrib.sqla, please use it instead.')
+    warnings.warn('Flask-Admin sqlalchemy integration module was renamed as flask_admin.contrib.sqla, please use it instead.')
 
-    from flask.ext.admin._backwards import import_redirect
+    from flask_admin._backwards import import_redirect
     import_redirect(__name__, 'flask_admin.contrib.sqla')
 
 setup()

flask_admin/form/fields.py

@@ -2,8 +2,8 @@ import time
 import datetime
 
 from wtforms import fields, widgets
-from flask.ext.admin.babel import gettext
-from flask.ext.admin._compat import text_type, as_unicode
+from flask_admin.babel import gettext
+from flask_admin._compat import text_type, as_unicode
 
 from . import widgets as admin_widgets
 

flask_admin/form/rules.py

 from jinja2 import Markup
 
-from flask.ext.admin._compat import string_types
-from flask.ext.admin import helpers
+from flask_admin._compat import string_types
+from flask_admin import helpers
 
 
 class BaseRule(object):
@@ -25,6 +25,13 @@ class BaseRule(object):
         self.rule_set = rule_set
         return self
 
+    @property
+    def visible_fields(self):
+        """
+            A list of visible fields for the given rule.
+        """
+        raise NotImplementedError()
+
     def __call__(self, form, form_opts=None, field_args={}):
         """
             Render rule.
@@ -68,6 +75,17 @@ class NestedRule(BaseRule):
         self.rules = rule_set.configure_rules(self.rules, self)
         return super(NestedRule, self).configure(rule_set, parent)
 
+    @property
+    def visible_fields(self):
+        """
+            Return visible fields for all child rules.
+        """
+        visible_fields = []
+        for rule in self.rules:
+            for field in rule.visible_fields:
+                visible_fields.append(field)
+        return visible_fields
+
     def __iter__(self):
         """
             Return rules.
@@ -111,6 +129,10 @@ class Text(BaseRule):
         self.text = text
         self.escape = escape
 
+    @property
+    def visible_fields(self):
+        return []
+
     def __call__(self, form, form_opts=None, field_args={}):
         if self.escape:
             return self.text
@@ -120,7 +142,7 @@ class Text(BaseRule):
 
 class HTML(Text):
     """
-        Shortcut for `Text` rule with `escape` set to `False.
+        Shortcut for `Text` rule with `escape` set to `False`.
     """
     def __init__(self, html):
         super(HTML, self).__init__(html, escape=False)
@@ -168,6 +190,10 @@ class Macro(BaseRule):
 
         return field
 
+    @property
+    def visible_fields(self):
+        return []
+
     def __call__(self, form, form_opts=None, field_args={}):
         """
             Render macro rule.
@@ -220,6 +246,10 @@ class Container(Macro):
         self.child_rule.configure(rule_set, self)
         return super(Container, self).configure(rule_set, parent)
 
+    @property
+    def visible_fields(self):
+        return self.child_rule.visible_fields
+
     def __call__(self, form, form_opts=None, field_args={}):
         """
             Render container.
@@ -258,6 +288,10 @@ class Field(Macro):
         super(Field, self).__init__(render_field)
         self.field_name = field_name
 
+    @property
+    def visible_fields(self):
+        return [self.field_name]
+
     def __call__(self, form, form_opts=None, field_args={}):
         """
             Render field.
@@ -345,6 +379,14 @@ class RuleSet(object):
         self.view = view
         self.rules = self.configure_rules(rules)
 
+    @property
+    def visible_fields(self):
+        visible_fields = []
+        for rule in self.rules:
+            for field in rule.visible_fields:
+                visible_fields.append(field)
+        return visible_fields
+
     def convert_string(self, value):
         """
             Convert string to rule.

flask_admin/form/upload.py

@@ -12,10 +12,10 @@ try:
 except ImportError:
     from wtforms.utils import unset_value
 
-from flask.ext.admin.babel import gettext
-from flask.ext.admin.helpers import get_url
+from flask_admin.babel import gettext
+from flask_admin.helpers import get_url
 
-from flask.ext.admin._compat import string_types, urljoin
+from flask_admin._compat import string_types, urljoin
 
 
 try:

flask_admin/form/widgets.py

 from wtforms import widgets
 from flask.globals import _request_ctx_stack
-from flask.ext.admin.babel import gettext, ngettext
-from flask.ext.admin import helpers as h
+from flask_admin.babel import gettext, ngettext
+from flask_admin import helpers as h
 
 __all__ = ['Select2Widget', 'DatePickerWidget', 'DateTimePickerWidget', 'RenderTemplateWidget', 'Select2TagsWidget', ]
 

flask_admin/helpers.py

@@ -3,8 +3,7 @@ from jinja2 import contextfunction
 from flask import g, request, url_for, flash
 from wtforms.validators import DataRequired, InputRequired
 
-from flask.ext.admin._compat import urljoin, urlparse, iteritems
-from flask.ext.admin.babel import gettext
+from flask_admin._compat import urljoin, urlparse, iteritems
 
 from ._compat import string_types
 
@@ -93,9 +92,10 @@ def is_field_error(errors):
             return True
 
     return False
-    
-    
+
+
 def flash_errors(form, message):
+    from flask_admin.babel import gettext
     for field_name, errors in iteritems(form.errors):
         errors = form[field_name].label.text + u": " + u", ".join(errors)
         flash(gettext(message, error=str(errors)), 'error')

flask_admin/model/__init__.py

 from .base import BaseModelView
 from .form import InlineFormAdmin
-from flask.ext.admin.actions import action
+from flask_admin.actions import action

flask_admin/model/base.py

@@ -5,19 +5,20 @@ from flask import (request, redirect, flash, abort, json, Response,
                    get_flashed_messages)
 from jinja2 import contextfunction
 from wtforms.fields import HiddenField
+from wtforms.fields.core import UnboundField
 from wtforms.validators import ValidationError, Required
 
-from flask.ext.admin.babel import gettext
+from flask_admin.babel import gettext
 
-from flask.ext.admin.base import BaseView, expose
-from flask.ext.admin.form import BaseForm, FormOpts, rules
-from flask.ext.admin.model import filters, typefmt
-from flask.ext.admin.actions import ActionsMixin
-from flask.ext.admin.helpers import (get_form_data, validate_form_on_submit,
+from flask_admin.base import BaseView, expose
+from flask_admin.form import BaseForm, FormOpts, rules
+from flask_admin.model import filters, typefmt
+from flask_admin.actions import ActionsMixin
+from flask_admin.helpers import (get_form_data, validate_form_on_submit,
                                      get_redirect_target, flash_errors)
-from flask.ext.admin.tools import rec_getattr
-from flask.ext.admin._backwards import ObsoleteAttr
-from flask.ext.admin._compat import iteritems, OrderedDict, as_unicode
+from flask_admin.tools import rec_getattr
+from flask_admin._backwards import ObsoleteAttr
+from flask_admin._compat import iteritems, OrderedDict, as_unicode
 from .helpers import prettify_name, get_mdict_item_or_list
 from .ajax import AjaxModelLoader
 from .fields import ListEditableFieldList
@@ -133,7 +134,7 @@ class BaseModelView(BaseView, ActionsMixin):
 
         or using Jinja2 `macro` in template::
 
-            from flask.ext.admin.model.template import macro
+            from flask_admin.model.template import macro
 
             class MyModelView(BaseModelView):
                 column_formatters = dict(price=macro('render_price'))
@@ -170,7 +171,7 @@ class BaseModelView(BaseView, ActionsMixin):
         If you want to display `NULL` instead of an empty string, you can do
         something like this::
 
-            from flask.ext.admin.model import typefmt
+            from flask_admin.model import typefmt
 
             MY_DEFAULT_FORMATTERS = dict(typefmt.BASE_FORMATTERS)
             MY_DEFAULT_FORMATTERS.update({
@@ -296,7 +297,7 @@ class BaseModelView(BaseView, ActionsMixin):
     """
         Collection of the column filters.
 
-        Can contain either field names or instances of :class:`~flask.ext.admin.model.filters.BaseFilter` classes.
+        Can contain either field names or instances of :class:`~flask_admin.model.filters.BaseFilter` classes.
 
         Example::
 
@@ -486,7 +487,7 @@ class BaseModelView(BaseView, ActionsMixin):
 
         Here's simple example which illustrates how to use::
 
-            from flask.ext.admin.form import rules
+            from flask_admin.form import rules
 
             class MyModelView(ModelView):
                 form_rules = [
@@ -555,9 +556,9 @@ class BaseModelView(BaseView, ActionsMixin):
             :param menu_icon_type:
                 Optional icon. Possible icon types:
 
-                 - `flask.ext.admin.consts.ICON_TYPE_GLYPH` - Bootstrap glyph icon
-                 - `flask.ext.admin.consts.ICON_TYPE_IMAGE` - Image relative to Flask static directory
-                 - `flask.ext.admin.consts.ICON_TYPE_IMAGE_URL` - Image with full URL
+                 - `flask_admin.consts.ICON_TYPE_GLYPH` - Bootstrap glyph icon
+                 - `flask_admin.consts.ICON_TYPE_IMAGE` - Image relative to Flask static directory
+                 - `flask_admin.consts.ICON_TYPE_IMAGE_URL` - Image with full URL
             :param menu_icon_value:
                 Icon glyph name or URL, depending on `menu_icon_type` setting
         """
@@ -685,6 +686,10 @@ class BaseModelView(BaseView, ActionsMixin):
         # Form rendering rules
         self._refresh_form_rules_cache()
 
+        # Process form rules
+        self._validate_form_class(self._form_edit_rules, self._edit_form_class)
+        self._validate_form_class(self._form_create_rules, self._create_form_class)
+
     # Primary key
     def get_pk_value(self, model):
         """
@@ -892,8 +897,8 @@ class BaseModelView(BaseView, ActionsMixin):
 
             Allows overriding the editable list view field/widget. For example::
 
-                from flask.ext.admin.model.fields import ListEditableFieldList
-                from flask.ext.admin.model.widgets import XEditableWidget
+                from flask_admin.model.fields import ListEditableFieldList
+                from flask_admin.model.widgets import XEditableWidget
 
                 class CustomWidget(XEditableWidget):
                     def get_kwargs(self, subfield, kwargs):
@@ -972,7 +977,7 @@ class BaseModelView(BaseView, ActionsMixin):
             Instantiate model delete form and return it.
 
             Override to implement custom behavior.
-            
+
             The delete form originally used a GET request, so delete_form
             accepts both GET and POST request for backwards compatibility.
         """
@@ -1001,6 +1006,51 @@ class BaseModelView(BaseView, ActionsMixin):
         """
         return validate_form_on_submit(form)
 
+
+    def _get_ruleset_missing_fields(self, ruleset, form):
+        missing_fields = []
+
+        if ruleset:
+            visible_fields = ruleset.visible_fields
+            for field in form:
+                if field.name not in visible_fields:
+                    missing_fields.append(field.name)
+
+        return missing_fields
+
+    def _validate_form_class(self, ruleset, form_class, remove_missing=True):
+        form_fields = []
+        for name, obj in iteritems(form_class.__dict__):
+            if isinstance(obj, UnboundField):
+                form_fields.append(name)
+
+        missing_fields = []
+        if ruleset:
+            visible_fields = ruleset.visible_fields
+            for field_name in form_fields:
+                if field_name not in visible_fields:
+                    missing_fields.append(field_name)
+
+        if missing_fields:
+            warnings.warn('Fields missing from ruleset: %s' % (','.join(missing_fields)))
+        if remove_missing:
+            self._remove_fields_from_form_class(missing_fields, form_class)
+
+    def _validate_form_instance(self, ruleset, form, remove_missing=True):
+        missing_fields = self._get_ruleset_missing_fields(ruleset=ruleset, form=form)
+        if missing_fields:
+            warnings.warn('Fields missing from ruleset: %s' % (','.join(missing_fields)))
+        if remove_missing:
+            self._remove_fields_from_form_instance(missing_fields, form)
+
+    def _remove_fields_from_form_instance(self, field_names, form):
+        for field_name in field_names:
+            form.__delitem__(field_name)
+
+    def _remove_fields_from_form_class(self, field_names, form_class):
+        for field_name in field_names:
+            delattr(form_class, field_name)
+
     # Helpers
     def is_sortable(self, name):
         """
@@ -1477,6 +1527,8 @@ class BaseModelView(BaseView, ActionsMixin):
             return redirect(return_url)
 
         form = self.create_form()
+        if not hasattr(form, '_validated_ruleset') or not form._validated_ruleset:
+            self._validate_form_instance(ruleset=self._form_create_rules, form=form)
 
         if self.validate_form(form):
             if self.create_model(form):
@@ -1514,6 +1566,8 @@ class BaseModelView(BaseView, ActionsMixin):
             return redirect(return_url)
 
         form = self.edit_form(obj=model)
+        if not hasattr(form, '_validated_ruleset') or not form._validated_ruleset:
+            self._validate_form_instance(ruleset=self._form_create_rules, form=form)
 
         if self.validate_form(form):
             if self.update_model(form, model):

flask_admin/model/fields.py

@@ -8,7 +8,7 @@ try:
 except ImportError:
     from wtforms.utils import unset_value
 
-from flask.ext.admin._compat import iteritems
+from flask_admin._compat import iteritems
 from .widgets import (InlineFieldListWidget, InlineFormWidget,
                       AjaxSelect2Widget, XEditableWidget)
 

flask_admin/model/filters.py

 import time
 import datetime
 
-from flask.ext.admin._compat import text_type
-from flask.ext.admin.babel import lazy_gettext
+from flask_admin._compat import text_type
+from flask_admin.babel import lazy_gettext
 
 
 class BaseFilter(object):
@@ -263,10 +263,10 @@ def convert(*args):
     """
         Decorator for field to filter conversion routine.
 
-        See :mod:`flask.ext.admin.contrib.sqla.filters` for usage example.
+        See :mod:`flask_admin.contrib.sqla.filters` for usage example.
     """
     def _inner(func):
-        func._converter_for = map(str.lower, args)
+        func._converter_for = list(map(str.lower, args))
         return func
     return _inner
 

flask_admin/model/form.py

 import inspect
 
-from flask.ext.admin.form import BaseForm, rules
-from flask.ext.admin._compat import iteritems
+from flask_admin.form import BaseForm, rules
+from flask_admin._compat import iteritems
 
 from wtforms.fields.core import UnboundField
 
@@ -21,7 +21,7 @@ def wrap_fields_in_fieldlist(form_base_class, form_class, CustomFieldList):
         in this format: ('<field_name>-<primary_key>', '<value>')
 
         Used in the editable list view.
-        
+
         :param form_base_class:
             WTForms form class, by default `form_base_class` from base.
         :param form_class:

flask_admin/model/typefmt.py

 from jinja2 import Markup
-from flask.ext.admin._compat import text_type
+from flask_admin._compat import text_type
 
 
 def null_formatter(view, value):

flask_admin/model/widgets.py

 from flask import json
 from wtforms.widgets import HTMLString, html_params
 
-from flask.ext.admin._compat import as_unicode
-from flask.ext.admin.babel import gettext
-from flask.ext.admin.helpers import get_url
-from flask.ext.admin.form import RenderTemplateWidget
+from flask_admin._compat import as_unicode
+from flask_admin.babel import gettext
+from flask_admin.helpers import get_url
+from flask_admin.form import RenderTemplateWidget
 
 
 class InlineFieldListWidget(RenderTemplateWidget):
@@ -72,7 +72,7 @@ class XEditableWidget(object):
     """
     def __call__(self, field, **kwargs):
         kwargs.setdefault('data-value', kwargs.pop('value', ''))
-        
+
         kwargs.setdefault('data-role', 'x-editable')
         kwargs.setdefault('data-url', './ajax/update/')
 

flask_admin/tests/fileadmin/__init__.py

 from flask import Flask
-from flask.ext.admin import Admin
+from flask_admin import Admin
 
 
 def setup():

flask_admin/tests/fileadmin/test_fileadmin.py

@@ -2,7 +2,7 @@ import os.path as op
 
 from nose.tools import eq_, ok_
 
-from flask.ext.admin.contrib import fileadmin
+from flask_admin.contrib import fileadmin
 
 from . import setup
 

flask_admin/tests/geoa/__init__.py

 from flask import Flask
-from flask.ext.admin import Admin
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_admin import Admin
+from flask_sqlalchemy import SQLAlchemy
 
 
 def setup():