Merge lp:~jakedahn/horizon/dashboard-508-fixes into lp:~hudson-openstack/horizon/trunk

[Jake Dahn]

This branch fixes inconsistencies which were causing errors and breaking section 508 compatibility.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'django-nova/src/django_nova/templates/django_nova/images/launch.html'
--- django-nova/src/django_nova/templates/django_nova/images/launch.html	2011-03-09 10:02:34 +0000
+++ django-nova/src/django_nova/templates/django_nova/images/launch.html	2011-03-30 22:18:58 +0000
@@ -19,7 +19,7 @@
       <fieldset>
         <h3 class="image_id">Launch Image {{ ami.id }}</h3>
         <div class="even">
-          <label>Location</label>
+          <h4 class="label">Location</h4>
           <span class="image_location">{{ ami.location }}</span>
         </div>
         {% include "django_nova/images/_launch_form.html" %}

=== modified file 'django-nova/src/django_nova/templates/django_nova/projects/edit_user.html'
--- django-nova/src/django_nova/templates/django_nova/projects/edit_user.html	2011-03-03 01:20:17 +0000
+++ django-nova/src/django_nova/templates/django_nova/projects/edit_user.html	2011-03-30 22:18:58 +0000
@@ -33,15 +33,16 @@
           <fieldset class="module aligned {{ fieldset.classes }}">
             <h3 id="edit_{{ user.username }}">Edit Roles for User:  {{ user.username }}</h3>
             <div class="form-row">
-              <label>User</label>
+              <h4 class="label">User</h4>
               <span id="user_name">{{ user.username }}</span>
             </div>
             <input type="hidden" name="username" value="{{ user.id }}" id="username" />
-
+            
+            <label for="id_role_from">Roles</label>
               {% for field in form.visible_fields %}
                   <div class="form-row">
                       {{ field.errors }}
-                      {{ field.label_tag }}{{ field }}
+                      {{ field }}
                       {% if field.field.help_text %}<p class="help">{{ field.field.help_text|safe }}</p>{% endif %}
                   </div>
               {% endfor %}