Merge remote-tracking branch 'origin/master'

Conflicts:
	yawdadmin/templates/admin/edit_inline/tabular.html
	yawdadmin/templatetags/yawdadmin_filters.py

CHANGES.rst

@@ -3,19 +3,20 @@
 Changelog
 +++++++++
 
-v.0.7.0, ?
-==========
+v.0.7.0, 2013.10.23
+===================
 
+* popup/ajax inlines, one-to-one inlines
 * auto side-navigation affix menu in change pages (based on fieldsets & inlines)
 * drag & drop ordering in changelist view
 * "my account" view for non-admin users to edit their own info
 * new admin widgets
 * reworked filters section
 * reworked authentication/registration templates
-* added the font-awesome icons
+* added the font-awesome icons (updated to 3.2.1)
 * model icons
-* various minor html/css improvements
 * automatic calculation of the popover (help text) placement
+* documentation enhancements
 * some work towards PEP8/pylint compliance
 
 v.0.6.1, 2013.03.06

README.rst

@@ -1,6 +1,13 @@
 yawd-admin, a django administration website
 ======================================================
 
+yawd-admin now has a live demo at
+`http://yawd-admin.yawd.eu/ <http://yawd.eu/open-source-projects/yawd-admin/>`_.
+Use demo / demo as username & passowrd.
+
+.. image:: docs/yawd-admin-screenshot.png
+	:align: center
+
 `yawd-admin <http://yawd.eu/open-source-projects/yawd-admin/>`_ is an 
 administration website for django. It extends the default django admin 
 site and offers the following:
@@ -16,21 +23,22 @@ site and offers the following:
 * Seamless integration with `yawd-translations` for multilingual admin websites
 
 .. note::
+
 	yawd-admin v0.6.1 is the last version intended to work with
-	Django 1.4. The current master is actively developed under Django 1.5
+	Django 1.4. yawd-admin v.0.7.0 and on is developed under Django 1.5.x
 	and does NOT work with older Django releases. For those still using
 	Django 1.4, you can checkout the ``0.6.x`` branch or use the yawd-admin
 	v0.6.1 pypi package. New features will not be backported to the ``0.6.x``
 	branch. Since many of us run production systems tied to Django 1.4, both
 	v0.6.1 and the latest documentation will be online on readthedocs.org. 
 
-.. image:: http://yawd.eu/media/images/yawd-admin-screenshot.png
-
 Usage and demo
 ==============
 
 See the `yawd-admin documentation <http://yawd-admin.readthedocs.org/en/latest/>`_ 
-for information on how to install the demo and use yawd-admin.
+for information on how to install the demo and use yawd-admin. There is also an
+online version of the demo at `http://yawd-admin.yawd.eu/ <http://yawd.eu/open-source-projects/yawd-admin/>`_.
+Just use *demo*/*demo* as username and password.
 
 Screenshots
 ===========

docs/analytics.rst

@@ -0,0 +1,88 @@
+.. _google-analytics:
+
+Integration with Google Analytics
++++++++++++++++++++++++++++++++++
+
+To access your google analytics reports through the yawd-admin
+index page you need to first create a new google API application
+by performing the following steps:
+
+* Visit the Google APIs Console (https://code.google.com/apis/console)
+* Sign-in and create a project or use an existing project.
+* In the Services pane (https://code.google.com/apis/console#:services) activate Analytics API for your project. If prompted, read and accept the terms of service.
+* Go to the API Access pane (https://code.google.com/apis/console/#:access):
+* Click Create an OAuth 2.0 client ID:
+
+	* Fill out the Branding Information fields and click Next.
+	* In Client ID Settings, set Application type to 'Web application'.
+	* In the **Your site or hostname** section click 'more options'.
+
+		* The **Authorized redirect URIs** field must be set to ``http://localhost:8000/admin/oauth2callback/`` (trailing slash seems to matter at this point of time). Replace `localhost:8000` with a domain if you are on a production system. The '/admin/' part of the URL refers to the :ref:`prefix <register-urls>` you used to register the admin site with.
+		* The **Authorized JavaScript Origins** field must be set to ``http://localhost:8000/`` (or the domain root if you are on a production system).
+
+	* Click Create client ID
+
+Keep a node of the generated `Client ID` and `Client secret` as we will
+use them later on.
+
+Go into your project source files and create a new file named
+`client_secrets.json`. The file contents should look like this::
+
+	{
+	  "web": {
+	    "client_id": "[[INSERT CLIENT ID HERE]]",
+	    "client_secret": "[[INSERT CLIENT SECRET HERE]]",
+	    "redirect_uris": [],
+	    "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+	    "token_uri": "https://accounts.google.com/o/oauth2/token"
+	  }
+	}
+
+Replace ``[[INSERT CLIENT ID HERE]]`` and ``[[INSERT CLIENT SECRET HERE]]``
+with the actual `Client ID` and `Client secret` you created in the previous
+step.
+
+Now all we need to do is enable the google analytics in the project
+settings module (`settings.py`):
+
+.. code-block:: python
+
+	ADMIN_GOOGLE_ANALYTICS = {
+		'client_secrets' : '/absolute/path/to/client_secrets.json',
+		'token_file_name' : '/absolute/path/to/analytics.dat',
+		'profile_id' : '12345678',
+		'admin_root_url' : 'http://localhost:8000/admin/'
+	}
+
+The ``client_secrets`` key must hold the absolute path to the
+the `client_secrets.json` file we created.
+
+The ``token_file_name`` key must point to the absolute path of a file
+where yawd-admin will store session keys and information returned from
+the google API. You do not need to manually create this file, just make sure
+the web server has write access to that path.
+
+``profile_id`` refers to the ID of the google analytics account you want to
+connect with yawd-admin. To find this ID login to your google analytics
+account, click the 'Admin' link from the horizontal menu and select
+the account you wish to connect.
+
+.. image:: analytics-id.png
+
+A screenshot of an analytics account showing the Profile ID.
+
+The last setting, ``admin_root_url`` must be set to the root url of the
+admin website.
+
+Now restart the web server and visit the admin interface
+(e.g. http://localhost:8000/admin).
+
+.. image:: configure-google-analytics.png
+
+Visit the 'Configure Google Analytics' page (image above) and click
+'Authenticate new account' to grant the application access to your
+google analytics data. Make sure the google account you link has access
+to the specified ``profile_id``.
+
+Now yawd-admin has stored your data and you don't need
+to go through the confirmation process again.

docs/changelog.rst

@@ -0,0 +1,37 @@
+.. _changelog:
+
+Changelog
++++++++++
+
+v.0.7.0, 2013.10.23
+---------------------
+
+* popup/ajax inlines, one-to-one inlines
+* auto side-navigation affix menu in change pages (based on fieldsets & inlines)
+* drag & drop ordering in changelist view
+* "my account" view for non-admin users to edit their own info
+* new admin widgets
+* reworked filters section
+* reworked authentication/registration templates
+* added the font-awesome icons (updated to 3.2.1)
+* model icons
+* automatic calculation of the popover (help text) placement
+* documentation enhancements
+* some work towards PEP8/pylint compliance
+
+v.0.6.0, 2013.02.28
+-------------------
+
+* Added modal inlines functionality
+* Upgraded to bootstrap v2.2.2
+* Added gcons icon set
+* Collapsible inlines
+* Fixed google analytics bugs (thanks to `@chielteuben <https://github.com/chielteuben>`_)
+* Various css updates
+* Added django-reversion, django-mptt templates (thanks to `@pahaz <https://github.com/pahaz>`_)
+* Various minor enhancements, like the ability to exclude a model from the top menu
+
+v.0.5.0, 2012.11.01
+-------------------
+
+* Initial Release

docs/conf.py

@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '0.7'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.0-rc1'
+release = '0.7.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -91,7 +91,11 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'nature'
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+if on_rtd:
+    html_theme = 'default'
+else:
+    html_theme = 'nature'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the