Skip to content

Commit

Permalink
Merge pull request #813 from CDLUC3/543-accessibility-fixes-identifie…
Browse files Browse the repository at this point in the history 
…r-page

Accessibility landing and basic edit pages "forms" for #543
  • Loading branch information
@sfisher
sfisher authored Feb 20, 2025
2 parents 1fb6aad + 66a08cd commit cf00eb8
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
44 changes: 22 additions & 22 deletions templates/manage/details.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ <h2 class="heading__icon-4">{% trans "About the Identifier" %}</h2>
<div class="row vertical-buffer-bot">
<div class="col-md-8">
<div class="row">
<label class="col-md-4 vertical-buffer-xxs">{% trans "Identifier" %}:</label>
<div class="col-md-8 vertical-buffer-bot-md"><strong>{% identifier_display id_text testPrefixes %}</strong></div>
<label class="col-md-4 vertical-buffer-xxs">{% trans "Identifier as URL" %}:</label>
<label for="identifier_info" class="col-md-4 vertical-buffer-xxs">{% trans "Identifier" %}:</label>
<div id="identifier_info" class="col-md-8 vertical-buffer-bot-md"><strong>{% identifier_display id_text testPrefixes %}</strong></div>
<label for="url_to_copy" class="col-md-4 vertical-buffer-xxs">{% trans "Identifier as URL" %}:</label>
<div class="col-md-7">
<div id="id_as_url__box" class="vertical-buffer-xxs">
<span id="url_to_copy">{{ id_as_url }}</span>
Expand Down Expand Up @@ -86,15 +86,15 @@ <h2 class="heading__icon-9">{% trans "About the Identified Object" %}</h2>
</div>
</div>
<div class="row vertical-buffer-bot">
<label class="col-sm-2">{{internal_profile.target.displayName}}: </label>
<div class="col-sm-7">{% display_value identifier internal_profile.target %}</div>
<label for="internal_profile_target" class="col-sm-2">{{internal_profile.target.displayName}}: </label>
<div id="internal_profile_target" class="col-sm-7">{% display_value identifier internal_profile.target %}</div>
</div>

{% if not has_block_data %}
{% for e in current_profile.elements %}
<div class="row vertical-buffer-bot">
<label class="col-sm-2">{{e.displayName}}:</label>
<div class="col-sm-7">{% display_value identifier e %}</div>
<label for="an-element{{forloop.counter}}" class="col-sm-2">{{e.displayName}}:</label>
<div id="an-element{{forloop.counter}}" class="col-sm-7">{% display_value identifier e %}</div>
</div>
{% endfor %}
{% endif %}
Expand All @@ -117,41 +117,41 @@ <h2 class="heading__icon-9">{% trans "About the Identified Object" %}</h2>
<hr/>
<div class="row vertical-buffer-bot">
<div class="inline-header">
<h2 class="heading__icon-4">{% trans "About the Identifier's Status" %}</h2>
<h2 class="heading__icon-4">{% trans "About the Identifier's Status" %} kdlkjklsjfkslj</h2>
</div>
</div>
<div class="row vertical-buffer-bot">
<label class="col-sm-2">{{internal_profile.owner.displayName}}:</label>
<div class="col-sm-7">{% display_value identifier internal_profile.owner %}</div>
<label for="profile_owner" class="col-sm-2">{{internal_profile.owner.displayName}}:</label>
<div id="profile_owner" class="col-sm-7">{% display_value identifier internal_profile.owner %}</div>
</div>
<div class="row vertical-buffer-bot">
<label class="col-sm-2">{{internal_profile.ownergroup.displayName}}:</label>
<div class="col-sm-7">{% display_value identifier internal_profile.ownergroup %}</div>
<label for="ownergroup" class="col-sm-2">{{internal_profile.ownergroup.displayName}}:</label>
<div id="ownergroup" class="col-sm-7">{% display_value identifier internal_profile.ownergroup %}</div>
</div>
<div class="row vertical-buffer-bot">
<label class="col-sm-2">{{internal_profile.created.displayName}}:</label>
<div class="col-sm-7">{% display_value identifier internal_profile.created %}</div>
<label for="created_displayname" class="col-sm-2">{{internal_profile.created.displayName}}:</label>
<div id="created_displayname" class="col-sm-7">{% display_value identifier internal_profile.created %}</div>
</div>
<div class="row vertical-buffer-bot">
<label class="col-sm-2">{{internal_profile.updated.displayName}}:</label>
<div class="col-sm-7">{% display_value identifier internal_profile.updated %}</div>
<label for="updated_displayname" class="col-sm-2">{{internal_profile.updated.displayName}}:</label>
<div id="updated_displayname" class="col-sm-7">{% display_value identifier internal_profile.updated %}</div>
</div>
<div class="row vertical-buffer-bot">
<label class="col-sm-2">{{internal_profile.status.displayName}}:</label>
<div class="col-sm-7">{{pub_status}}</div>
<label for="status_displayname" class="col-sm-2">{{internal_profile.status.displayName}}:</label>
<div id="status_displayname" class="col-sm-7">{{pub_status}}</div>
</div>

{% if stat_reason %}
<div class="row vertical-buffer-bot">
<label class="col-sm-2">&nbsp;</label>
<div class="col-sm-7">{{ stat_reason }}</div>
<label for="stat_reason" class="col-sm-2">&nbsp;</label>
<div id="stat_reason" class="col-sm-7">{{ stat_reason }}</div>
</div>
{% endif %}

{% if pub_status == 'public' %}
<div class="row vertical-buffer-bot">
<label class="col-sm-2">{{internal_profile.export.displayName}}</label>
<div class="col-sm-7">{% display_value identifier internal_profile.export %}</div>
<label for="internal_profile_export" class="col-sm-2">{{internal_profile.export.displayName}}</label>
<div id="internal_profile_export"class="col-sm-7">{% display_value identifier internal_profile.export %}</div>
</div>
{% endif %}

Expand Down
36 changes: 18 additions & 18 deletions templates/manage/edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
<input name="simpleToAdvanced" id="simpleToAdvanced" type="hidden" value="False"/>

<div class="fcontrol__group-inline general__form-element-group">
<label for="account_username" class="fcontrol__text-label-inline general__form-label">{% trans "Identifier" %}</label>
<div class="fcontrol__text-nofield">
<label for="lbl_identifier_display" class="fcontrol__text-label-inline general__form-label">{% trans "Identifier" %}</label>
<div id="lbl_identifier_display" class="fcontrol__text-nofield">
<strong>{% identifier_display id_text testPrefixes %}</strong>
</div>
</div>

<div class="fcontrol__group-inline general__form-element-group">
<label for="account_username" class="fcontrol__text-label-inline general__form-label">{% trans "Identifier as URL" %}</label>
<label for="url_to_copy" class="fcontrol__text-label-inline general__form-label">{% trans "Identifier as URL" %}</label>
<div id="id_as_url__box" class="fcontrol__text-nofield">
<span id="url_to_copy">{{ id_as_url }}</span>
<span id="copy_message">{% trans "Link copied to your clipboard" %}</span>
Expand Down Expand Up @@ -78,26 +78,26 @@ <h2 class="heading__icon-4">{% trans "About the Identifier" %}</h2>
</div>
</div>
<div class="fcontrol__group-inline general__form-element-group">
<label for="account_username" class="fcontrol__text-label-inline general__form-label">{{internal_profile.owner.displayName}}</label>
<div class="fcontrol__text-nofield">{% display_value identifier internal_profile.owner %}</div>
<label for="internal_profile_owner" class="fcontrol__text-label-inline general__form-label">{{internal_profile.owner.displayName}}</label>
<div id="internal_profile_owner" class="fcontrol__text-nofield">{% display_value identifier internal_profile.owner %}</div>
</div>
<div class="fcontrol__group-inline general__form-element-group">
<label for="account_username" class="fcontrol__text-label-inline general__form-label">{{internal_profile.ownergroup.displayName}}</label>
<div class="fcontrol__text-nofield">{% display_value identifier internal_profile.ownergroup %}</div>
<label for="internal_profile_ownergroup" class="fcontrol__text-label-inline general__form-label">{{internal_profile.ownergroup.displayName}}</label>
<div id="internal_profile_ownergroup" class="fcontrol__text-nofield">{% display_value identifier internal_profile.ownergroup %}</div>
</div>
<div class="fcontrol__group-inline general__form-element-group">
<label for="account_username" class="fcontrol__text-label-inline general__form-label">{{internal_profile.created.displayName}}</label>
<div class="fcontrol__text-nofield">{% display_value identifier internal_profile.created %}</div>
<label for="internal_profile_created" class="fcontrol__text-label-inline general__form-label">{{internal_profile.created.displayName}}</label>
<div id="internal_profile_created" class="fcontrol__text-nofield">{% display_value identifier internal_profile.created %}</div>
</div>
<div class="fcontrol__group-inline general__form-element-group">
<label for="account_username" class="fcontrol__text-label-inline general__form-label">{{internal_profile.updated.displayName}}</label>
<div class="fcontrol__text-nofield">{% display_value identifier internal_profile.updated %}</div>
<label for="internal_profile_updated" class="fcontrol__text-label-inline general__form-label">{{internal_profile.updated.displayName}}</label>
<div id="internal_profile_updated" class="fcontrol__text-nofield">{% display_value identifier internal_profile.updated %}</div>
</div>


<div class="fieldset-stacked" role="group" aria-labelledby="fieldset-publish">
<div class="fieldset-inline create__form-element-group" role="group" aria-labelledby="status">
<span id="status" class="fieldset-inline__legend create__inline-nested-legend">{{internal_profile.status.displayName}}</span>
<div class="fieldset-stacked" role="group">
<fieldset class="fieldset-inline create__form-element-group" role="group" aria-labelledby="status">
<legend id="status" class="fieldset-inline__legend create__inline-nested-legend">{{internal_profile.status.displayName}}</legend>
{% if orig_status == 'reserved' %}
<label for="_status_reserved" class="fcontrol__radio-label-inline">
<input id="_status_reserved" class="fcontrol__radio-button-stacked" type="radio" value="reserved" name="_status"
Expand Down Expand Up @@ -128,7 +128,7 @@ <h2 class="heading__icon-4">{% trans "About the Identifier" %}</h2>
{% else %}
{% help_icon "decide_public_unavail" _("on making an identifier public or unavailable") %}
{% endif %}
</div>
</fieldset>
<div id="unavailable_reason_row"
{% if pub_status == 'unavailable' %}
style="display: visible;"
Expand All @@ -145,8 +145,8 @@ <h2 class="heading__icon-4">{% trans "About the Identifier" %}</h2>
{% endif %}
class="fcontrol__text-field-inline" />
</div>
<div id="harv_index" class="fieldset-inline create__form-element-group" role="group" aria-labelledby="fieldset-harvesting">
<span id="fieldset-harvesting" class="fieldset-inline__legend create__inline-nested-legend">{% trans "Allow harvesting/indexing?" %}</span>
<fieldset id="harv_index" class="fieldset-inline create__form-element-group" role="group" aria-labelledby="fieldset-harvesting">
<legend id="fieldset-harvesting" class="fieldset-inline__legend create__inline-nested-legend">{% trans "Allow harvesting/indexing?" %}</legend>
<label for="export_yes" class="fcontrol__radio-label-inline">
<input id="export_yes" class="fcontrol__radio-button-stacked" type="radio" value="yes" name="_export"
{% if export == 'yes' %}
Expand All @@ -162,7 +162,7 @@ <h2 class="heading__icon-4">{% trans "About the Identifier" %}</h2>
> <span>{% trans "No" %}</span>
</label>
{% help_icon "decide_export" _("on harvesting/indexing") %}
</div>
</fieldset>
</div>


Expand Down

0 comments on commit cf00eb8

Please sign in to comment.