Changed references to flask-admin

doc/conf.py

 # -*- coding: utf-8 -*-
 #
-# flask-adminex documentation build configuration file, created by
+# flask-admin documentation build configuration file, created by
 # sphinx-quickstart on Tue Nov 01 18:35:30 2011.
 #
 # This file is execfile()d with the current directory set to its containing dir.
@@ -40,7 +40,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'flask-adminex'
+project = u'flask-admin'
 copyright = u'2012, Serge S. Koval'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -170,7 +170,7 @@ html_sidebars = {
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'flask-adminex'
+htmlhelp_basename = 'flask-admin'
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -189,7 +189,7 @@ latex_elements = {
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'flask-adminex', u'Flask-AdminEx documentation',
+  ('index', 'flask-admin', u'Flask-Admin documentation',
    u'Serge S. Koval', 'manual'),
 ]
 
@@ -219,7 +219,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'flask-adminex', u'Flask-AdminEx documentation',
+    ('index', 'flask-admin', u'Flask-Admin documentation',
      [u'Serge S. Koval'], 1)
 ]
 
@@ -233,8 +233,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'flask-adminex', u'Flask-AdminEx documentation',
-   u'Serge S. Koval', 'Flask-AdminEx', 'One line description of project.',
+  ('index', 'flask-admin', u'Flask-Admin documentation',
+   u'Serge S. Koval', 'Flask-Admin', 'One line description of project.',
    'Miscellaneous'),
 ]
 

examples/auth/auth.py

 from flask import Flask, url_for, redirect, render_template, request
 from flaskext.sqlalchemy import SQLAlchemy
 
-from flask.ext import adminex, login, wtf
-from flask.ext.adminex.ext import sqlamodel
+from flask.ext import admin, login, wtf
+from flask.ext.admin.ext import sqlamodel
 
 # Create application
 app = Flask(__name__)
@@ -88,7 +88,7 @@ class MyModelView(sqlamodel.ModelView):
 
 
 # Create customized index view class
-class MyAdminIndexView(adminex.AdminIndexView):
+class MyAdminIndexView(admin.AdminIndexView):
     def is_accessible(self):
         return login.current_user.is_authenticated()
 
@@ -137,7 +137,7 @@ if __name__ == '__main__':
     init_login()
 
     # Create admin
-    admin = adminex.Admin(app, 'Auth', index_view=MyAdminIndexView())
+    admin = admin.Admin(app, 'Auth', index_view=MyAdminIndexView())
 
     # Add view
     admin.add_view(MyModelView(User, db.session))

examples/babel/simple.py

 from flask import Flask, request, session
 from flaskext.sqlalchemy import SQLAlchemy
 
-from flask.ext import adminex, wtf
+from flask.ext import admin
 from flask.ext.babel import Babel
 
-from flask.ext.adminex.ext import sqlamodel
+from flask.ext.admin.ext import sqlamodel
 
 # Create application
 app = Flask(__name__)
@@ -62,7 +62,7 @@ def index():
 
 if __name__ == '__main__':
     # Create admin
-    admin = adminex.Admin(app, 'Simple Models')
+    admin = admin.Admin(app, 'Simple Models')
 
     admin.locale_selector(get_locale)
 

examples/file/file.py

@@ -3,8 +3,8 @@ import os.path as op
 
 from flask import Flask
 
-from flask.ext import adminex
-from flask.ext.adminex.ext import fileadmin
+from flask.ext import admin
+from flask.ext.admin.ext import fileadmin
 
 
 # Create flask app
@@ -29,7 +29,7 @@ if __name__ == '__main__':
         pass
 
     # Create admin interface
-    admin = adminex.Admin(app)
+    admin = admin.Admin(app)
     admin.add_view(fileadmin.FileAdmin(path, '/files/', name='Files'))
 
     # Start app

examples/quickstart/first.py

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

examples/quickstart/second.py

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

examples/quickstart/third.py

 from flask import Flask
-from flask.ext.adminex import Admin, BaseView, expose
+from flask.ext.admin import Admin, BaseView, expose
 
 class MyView(BaseView):
     @expose('/')

examples/simple/simple.py

 from flask import Flask, render_template
 
-from flask.ext import adminex
+from flask.ext import admin
 
 
 # Create custom admin view
-class MyAdminView(adminex.BaseView):
-    @adminex.expose('/')
+class MyAdminView(admin.BaseView):
+    @admin.expose('/')
     def index(self):
         return self.render('myadmin.html')
 
 
-class AnotherAdminView(adminex.BaseView):
-    @adminex.expose('/')
+class AnotherAdminView(admin.BaseView):
+    @admin.expose('/')
     def index(self):
         return self.render('anotheradmin.html')
 
-    @adminex.expose('/test/')
+    @admin.expose('/test/')
     def test(self):
         return self.render('test.html')
 
@@ -23,6 +23,7 @@ class AnotherAdminView(adminex.BaseView):
 # Create flask app
 app = Flask(__name__, template_folder='templates')
 
+
 # Flask views
 @app.route('/')
 def index():
@@ -31,7 +32,7 @@ def index():
 
 if __name__ == '__main__':
     # Create admin interface
-    admin = adminex.Admin()
+    admin = admin.Admin()
     admin.add_view(MyAdminView(category='Test'))
     admin.add_view(AnotherAdminView(category='Test'))
     admin.init_app(app)

examples/sqla/simple.py

 from flask import Flask
 from flaskext.sqlalchemy import SQLAlchemy
 
-from flask.ext import adminex, wtf
-from flask.ext.adminex.ext import sqlamodel
-from flask.ext.adminex.ext.sqlamodel import filters
+from flask.ext import admin, wtf
+from flask.ext.admin.ext import sqlamodel
+from flask.ext.admin.ext.sqlamodel import filters
 
 # Create application
 app = Flask(__name__)
@@ -79,7 +79,7 @@ class PostAdmin(sqlamodel.ModelView):
 
 if __name__ == '__main__':
     # Create admin
-    admin = adminex.Admin(app, 'Simple Models')
+    admin = admin.Admin(app, 'Simple Models')
 
     # Add views
     admin.add_view(sqlamodel.ModelView(User, db.session))

flask_adminex/babel.py

 try:
     from flask.ext.babel import Domain
 
-    from flask.ext.adminex import translations
+    from flask.ext.admin import translations
 
     class CustomDomain(Domain):
         def __init__(self):

flask_adminex/base.py

@@ -3,7 +3,7 @@ from re import sub
 
 from flask import Blueprint, render_template, url_for, abort
 
-from flask.ext.adminex import babel
+from flask.ext.admin import babel
 
 
 def expose(url='/', methods=('GET',)):
@@ -181,7 +181,7 @@ class BaseView(object):
         """
             Override this method to add permission checks.
 
-            Flask-AdminEx does not make any assumptions about authentication system used in your application, so it is
+            Flask-Admin does not make any assumptions about authentication system used in your application, so it is
             up for you to implement it.
 
             By default, it will allow access for the everyone.
@@ -289,7 +289,7 @@ class Admin(object):
                 Home page view to use. If not provided, will use `AdminIndexView`.
             `translations_path`
                 Location of the translation message catalogs. By default will use translations
-                shipped with the Flask-AdminEx.
+                shipped with the Flask-Admin.
         """
         self.app = app
 
@@ -395,7 +395,7 @@ class Admin(object):
                 Flask application instance
         """
         if self.app is not None:
-            raise Exception('Flask-AdminEx is already associated with an application.')
+            raise Exception('Flask-Admin is already associated with an application.')
 
         self.app = app
 

flask_adminex/ext/fileadmin.py

@@ -11,9 +11,9 @@ from werkzeug import secure_filename
 
 from flask import flash, url_for, redirect, abort, request
 
-from flask.ext.adminex.base import BaseView, expose
-from flask.ext.adminex.babel import gettext, lazy_gettext
-from flask.ext.adminex import form
+from flask.ext.admin.base import BaseView, expose
+from flask.ext.admin.babel import gettext, lazy_gettext
+from flask.ext.admin import form
 from flask.ext import wtf
 
 

flask_adminex/ext/sqlamodel/filters.py

 from flask.ext.babel import gettext
 
-from flask.ext.adminex.model import filters
-from flask.ext.adminex.ext.sqlamodel import tools
+from flask.ext.admin.model import filters
+from flask.ext.admin.ext.sqlamodel import tools
 
 
 class BaseSQLAFilter(filters.BaseFilter):

flask_adminex/ext/sqlamodel/form.py

@@ -4,7 +4,7 @@ from wtforms import ValidationError, fields, validators
 from wtforms.ext.sqlalchemy.orm import converts, ModelConverter
 from wtforms.ext.sqlalchemy.fields import QuerySelectField, QuerySelectMultipleField
 
-from flask.ext.adminex import form
+from flask.ext.admin import form
 
 
 class Unique(object):

flask_adminex/ext/sqlamodel/view.py

@@ -7,10 +7,10 @@ from wtforms.ext.sqlalchemy.orm import model_form
 from flask import flash
 from flask.ext.babel import gettext
 
-from flask.ext.adminex.form import BaseForm
-from flask.ext.adminex.model import BaseModelView
+from flask.ext.admin.form import BaseForm
+from flask.ext.admin.model import BaseModelView
 
-from flask.ext.adminex.ext.sqlamodel import form, filters, tools
+from flask.ext.admin.ext.sqlamodel import form, filters, tools
 
 
 class ModelView(BaseModelView):
@@ -93,7 +93,7 @@ class ModelView(BaseModelView):
     """
         Collection of the column filters.
 
-        Can contain either field names or instances of :class:`flask.ext.adminex.ext.sqlamodel.filters.BaseFilter` classes.
+        Can contain either field names or instances of :class:`flask.ext.admin.ext.sqlamodel.filters.BaseFilter` classes.
 
         For example::
 

flask_adminex/form.py

@@ -4,7 +4,7 @@ import datetime
 from flask.ext import wtf
 from wtforms import fields, widgets
 
-from flask.ext.adminex.babel import gettext
+from flask.ext.admin.babel import gettext
 
 
 class BaseForm(wtf.Form):

flask_adminex/model/base.py

@@ -2,8 +2,8 @@ from flask import request, url_for, redirect, flash
 
 from flask.ext.babel import gettext
 
-from flask.ext.adminex.base import BaseView, expose
-from flask.ext.adminex.model import filters
+from flask.ext.admin.base import BaseView, expose
+from flask.ext.admin.model import filters
 
 
 class BaseModelView(BaseView):
@@ -116,7 +116,7 @@ class BaseModelView(BaseView):
     """
         Collection of the column filters.
 
-        Can contain either field names or instances of :class:`~flask.ext.adminex.model.filters.BaseFilter` classes.
+        Can contain either field names or instances of :class:`~flask.ext.admin.model.filters.BaseFilter` classes.
 
         For example:
 

flask_adminex/model/filters.py

-from flask.ext.adminex.babel import lazy_gettext
+from flask.ext.admin.babel import lazy_gettext
 
 
 class BaseFilter(object):
@@ -119,7 +119,7 @@ def convert(*args):
     """
         Decorator for field to filter conversion routine.
 
-        See :mod:`flask.ext.adminex.ext.sqlamodel.filters` for usage example.
+        See :mod:`flask.ext.admin.ext.sqlamodel.filters` for usage example.
     """
     def _inner(func):
         func._converter_for = args

flask_adminex/tests/test_base.py

 from nose.tools import ok_, eq_, raises
 
 from flask import Flask
-from flask.ext.adminex import base
+from flask.ext.admin import base
 
 
 class MockView(base.BaseView):

flask_adminex/tests/test_model.py

@@ -3,8 +3,8 @@ from nose.tools import eq_, ok_, raises
 from flask import Flask
 from flask.helpers import get_flashed_messages
 
-from flask.ext.adminex import Admin
-from flask.ext.adminex.model import base, filters
+from flask.ext.admin import Admin
+from flask.ext.admin.model import base, filters
 
 from flask.ext import wtf
 

flask_adminex/tests/test_sqlamodel.py

@@ -5,8 +5,8 @@ from flask import Flask
 from flask.ext import wtf
 
 from flask.ext.sqlalchemy import SQLAlchemy
-from flask.ext.adminex import Admin
-from flask.ext.adminex.ext.sqlamodel import ModelView
+from flask.ext.admin import Admin
+from flask.ext.admin.ext.sqlamodel import ModelView
 
 
 class CustomModelView(ModelView):

setup.py

@@ -4,8 +4,8 @@ import multiprocessing, logging
 from setuptools import setup, find_packages
 
 setup(
-    name='Flask-AdminEx',
-    version='0.0.1',
+    name='Flask-Admin',
+    version='1.0.0',
     url='https://github.com/mrjoes/flask-extadmin/',
     license='BSD',
     author='Serge S. Koval',