Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'develop' of git://github.com/divio/django-cms into develop

  • Loading branch information...
commit 17df6c9007a4b74fd776da04451a95f9e644aa4f 2 parents 1219d84 + 82cf455
@kezabelle authored
View
18 docs/advanced/templatetags.rst
@@ -411,4 +411,20 @@ If the current url has no cms-page and is handled by a navigation extender and
the url changes based on the language: You will need to set a language_changer
function with the set_language_changer function in cms.utils.
-For more information, see :doc:`i18n`.
+For more information, see :doc:`i18n`.
+
+.. templatetag:: cms_toolbar
+
+***********
+cms_toolbar
+***********
+
+The ``cms_toolbar`` templatetag will add the needed css and javascript to the
+sekizai blocks in the base template. The templatetag should be placed somewhere
+within the body of the HTML (within ``<body>...</body>``).
+
+Example::
+
+ <body>
+ {% cms_toolbar %}
+ ...
View
2  docs/extending_cms/searchdocs.rst
@@ -3,7 +3,7 @@ Search and the django CMS
#########################
For powerful full-text search in with the django CMS, we suggest using
-`Haystack`_ together with `django-cms-search`.
+`Haystack`_ together with `django-cms-search`_.
.. _Haystack: http://haystacksearch.org/
.. _django-cms-search: https://github.com/piquadrat/django-cms-search
Please sign in to comment.
Something went wrong with that request. Please try again.