Permalink
Browse files

Documentation, fixes etc...

  • Loading branch information...
1 parent e09bee9 commit a6507539441c32ce6f1f9b24f207d1e49d240a7d @jorgebastida committed Aug 2, 2012
Showing with 26 additions and 15 deletions.
  1. +12 −0 AUTHORS
  2. +1 −3 MANIFEST.in
  3. +7 −7 README.rst
  4. +1 −1 dajaxice/__init__.py
  5. +1 −0 dajaxice/templates/dajaxice/dajaxice.core.js
  6. +2 −2 docs/conf.py
  7. +1 −1 docs/installation.rst
  8. +1 −1 docs/migrating-to-05.rst
View
@@ -0,0 +1,12 @@
+Glue is mainly developed and maintained by Jorge Bastida <me@jorgebastida.com>
+
+A big thanks to all the contributors:
+Angel Abad for the Debian and Ubuntu distribution package.
+Denis Darii <denis.darii@gmail.com>
+Florian Le Goff <florian@9h37.fr>
+Youen Péron <@youen>
+Clément Nodet <clement.nodet@gmail.com>
+
+And the authors of:
+XmlHttpRequest.js project (License inside COPYING)
+json2.js Library (License inside COPYING)
View
@@ -1,8 +1,6 @@
include *.py
-include CHANGELOG
include COPYING
-include INSTALL
-include MANIFEST.in
+include AUTHORS
recursive-include dajaxice *
recursive-exclude dajaxice *.pyc
recursive-include examples *
View
@@ -1,8 +1,13 @@
+django-dajaxice
+===============
+
Dajaxice is the communication core of dajaxproject. It's main goal is to trivialize the asynchronous communication within the django server side code and your js code.
dajaxice is JS-framework agnostic and focuses on decoupling the presentation logic from the server-side logic. dajaxice only requieres 5 minutes to start working.
-Dajaxice has the following aims:
+Project Aims
+------------
+
* Isolate the communication between the client and the server.
* JS Framework agnostic (No Prototype, JQuery... needed ).
* Presentation logic outside the views (No presentation code inside ajax functions).
@@ -11,9 +16,4 @@ Dajaxice has the following aims:
* Unobtrusive standard-compliant (W3C) XMLHttpRequest 1.0 object usage.
Official site http://dajaxproject.com
-Documentation http://docs.dajaxproject.com/dajaxice/
-
-Dajaxice thanks:
- - Angel Abad for the package distribution.
- - XmlHttpRequest.js project (License inside COPYING)
- - json2.js Library (License inside COPYING)
+Documentation http://readthedocs.org/projects/django-dajaxice/
@@ -1 +1 @@
-VERSION = (0, 5, 0, 0, 'beta')
+__version__ = (0, 5, 0, 0, 'beta')
@@ -58,6 +58,7 @@ var Dajaxice = {
}
}
oXMLHttpRequest.send(send_data);
+ return oXMLHttpRequest;
},
setup: function(settings)
View
@@ -49,9 +49,9 @@
#
import pkg_resources
try:
- release = pkg_resources.get_distribution('glue').version
+ release = pkg_resources.get_distribution('django-dajaxice').version
except pkg_resources.DistributionNotFound:
- print 'To build the documentation, The distribution information of glue'
+ print 'To build the documentation, The distribution information of django-dajaxice'
print 'Has to be available. Either install the package into your'
print 'development environment or run "setup.py develop" to setup the'
print 'metadata. A virtualenv is recommended!'
@@ -48,7 +48,7 @@ Add a new line in urls.py urlpatterns with this code::
urlpatterns = patterns('',
...
- (dajaxice_config.dajaxice_url, include('dajaxice.urls')),
+ url(dajaxice_config.dajaxice_url, include('dajaxice.urls')),
...
)
@@ -45,7 +45,7 @@ And replate your old dajaxice url with the new one::
(r'^%s/' % settings.DAJAXICE_MEDIA_PREFIX, include('dajaxice.urls')),
# New style
- (dajaxice_config.dajaxice_url, include('dajaxice.urls')),
+ url(dajaxice_config.dajaxice_url, include('dajaxice.urls')),
Done!

0 comments on commit a650753

Please sign in to comment.