From 1db2037f583f8fdaf3ba31b4c2c04c183b9ab0a9 Mon Sep 17 00:00:00 2001
From: Aron Carroll <self@aroncarroll.com>
Date: Thu, 2 Aug 2012 11:53:18 +0100
Subject: [PATCH] [#2375] Tidy up some html validation issues

---
 ckan/public/base/less/masthead.less               |  8 +++++---
 ckan/public/base/test/primer/index.html           |  4 ++--
 ckan/templates/group/snippets/group_item.html     |  2 +-
 ckan/templates/header.html                        | 12 +++++++-----
 ckan/templates/home/index.html                    |  4 ++--
 ckan/templates/related/snippets/related_item.html |  2 +-
 ckan/templates/snippets/group.html                |  2 +-
 ckan/templates/snippets/group_item.html           |  2 +-
 ckan/templates/snippets/related.html              |  2 +-
 9 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/ckan/public/base/less/masthead.less b/ckan/public/base/less/masthead.less
index 4deab5782e4..a8915c30aa6 100644
--- a/ckan/public/base/less/masthead.less
+++ b/ckan/public/base/less/masthead.less
@@ -24,7 +24,7 @@
 }
 
 .masthead hgroup h1,
-.masthead hgroup p {
+.masthead hgroup h2 {
   font-size: 34px;
   line-height: 1.5;
   float: left;
@@ -35,13 +35,15 @@
   letter-spacing: -2px; // Sorry world of typography.
 }
 
-.masthead hgroup p {
+.masthead hgroup h2 { 
   position: absolute;
   bottom: -3px;
   right: 0;
-  font-size: 15px;
   margin: 0;
+  font-size: 15px;
+  font-weight: normal;
   line-height: 1.2;
+  white-space: nowrap;
 }
 
 .masthead hgroup a {
diff --git a/ckan/public/base/test/primer/index.html b/ckan/public/base/test/primer/index.html
index dea0f572f47..0ce2ad5e5bc 100644
--- a/ckan/public/base/test/primer/index.html
+++ b/ckan/public/base/test/primer/index.html
@@ -587,7 +587,7 @@ <h1 id="masthead" class="primer-heading">Masthead (Site Header)</h1>
       <header class="masthead">
         <hgroup>
           <h1><a href="">My Site Title</a></h1>
-          <p>My Site Tagline</p>
+          <h2>My Site Tagline</h2>
         </hgroup>
         <nav>
           <ul class="unstyled">
@@ -603,7 +603,7 @@ <h1><a href="">My Site Title</a></h1>
       <header class="masthead">
         <hgroup>
           <h1><a href="">My Site Title</a></h1>
-          <p>My Site Tagline</p>
+          <h2>My Site Tagline</h2>
         </hgroup>
         <div class="account">
           <a href="#home" class="image">
diff --git a/ckan/templates/group/snippets/group_item.html b/ckan/templates/group/snippets/group_item.html
index 3f94780947f..ae91e5aac53 100644
--- a/ckan/templates/group/snippets/group_item.html
+++ b/ckan/templates/group/snippets/group_item.html
@@ -17,7 +17,7 @@
 #}
 {% set url = h.url_for(group.type ~ '_read', action='read', id=group.name) %}
 <li class="media-item media media-vertical{% if first %} first{% endif %}{% if last %} last{% endif %}">
-  <a class="media-image" href="{{ url }}"><img src="{{ group.image_url or '/base/images/placeholder-group.png' }}" /></a>
+  <a class="media-image" href="{{ url }}"><img src="{{ group.image_url or '/base/images/placeholder-group.png' }}" alt="{{ group.name }}" /></a>
   <div class="media-content">
     <h3 class="media-heading">
       <a href="{{ url }}" title="{{ _('View {name}').format(name=group.display_name) }}">
diff --git a/ckan/templates/header.html b/ckan/templates/header.html
index 107cf4303c5..7dfc1bd0e83 100644
--- a/ckan/templates/header.html
+++ b/ckan/templates/header.html
@@ -5,11 +5,13 @@
   <div class="container">
     {# The .header-image class hides the main text and uses image replacement for the title #}
     <hgroup class="{{ g.header_class }}">
-      {% if g.site_logo %}
-        <a class="logo" href="{{ h.url('home') }}"><img src="{{ h.url_for_static(g.site_logo) }}" alt="{{ g.site_title }} Logo" title="{{ g.site_title }} Logo" /></a>
-      {% endif %}
-      <h1><a href="{{ h.url('home') }}">{{ g.site_title }}</a></h1>
-      {% if g.site_description %}<p>{{ g.site_description }}</p>{% endif %}
+      <h1>
+        {% if g.site_logo %}
+          <a class="logo" href="{{ h.url('home') }}"><img src="{{ h.url_for_static(g.site_logo) }}" alt="{{ g.site_title }} Logo" title="{{ g.site_title }} Logo" /></a>
+        {% endif %}
+        <a href="{{ h.url('home') }}">{{ g.site_title }}</a>
+      </h1>
+      {% if g.site_description %}<h2>{{ g.site_description }}</h2>{% endif %}
     </hgroup>
     <div class="content">
       {% if c.userobj %}
diff --git a/ckan/templates/home/index.html b/ckan/templates/home/index.html
index 7c4b19f195a..12c2fb642bf 100644
--- a/ckan/templates/home/index.html
+++ b/ckan/templates/home/index.html
@@ -45,7 +45,7 @@ <h1 class="page-heading">{% block home_primary_heading %}{{ _("Welcome to CKAN")
           <h2 class="media-heading">{% block home_image_caption %}{{ _("This is a featured section") }}{% endblock %}</h2>
           {% block home_image_content %}
             <a class="image" href="#">
-              <img src="http://placehold.it/420x220" width="420" height="220" />
+              <img src="http://placehold.it/420x220" alt="Placeholder" width="420" height="220" />
             </a>
           {% endblock %}
         </section>
@@ -60,7 +60,7 @@ <h2 class="media-heading">{% block home_image_caption %}{{ _("This is a featured
             <form class="dataset-search module-content clearfix" method="get" action="{% url_for controller='package', action='search' %}">
               <h3 class="heading">{{ _("Search Your Data") }}</h3>
               <span class="control-group search-giant">
-                <input type="text" class="search" name="q" value="{{ c.q }}" autocomplete="off" results="0" placeholder="{{ _('eg. Gold Prices') }}" />
+                <input type="text" class="search" name="q" value="{{ c.q }}" autocomplete="off" placeholder="{{ _('eg. Gold Prices') }}" />
                 <button type="submit" value="{{ _('Search') }}">Submit</button>
               </span>
             </form>
diff --git a/ckan/templates/related/snippets/related_item.html b/ckan/templates/related/snippets/related_item.html
index 65683169f1b..3f40a4a56c9 100644
--- a/ckan/templates/related/snippets/related_item.html
+++ b/ckan/templates/related/snippets/related_item.html
@@ -3,7 +3,7 @@
 } %}
 <li class="related-item media-item media media-vertical{% if first %} first{% endif %}{% if last %} last{% endif %}">
   <a class="media-image" href="{{ related.url }}">
-    <img src="{{ related.image_url or placeholder_map[related.type] or '/base/images/placeholder-image.png' }}" />
+    <img src="{{ related.image_url or placeholder_map[related.type] or '/base/images/placeholder-image.png' }}" alt="{{ related.title }}" />
     <span class="banner">
       {%- if related.type == 'application' -%}
         app
diff --git a/ckan/templates/snippets/group.html b/ckan/templates/snippets/group.html
index 17a093a57df..9452dfce62f 100644
--- a/ckan/templates/snippets/group.html
+++ b/ckan/templates/snippets/group.html
@@ -14,7 +14,7 @@
   <section class="module module-narrow module-shallow group">
     <div class="module-content media media-vertical">
       <a class="media-image" href="{{ url }}">
-        <img src="{{ group.image_url or h.url_for('/base/images/placeholder-group.png') }}" width="200" height="125" />
+        <img src="{{ group.image_url or h.url_for('/base/images/placeholder-group.png') }}" width="200" height="125" alt="{{ group.name }}" />
       </a>
       <div class="media-content">
         <h3 class="media-heading"><a href={{ url }}>{{ group.title or group.name }}</a></h3>
diff --git a/ckan/templates/snippets/group_item.html b/ckan/templates/snippets/group_item.html
index 56e075f2208..cd432c23cd1 100644
--- a/ckan/templates/snippets/group_item.html
+++ b/ckan/templates/snippets/group_item.html
@@ -3,7 +3,7 @@
     {% set url=h.url_for(controller='group', action='read', id=group.name) %}
     {% set truncate=truncate or 0 %}
     <a class="media-image" href="{{ url }}">
-      <img src="{{ group.image_url or h.url_for('/base/images/placeholder-group.png') }}" width="100" height="60" />
+      <img src="{{ group.image_url or h.url_for('/base/images/placeholder-group.png') }}" width="100" height="60" alt="{{ group.name }}" />
     </a>
     <div class="media-content">
       <h3 class="media-heading"><a href={{ url }}>{{ group.title or group.name }}</a></h3>
diff --git a/ckan/templates/snippets/related.html b/ckan/templates/snippets/related.html
index 8ea5f39de20..4a4395cc2e3 100644
--- a/ckan/templates/snippets/related.html
+++ b/ckan/templates/snippets/related.html
@@ -4,7 +4,7 @@ <h2 class="module-heading"><i class="icon-medium icon-picture"></i> Related <a c
     {% if item %}
       {% with url = h.url_for(controller='related', action='list', id=pkg_name) %}
         <a class="image logo" href="{{ url }}">
-          <img src="{{ item.image_url or "http://placehold.it/200x125" }}" width="200" height="125" />
+          <img src="{{ item.image_url or "http://placehold.it/200x125" }}" width="200" height="125" alt="{{ item.title }}" />
         </a>
         <div class="media-content">
           <h3 class="media-heading"><a href="{{ url }}">{{ item.title }}</a></h3>