Skip to content

Commit

Permalink
Merge branch 'accessibility-for-1.8' into release-v1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@amercader
amercader committed Oct 4, 2012
2 parents 0ae8491 + 7dff5ac commit 71d207b
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 25 deletions.
8 changes: 4 additions & 4 deletions ckan/templates/_snippet/data-api-help.html
View file
Expand Up @@ -36,23 +36,23 @@ <h3>
<thead></thead>
<tbody>
<tr>
<th>Base</th>
<th scope="row">Base</th>
<td><code>${datastore_api}</code></td>
</tr>
<tr>
<th>Query</th>
<th scope="row">Query</th>
<td>
<code>${datastore_api}/_search</code>
</td>
</tr>
<tr>
<th>Query example</th>
<th scope="row">Query example</th>
<td>
<code><a href="${datastore_api}/_search?size=5&amp;pretty=true" target="_blank">${datastore_api}/_search?size=5&amp;pretty=true</a></code>
</td>
</tr>
<tr>
<th>Schema (Mapping)</th>
<th scope="row">Schema (Mapping)</th>
<td>
<code><a href="${datastore_api}/_mapping" target="_blank">${datastore_api}/_mapping?pretty=true</a></code>
</td>
Expand Down
22 changes: 11 additions & 11 deletions ckan/templates/_util.html
View file
Expand Up @@ -66,7 +66,7 @@
<!--! List of dataset groups: pass in a collection of dataset groups
and this renders the standard group listing -->
<table class="table table-bordered table-striped table-condensed groups" py:def="group_list(groups)">
<tr><th>Title</th><th>Number of datasets</th><th>Description</th></tr>
<tr><th scope="col">Title</th><th scope="col">Number of datasets</th><th scope="col">Description</th></tr>
<py:for each="group in groups">
<tr>
<td><a href="${h.url_for(controller='group', action='read', id=group.name)}">${group.display_name}</a></td>
Expand All @@ -79,7 +79,7 @@
<!--! List of dataset groups: pass in a collection of dataset groups
and this renders the standard group listing. Same as the above, but using dictionaries -->
<table class="table table-bordered table-striped table-condensed groups" py:def="group_list_from_dict(groups)">
<tr><th>Title</th><th>Number of datasets</th><th>Description</th></tr>
<tr><th scope="col">Title</th><th scope="col">Number of datasets</th><th scope="col">Description</th></tr>
<py:for each="group in groups">
<tr>
<td><a href="${h.url_for( '%s_read' % str(group['type']) , action='read', id=group['name'])}">${group['display_name']}</a></td>
Expand All @@ -92,7 +92,7 @@
<!--! List of authorization groups: pass in a collection of authorization groups and
this renders the standard group listing -->
<table class="table table-bordered table-striped table-condensed authorization_groups" py:def="authorization_group_list(authorization_groups)">
<tr><th>Title</th><th>Number of members</th></tr>
<tr><th scope="col">Title</th><th scope="col">Number of members</th></tr>
<py:for each="authorization_group in authorization_groups">
<tr>
<td><a href="${h.url_for(controller='authorization_group', action='read', id=authorization_group.name or authorization_group.id)}">
Expand Down Expand Up @@ -179,9 +179,9 @@ <h5 class="heading" title="${related.title}">${h.markdown_extract(related.title,

<table class="table table-bordered table-striped table-condensed" py:def="authz_form_table(id, roles, users, user_role_dict)">
<tr>
<th> User </th>
<th scope="col"> User </th>
<py:for each="role in roles">
<th> ${role} </th>
<th scope="col"> ${role} </th>
</py:for>
</tr>
<py:for each="user in users">
Expand Down Expand Up @@ -214,9 +214,9 @@ <h5 class="heading" title="${related.title}">${h.markdown_extract(related.title,
<!--! table rows. How to combine the two? -->
<table class="table table-bordered table-striped table-condensed" py:def="authz_form_group_table(id, roles, users, user_role_dict)">
<tr>
<th>User Group</th>
<th scope="col">User Group</th>
<py:for each="role in roles">
<th> ${role} </th>
<th scope="col"> ${role} </th>
</py:for>
</tr>
<py:for each="user in users">
Expand Down Expand Up @@ -249,9 +249,9 @@ <h5 class="heading" title="${related.title}">${h.markdown_extract(related.title,

<table class="table table-bordered table-striped table-condensed" py:def="authz_add_table(roles)">
<tr>
<th>User</th>
<th scope="col">User</th>
<py:for each="role in roles">
<th> ${role} </th>
<th scole="col"> ${role} </th>
</py:for>
</tr>
<tr>
Expand All @@ -270,9 +270,9 @@ <h5 class="heading" title="${related.title}">${h.markdown_extract(related.title,
<!--! again, copy-and-paste of above, this time to attach different autocompletion -->
<table class="table table-bordered table-striped table-condensed" py:def="authz_add_group_table(roles)">
<tr>
<th>User Group</th>
<th scope="col">User Group</th>
<py:for each="role in roles">
<th> ${role} </th>
<th scope="col"> ${role} </th>
</py:for>
</tr>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/group/history.html
View file
Expand Up @@ -29,7 +29,7 @@ <h3 py:if="c.error" class="form-errors">

<table class="table table-bordered table-striped">
<tr>
<th></th><th>Revision</th><th>Timestamp</th><th>Author</th><th>Log Message</th>
<th scope="col"></th><th scope="col">Revision</th><th scope="col">Timestamp</th><th scope="col">Author</th><th scope="col">Log Message</th>
</tr>
<py:for each="index, revision_dict in enumerate(c.group_revisions)">
<tr>
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/package/form_extra_fields.html
View file
Expand Up @@ -34,7 +34,7 @@
<!--
<table>
<thead>
<tr><th>Key</th><th>Value</th></tr>
<tr><th scope="col">Key</th><th scope="col">Value</th></tr>
</thead>
<tbody>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/package/form_resources.html
View file
Expand Up @@ -4,7 +4,7 @@

<thead>
<tr>
<th class="${c.field.is_required(column) and 'field_req' or 'field_opt'} resource-${column}" py:for="column in c.columns">
<th scope="col" class="${c.field.is_required(column) and 'field_req' or 'field_opt'} resource-${column}" py:for="column in c.columns">
${c.fieldset.prettify(column)}
<py:if test="c.field.is_required(column)">*</py:if>
</th>
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/package/history.html
View file
Expand Up @@ -22,7 +22,7 @@ <h3 py:if="c.error" class="form-errors">

<table class="table table-striped table-bordered table-condensed">
<tr>
<th></th><th>Revision</th><th>Timestamp</th><th>Author</th><th>Log Message</th>
<th scope="col"></th><th scope="col">Revision</th><th scope="col">Timestamp</th><th scope="col">Author</th><th scope="col">Log Message</th>
</tr>
<py:for each="index, rev in enumerate(c.pkg_revisions)">
<tr>
Expand Down
4 changes: 2 additions & 2 deletions ckan/templates/package/read_core.html
View file
Expand Up @@ -54,8 +54,8 @@ <h3>Additional Information
<table class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th>Field</th>
<th>Value</th>
<th scope="col">Field</th>
<th scope="col">Value</th>
</tr>
</thead>
<tbody>
Expand Down
4 changes: 2 additions & 2 deletions ckan/templates/package/resource_read.html
View file
Expand Up @@ -158,8 +158,8 @@ <h3>Additional Information</h3>
<table class="table table-bordered table-striped table-condensed">
<thead>
<tr>
<th>Field</th>
<th>Value</th>
<th scope="col">Field</th>
<th scope="col">Value</th>
</tr>
</thead>
<tbody>
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/revision/diff.html
View file
Expand Up @@ -29,7 +29,7 @@ <h2>Revision Differences -
<py:if test="c.diff">
<table class="table table-bordered table-striped">
<tr>
<th>Field</th><th>Difference</th>
<th scope="col">Field</th><th scope="col">Difference</th>
</tr>
<py:for each="field, diff in c.diff">
<tr><td>${field}</td><td><pre>${diff}</pre></td></tr>
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/snippets/revision_list.html
View file
Expand Up @@ -8,7 +8,7 @@

<table class="table table-bordered table-striped table-condensed">
<tr>
<th>Revision</th><th>Timestamp</th><th>Author</th><th>Entity</th><th>Log Message</th>
<th scope="col">Revision</th><th scope="col">Timestamp</th><th scope="col">Author</th><th scope="col">Entity</th><th scope="col">Log Message</th>
</tr>
<tr
class="state-${revision['state']}"
Expand Down

0 comments on commit 71d207b

Please sign in to comment.