summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorareski <areski@gmail.com>2014-08-26 13:10:30 +0200
committerTim Graham <timograham@gmail.com>2014-08-27 08:34:53 -0400
commita81af7f49de7ff3f51f111de28ed3a682f67ea89 (patch)
treed5ec65646682238cbbc10a08d496195ebf2e2022 /docs
parent6aae07fe619fb3a202f0f2cd74ef1c6e8872a672 (diff)
Fixed #13749 -- Added link from admin site to front-end site.
Thanks romankrv for the suggestion.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/admin/index.txt7
-rw-r--r--docs/releases/1.8.txt4
2 files changed, 11 insertions, 0 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 01d73407f3..ca55df3ce7 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -2445,6 +2445,13 @@ Templates can override or extend base admin templates as described in
The text to put at the end of each admin page's ``<title>`` (a string). By
default, this is "Django site admin".
+.. attribute:: AdminSite.site_url
+
+ .. versionadded:: 1.8
+
+ The URL for the "View site" link at the top of each admin page. By default,
+ ``site_url`` is ``/``. Set it to ``None`` to remove the link.
+
.. attribute:: AdminSite.index_title
.. versionadded:: 1.7
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 7cf14f1bef..ea5101ff72 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -50,6 +50,10 @@ Minor features
* The jQuery library embedded in the admin has been upgraded to version 1.11.1.
+* You can now specify :attr:`AdminSite.site_url
+ <django.contrib.admin.AdminSite.site_url>` in order to display a link to the
+ front-end site.
+
:mod:`django.contrib.auth`
^^^^^^^^^^^^^^^^^^^^^^^^^^