[#1301] Adds header label block and flash message inner

ckan · Oct 30, 2013 · 4ec3ac0 · 4ec3ac0
1 parent 1f4f035
commit 4ec3ac0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/ckan/templates/header.html b/ckan/templates/header.html
@@ -102,7 +102,7 @@ <h1>
       {% block header_site_search %}
         <form class="section site-search simple-input" action="{% url_for controller='package', action='search' %}" method="get">
           <div class="field">
-            <label for="field-sitewide-search">{{ _('Search Datasets') }}</label>
+            <label for="field-sitewide-search">{% block header_site_search_label %}{{ _('Search Datasets') }}{% endblock %}</label>
             <input id="field-sitewide-search" type="text" name="q" placeholder="{{ _('Search') }}" />
             <button class="btn-search" type="submit">{{ _('Search') }}</button>
           </div>

diff --git a/ckan/templates/page.html b/ckan/templates/page.html
@@ -23,11 +23,13 @@
           {% block flash %}
             {% set flash_messages = h.flash.pop_messages() | list %}
             <div class="flash-messages">
-              {% for message in flash_messages %}
-                <div class="alert fade in {{ message.category }}">
-                  {{ h.literal(message) }}
-                </div>
-              {% endfor %}
+              {% block flash_inner %}
+                {% for message in flash_messages %}
+                  <div class="alert fade in {{ message.category }}">
+                    {{ h.literal(message) }}
+                  </div>
+                {% endfor %}
+              {% endblock %}
             </div>
           {% endblock %}