From 26a2084f03f3088264da78c11978aea5193286e7 Mon Sep 17 00:00:00 2001
From: sshwsfc <sshwsfc@gmail.com>
Date: Mon, 6 May 2013 17:45:14 +0800
Subject: [PATCH] Update setup.py and install document and demo datas.

---
 README.md                 |  25 ++++++++++++++++++-------
 demo_app/app/adminx.py    |  13 -------------
 demo_app/data.db          | Bin 339968 -> 339968 bytes
 demo_app/demo/settings.py |   5 -----
 setup.py                  |   7 ++++---
 5 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 24aded6e1..7625ad7f1 100644
--- a/README.md
+++ b/README.md
@@ -38,18 +38,29 @@ Screenshots
 ![Edit inline](https://raw.github.com/sshwsfc/django-xadmin/docs-chinese/doc/images/plugins/editable.png)
 
 
+Get Started
+-----------
+
+**Install**
+
+Xadmin is best installed via PyPI. To install the latest version, run:
+
+```bash
+pip install django-xadmin
+```
+
+or Install form github source:
+
+```bash
+pip install git+git://github.com/sshwsfc/django-xadmin.git
+```
+
 Documentation
 --------
 
 * English (coming soon)
 * [Chinese](https://xadmin.readthedocs.org/en/latest/index.html)
 
-
-Get Started
------------
-
-Coming soon.
-
 Online Group
 --------------
 
@@ -63,7 +74,7 @@ cd demo_app
 ./manage.py runserver
 ```
 
-Open http://127.0.0.1:8000 in your browser
+Open http://127.0.0.1:8000 in your browser, the admin user password is ``admin``
 
 Help
 ----
diff --git a/demo_app/app/adminx.py b/demo_app/app/adminx.py
index e4d9e1c8d..22f989e9c 100644
--- a/demo_app/app/adminx.py
+++ b/demo_app/app/adminx.py
@@ -166,16 +166,3 @@ def avg_count(self, instance):
 xadmin.site.register(MaintainLog, MaintainLogAdmin)
 xadmin.site.register(IDC, IDCAdmin)
 xadmin.site.register(AccessRecord, AccessRecordAdmin)
-
-# Override auth admins
-from django.contrib.auth.models import User
-from xadmin.plugins.auth import UserAdmin
-
-class DemoUserAdmin(UserAdmin):
-    def save_models(self):
-        pass
-    def delete_model(self):
-        pass
-
-xadmin.site.unregister(User)
-xadmin.site.register(User, DemoUserAdmin)
diff --git a/demo_app/data.db b/demo_app/data.db
index 7748d290944935c52c45ddeed1d49f39f4447353..0933552e995cfd6cef16b0da98ca22cac09afa5b 100644
GIT binary patch
delta 97
zcmZp8Aky$aWP&u~qKPujjEgoVSnankF32=ZGx8}-&G$-H$xY01(GLj;Ps$4j4$s!t
z&+soy^r<i`Gjz&ybV(^IE^-Ns@C+_8buKVyzO=vn(tbuDW&&d7?U(km=oJ6}<~b$%

delta 97
zcmZp8Aky$aWP&u~!ih4@j0-m=SnancN-oSU^$l`%O)oK2Ni7I3ODl9P2@5VQF^mc-
ztIG3EPj?F`wJ6WE^z*VThzv<}i8RaCHxBh}zO=vn(tbuDW&&d7?U(km=oJ6}ChjKY

diff --git a/demo_app/demo/settings.py b/demo_app/demo/settings.py
index ecf12f7a5..7f51fe4ec 100644
--- a/demo_app/demo/settings.py
+++ b/demo_app/demo/settings.py
@@ -28,11 +28,6 @@
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
     }
 }
-try:
-    import dj_database_url
-    DATABASES['default'] =  dj_database_url.config()
-except Exception:
-    pass
 # Hosts/domain names that are valid for this site; required if DEBUG is False
 # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
 ALLOWED_HOSTS = '*'
diff --git a/setup.py b/setup.py
index 500f0feec..b260008b5 100644
--- a/setup.py
+++ b/setup.py
@@ -6,18 +6,19 @@
 
 setup(
     name='django-xadmin',
-    version='0.1.0',
+    version='0.1.0-dev',
     description='Drop-in replacement of Django admin comes with lots of goodies, fully extensible with plugin support, pretty UI based on Twitter Bootstrap.',
     long_description=open('README.md').read(),
     author='sshwsfc',
     author_email='sshwsfc@gmail.com',
-    url='http://xadmin.io',
+    url='http://www.xadmin.io',
+    download_url='http://github.com/sshwsfc/django-xadmin/archive/master.zip',
     packages=['xadmin', 'xadmin.plugins', 'xadmin.templatetags', 'xadmin.tests', 'xadmin.views'],
     include_package_data=True,
     zip_safe=False,
     keywords=['admin', 'django', 'xadmin', 'bootstrap'],
     classifiers=[
-        'Development Status :: 1 - Alpha',
+        'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
         'Framework :: Django',
         'Intended Audience :: Developers',