Merge branch '2375-demo-theme-development' into 2618-nested-resources

Conflicts:
	ckan/templates/snippets/scripts.html

    both add new content

ckan/templates/snippets/internal_tracking.html

@@ -0,0 +1,24 @@
+<script type="text/javascript">
+  $(function (){
+    // Tracking
+    var url = location.pathname;
+    // remove any site root from url
+    console.log($('body').data('site-root'));
+    url = url.substring($('body').data('locale-root'), url.length);
+    // trim any trailing /
+    url = url.replace(/\/*$/, '');
+    $.ajax({url : $('body').data('site-root') + '_tracking',
+            type : 'POST',
+            data : {url:url, type:'page'},
+            timeout : 300 });
+    $('a.resource-url-analytics').click(function (e){
+      var url = $(e.target).closest('a').attr('href');
+      $.ajax({url : $('body').data('site-root') + '_tracking',
+              data : {url:url, type:'resource'},
+              type : 'POST',
+              complete : function () {location.href = url;},
+              timeout : 30});
+      e.preventDefault();
+    });
+  });
+</script>

ckan/templates/snippets/scripts.html

@@ -35,3 +35,6 @@
 <script src="{% url_for_static '/base/javascript/modules/related-item.js' %}"></script>
 #}
 {% resource 'base/main' %}
+{% if config.get('ckan.tracking_enabled', 'false') %}
+  {% snippet 'snippets/internal_tracking.html' %}
+{% endif %}

ckan/templates/user/read.html

@@ -28,8 +28,8 @@
         <span class="media-image">{{ h.linked_gravatar(user.email_hash, 150) }}</span>
         <div class="description">
           <h1 class="heading">{{ user.fullname or _('No full name provided') }}</h1>
-          {% if user.about_formatted %}
-            {{ user.about_formatted }}
+          {% if c.about_formatted %}
+            {{ c.about_formatted }}
           {% else %}
             <p class="empty">
               {% if c.is_myself %}

doc/templating.rst

@@ -127,6 +127,9 @@ language.
 Includes
 ~~~~~~~~
 
+.. Note::
+    Includes should be avoided as they are not portable use {% snippet %} tags whenever possible.
+
 Snippets of text that are included using ``{% include %}`` should be
 kept in a directory called _snippets_. This should be kept in the same
 directory as the code that uses it.
@@ -138,6 +141,9 @@ case the usage should be clearly documented.
 Snippets
 ~~~~~~~~
 
+.. Note::
+    {% snippet %} tags should be used in favour of h.snippet()
+
 Snippets are essentially middle ground between includes and macros in
 that they are includes that allow a specific context to be provided
 (includes just receive the parent context).
@@ -210,14 +216,17 @@ portion that we wish to change. In this case the ``breadcrumb`` block.
 
 ::
 
-    {% ckan_extends "user/read.html" %}
+    {% ckan_extends %}
 
     {# Remove the breadcrumb #}
     {% block breadcrumb %}{% endblock %}
 
 This function works recursively and so is ideal for extensions that wish to
 add a small snippet of functionality to the page.
 
+.. Note::
+    {% ckan_extend %} only extends templates of the same name.
+
 snippet
 ~~~~~~~
 
@@ -474,9 +483,10 @@ Builds a form from the supplied form_info list/tuple.
 
 ::
 
-    form_info - A list of dicts describing the form field to build.
-    data      - The form data object.
-    errors    - The form errors object.
+    form_info       - A list of dicts describing the form field to build.
+    data            - The form data object.
+    errors          - The form errors object.
+    error_summary   - The form errors object.
 
 Example