Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Improve form accessibility 4" #501

Merged
merged 1 commit into from
Jun 20, 2023
Merged

Revert "Improve form accessibility 4" #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions collections/editor/includes/determinationtab.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,59 +155,59 @@
}
?>
<div style='margin:3px;'>
<label for="identificationqualifier"><b><?php echo $LANG['ID_QUALIFIER']; ?>:</b></label>
<input type="text" name="identificationqualifier" id="identificationqualifier" title="e.g. cf, aff, etc" />
<b><?php echo $LANG['ID_QUALIFIER']; ?>:</b>
<input type="text" name="identificationqualifier" title="e.g. cf, aff, etc" />
</div>
<div style='margin:3px;'>
<label for="dafsciname"><b><?php echo $LANG['SCI_NAME']; ?>:</b></label>
<b><?php echo $LANG['SCI_NAME']; ?>:</b>
<input type="text" id="dafsciname" name="sciname" style="background-color:lightyellow;width:350px;" onfocus="initDetAutocomplete(this.form)" />
<input type="hidden" id="daftidtoadd" name="tidtoadd" value="" />
<input type="hidden" name="family" value="" />
</div>
<div style='margin:3px;'>
<label for="scientificnameauthorship"><b><?php echo $LANG['AUTHOR']; ?>:</b></label>
<input type="text" name="scientificnameauthorship" id="scientificnameauthorship" style="width:200px;" />
<b><?php echo $LANG['AUTHOR']; ?>:</b>
<input type="text" name="scientificnameauthorship" style="width:200px;" />
</div>
<div style='margin:3px;'>
<label for="confidenceranking"><b><?php echo $LANG['CONFIDENCE_IN_DET']; ?>:</b></label>
<select name="confidenceranking" id="confidenceranking">
<b><?php echo $LANG['CONFIDENCE_IN_DET']; ?>:</b>
<select name="confidenceranking">
<option value="8"><?php echo $LANG['HIGH']; ?></option>
<option value="5" selected><?php echo $LANG['MEDIUM']; ?></option>
<option value="2"><?php echo $LANG['LOW']; ?></option>
</select>
</div>
<div style='margin:3px;'>
<label for="identifiedby"><b><?php echo $LANG['DETERMINER']; ?>:</b></label>
<input type="text" name="identifiedby" id="identifiedby" style="background-color:lightyellow;width:200px;" />
<b><?php echo $LANG['DETERMINER']; ?>:</b>
<input type="text" name="identifiedby" style="background-color:lightyellow;width:200px;" />
</div>
<div style='margin:3px;'>
<label for="dateidentified"><b><?php echo $LANG['DATE']; ?>:</b></label>
<input type="text" name="dateidentified" id="dateidentified" style="background-color:lightyellow;" onchange="detDateChanged(this.form);" />
<b><?php echo $LANG['DATE']; ?>:</b>
<input type="text" name="dateidentified" style="background-color:lightyellow;" onchange="detDateChanged(this.form);" />
</div>
<div style='margin:3px;'>
<label for="identificationreferences"><b><?php echo $LANG['REFERENCE']; ?>:</b></label>
<input type="text" name="identificationreferences" id="identificationreferences" style="width:350px;" />
<b><?php echo $LANG['REFERENCE']; ?>:</b>
<input type="text" name="identificationreferences" style="width:350px;" />
</div>
<div style='margin:3px;'>
<label for="identificationremarks"><b><?php echo $LANG['NOTES']; ?>:</b></label>
<input type="text" name="identificationremarks" id="identificationremarks" style="width:350px;" />
<b><?php echo $LANG['NOTES']; ?>:</b>
<input type="text" name="identificationremarks" style="width:350px;" />
</div>
<div style='margin:3px;'>
<input type="checkbox" name="makecurrent" id="makecurrent" value="1" /><label for="makecurrent"> <?php echo $LANG['MAKE_THIS_CURRENT']; ?></label>
<input type="checkbox" name="makecurrent" value="1" /> <?php echo $LANG['MAKE_THIS_CURRENT']; ?>
</div>
<div style='margin:3px;'>
<input type="checkbox" name="printqueue" id="printqueue" value="1" /><label for="printqueue"> <?php echo $LANG['ADD_TO_PRINT']; ?></label>
<input type="checkbox" name="printqueue" value="1" /> <?php echo $LANG['ADD_TO_PRINT']; ?>
</div>
<div style='margin:3px; margin-top: 10px'>
<div style='margin:15px;'>
<input type="hidden" name="occid" value="<?php echo $occId; ?>" />
<input type="hidden" name="occindex" value="<?php echo $occIndex; ?>" />
<input type="hidden" name="annotatorname" value="<?php echo $annotatorname; ?>" />
<input type="hidden" name="annotatoremail" value="<?php echo $annotatoremail; ?>" />
<input type="hidden" name="catalognumber" value="<?php echo $catalognumber; ?>" />
<input type="hidden" name="institutioncode" value="<?php echo $institutioncode; ?>" />
<input type="hidden" name="csmode" value="<?php echo $crowdSourceMode; ?>" />
<div>
<button type="submit" name="submitaction" id="submitaction" value="submitDetermination" ><?php echo $LANG['SUBMIT_DET']; ?></button>
<div style="float:left;">
<button type="submit" name="submitaction" value="submitDetermination" ><?php echo $LANG['SUBMIT_DET']; ?></button>
</div>
</div>
</fieldset>
Expand Down
32 changes: 16 additions & 16 deletions collections/editor/includes/imagetab.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,16 +103,16 @@ function verifyImgRemapForm(f){
</div>
</div>
<div>
<input type="checkbox" name="nolgimage" id="nolgimage" value="1" /> <label for="nolgimage"><?php echo $LANG['DO_NOT_MAP_LARGE']; ?></label>
<input type="checkbox" name="nolgimage" value="1" /> <?php echo $LANG['DO_NOT_MAP_LARGE']; ?>
</div>
</div>
<div style="clear:both;margin:20px 0px 5px 10px;">
<label for="caption"><b><?php echo $LANG['CAPTION']; ?>:</b></label>
<input name="caption" id="caption" type="text" size="40" value="" />
<b><?php echo $LANG['CAPTION']; ?>:</b>
<input name="caption" type="text" size="40" value="" />
</div>
<div style='margin:0px 0px 5px 10px;'>
<label for="photographeruid"><b><?php echo $LANG['PHOTOGRAPHER']; ?>:</b></label>
<select name='photographeruid' name='photographeruid' id="photographeruid">
<b><?php echo $LANG['PHOTOGRAPHER']; ?>:</b>
<select name='photographeruid' name='photographeruid'>
<option value=""><?php echo $LANG['SEL_PHOTOG']; ?></option>
<option value="">---------------------------------------</option>
<?php
Expand All @@ -128,25 +128,25 @@ function verifyImgRemapForm(f){
</a>
</div>
<div id="imgaddoverride" style="margin:0px 0px 5px 10px;display:none;">
<label for="photographer"><b><?php echo $LANG['PHOTOG_OVER']; ?>:</b></label>
<input name='photographer' id="photographer" type='text' style="width:300px;" maxlength='100' />
<b><?php echo $LANG['PHOTOG_OVER']; ?>:</b>
<input name='photographer' type='text' style="width:300px;" maxlength='100' />
* <?php echo $LANG['WILL_OVERRIDE']; ?>
</div>
<div style="margin:0px 0px 5px 10px;">
<label for="notes"><b><?php echo $LANG['NOTES']; ?>:</b></label>
<input name="notes" id="notes" type="text" size="40" value="" />
<b><?php echo $LANG['NOTES']; ?>:</b>
<input name="notes" type="text" size="40" value="" />
</div>
<div style="margin:0px 0px 5px 10px;">
<label for="copyright"><b><?php echo $LANG['COPYRIGHT']; ?>:</b></label>
<input name="copyright" id="copyright" type="text" size="40" value="" />
<b><?php echo $LANG['COPYRIGHT']; ?>:</b>
<input name="copyright" type="text" size="40" value="" />
</div>
<div style="margin:0px 0px 5px 10px;">
<label for="sourceurl"><b><?php echo $LANG['SOURCE_WEBPAGE']; ?>:</b></label>
<input name="sourceurl" id="sourceurl" type="text" size="40" value="" />
<b><?php echo $LANG['SOURCE_WEBPAGE']; ?>:</b>
<input name="sourceurl" type="text" size="40" value="" />
</div>
<div style="margin:0px 0px 5px 10px;">
<label for="sortoccurrence"><b><?php echo $LANG['SORT']; ?>:</b></label>
<input name="sortoccurrence" id="sortoccurrence" type="text" size="10" value="" />
<b><?php echo $LANG['SORT']; ?>:</b>
<input name="sortoccurrence" type="text" size="10" value="" />
</div>
<div style="margin:0px 0px 5px 10px;">
<b><?php echo $LANG['DESCRIBE_IMAGE']; ?></b>
Expand All @@ -155,7 +155,7 @@ function verifyImgRemapForm(f){
$imageTagArr = $occManager->getImageTagArr();
foreach($imageTagArr as $key => $description) {
echo '<div style="margin-left:10px;">';
echo '<input name="ch_' . $key . '" id="ch_' . $key . '" type="checkbox" value="1" /> <label for="ch_' . $key . '">' . $description . '</label></br>';
echo '<input name="ch_'.$key.'" type="checkbox" value="1" /> '.$description.'</br>';
echo '</div>';
}
?>
Expand Down
104 changes: 52 additions & 52 deletions collections/editor/includes/materialsampleinclude.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@
?>
<form name="matSampleForm-<?php echo $matSampleID; ?>" action="occurrenceeditor.php" method="post" >
<div style="clear:both">
<section class="spaced">
<label for="ms_sampleType"><?php echo $MS_LABEL_ARR['sampleType']; ?>: </label>
<div class="smSampleTypeDiv">
<label><?php echo $MS_LABEL_ARR['sampleType']; ?>: </label>
<span class="edit-elem">
<?php
if(isset($controlTermArr['ommaterialsample']['sampleType'])){
$limitToList = $controlTermArr['ommaterialsample']['sampleType']['l'];
?>
<select name="ms_sampleType" id="ms_sampleType" required>
<select name="ms_sampleType" required>
<option value="">-------</option>
<?php
foreach($controlTermArr['ommaterialsample']['sampleType']['t'] as $t){
Expand All @@ -118,27 +118,27 @@
}
?>
</span>
</section>
<section class="spaced">
<label for="ms_catalogNumber"><?php echo $MS_LABEL_ARR['catalogNumber']; ?>: </label>
</div>
<div class="smCatalogNumberDiv">
<label><?php echo $MS_LABEL_ARR['catalogNumber']; ?>: </label>
<span class="edit-elem">
<input type="text" name="ms_catalogNumber" id="ms_catalogNumber" value="<?php echo isset($msArr['catalogNumber'])?$msArr['catalogNumber']:''; ?>" />
<input type="text" name="ms_catalogNumber" value="<?php echo isset($msArr['catalogNumber'])?$msArr['catalogNumber']:''; ?>" />
</span>
</section>
<section class="spaced">
<label for="ms_guid"><?php echo $MS_LABEL_ARR['guid']; ?>: </label>
</div>
<div class="smGuidDiv">
<label><?php echo $MS_LABEL_ARR['guid']; ?>: </label>
<span class="edit-elem">
<input type="text" name="ms_guid" id="ms_guid" value="<?php echo isset($msArr['guid'])?$msArr['guid']:''; ?>" />
<input type="text" name="ms_guid" value="<?php echo isset($msArr['guid'])?$msArr['guid']:''; ?>" />
</span>
</section>
<section class="spaced">
<label for="ms_sampleCondition"><?php echo $MS_LABEL_ARR['sampleCondition']; ?>: </label>
</div>
<div class="smSampleConditionDiv">
<label><?php echo $MS_LABEL_ARR['sampleCondition']; ?>: </label>
<span class="edit-elem">
<?php
if(isset($controlTermArr['ommaterialsample']['sampleCondition'])){
$limitToList = $controlTermArr['ommaterialsample']['sampleCondition']['l'];
?>
<select name="ms_sampleCondition" id="ms_sampleCondition">
<select name="ms_sampleCondition">
<option value="">-------</option>
<?php
foreach($controlTermArr['ommaterialsample']['sampleCondition']['t'] as $t){
Expand All @@ -155,15 +155,15 @@
}
?>
</span>
</section>
<section class="spaced">
<label for="ms_disposition"><?php echo $MS_LABEL_ARR['disposition']; ?>: </label>
</div>
<div class="smDispositionDiv">
<label><?php echo $MS_LABEL_ARR['disposition']; ?>: </label>
<span class="edit-elem">
<?php
if(isset($controlTermArr['ommaterialsample']['disposition'])){
$limitToList = $controlTermArr['ommaterialsample']['disposition']['l'];
?>
<select name="ms_disposition" id="ms_disposition">
<select name="ms_disposition">
<option value="">-------</option>
<?php
foreach($controlTermArr['ommaterialsample']['disposition']['t'] as $t){
Expand All @@ -180,15 +180,15 @@
}
?>
</span>
</section>
<section class="spaced">
<label for="ms_preservationType"><?php echo $MS_LABEL_ARR['preservationType']; ?>: </label>
</div>
<div class="smPreservationTypeDiv">
<label><?php echo $MS_LABEL_ARR['preservationType']; ?>: </label>
<span class="edit-elem">
<?php
if(isset($controlTermArr['ommaterialsample']['preservationType'])){
$limitToList = $controlTermArr['ommaterialsample']['preservationType']['l'];
?>
<select name="ms_preservationType" id="ms_preservationType">
<select name="ms_preservationType">
<option value="">-------</option>
<?php
foreach($controlTermArr['ommaterialsample']['preservationType']['t'] as $t){
Expand All @@ -205,46 +205,46 @@
}
?>
</span>
</section>
<section class="spaced">
<label for="ms_preparationDate"><?php echo $MS_LABEL_ARR['preparationDate']; ?>: </label>
</div>
<div class="smPreparationDateDiv">
<label><?php echo $MS_LABEL_ARR['preparationDate']; ?>: </label>
<span class="edit-elem">
<input type="date" name="ms_preparationDate" id="ms_preparationDate" value="<?php echo isset($msArr['preparationDate'])?$msArr['preparationDate']:''; ?>" />
<input type="date" name="ms_preparationDate" value="<?php echo isset($msArr['preparationDate'])?$msArr['preparationDate']:''; ?>" />
</span>
</section>
<section class="spaced">
<label for="ms_preparedBy"><?php echo $MS_LABEL_ARR['preparedBy']; ?>: </label>
</div>
<div class="smPreparedByUidDiv">
<label><?php echo $MS_LABEL_ARR['preparedBy']; ?>: </label>
<span class="edit-elem">
<input class="ms_preparedBy" name="ms_preparedBy" id="ms_preparedBy" type="text" value="<?php echo isset($msArr['preparedBy'])?$msArr['preparedBy']:''; ?>" />
<input class="ms_preparedBy" name="ms_preparedBy" type="text" value="<?php echo isset($msArr['preparedBy'])?$msArr['preparedBy']:''; ?>" />
<input name="ms_preparedByUid" type="hidden" value="<?php echo isset($msArr['preparedByUid'])?$msArr['preparedByUid']:''; ?>" />
</span>
</section>
<section class="spaced">
<label for="ms_preparationDetails"><?php echo $MS_LABEL_ARR['preparationDetails']; ?>: </label>
</div>
<div class="smPreparationDetailsDiv">
<label><?php echo $MS_LABEL_ARR['preparationDetails']; ?>: </label>
<span class="edit-elem">
<input type="text" name="ms_preparationDetails" id="ms_preparationDetails" value="<?php echo isset($msArr['preparationDetails'])?$msArr['preparationDetails']:''; ?>" />
<input type="text" name="ms_preparationDetails" value="<?php echo isset($msArr['preparationDetails'])?$msArr['preparationDetails']:''; ?>" />
</span>
</section>
<section class="spaced">
<label for="ms_individualCount"><?php echo $MS_LABEL_ARR['individualCount']; ?>: </label>
</div>
<div class="smIndividualCountDiv">
<label><?php echo $MS_LABEL_ARR['individualCount']; ?>: </label>
<span class="edit-elem">
<input type="text" name="ms_individualCount" id="ms_individualCount" value="<?php echo isset($msArr['individualCount'])?$msArr['individualCount']:''; ?>" />
<input type="text" name="ms_individualCount" value="<?php echo isset($msArr['individualCount'])?$msArr['individualCount']:''; ?>" />
</span>
</section>
<section class="spaced">
<label for="ms_sampleSize"><?php echo $MS_LABEL_ARR['sampleSize']; ?>: </label>
</div>
<div class="smSampleSizeDiv">
<label><?php echo $MS_LABEL_ARR['sampleSize']; ?>: </label>
<span class="edit-elem">
<input type="text" name="ms_sampleSize" id="ms_sampleSize" value="<?php echo isset($msArr['sampleSize'])?$msArr['sampleSize']:''; ?>" />
<input type="text" name="ms_sampleSize" value="<?php echo isset($msArr['sampleSize'])?$msArr['sampleSize']:''; ?>" />
</span>
</section>
<section class="spaced">
<label for="ms_storageLocation"><?php echo $MS_LABEL_ARR['storageLocation']; ?>: </label>
</div>
<div class="smStorageLocationDiv">
<label><?php echo $MS_LABEL_ARR['storageLocation']; ?>: </label>
<span class="edit-elem">
<?php
if(isset($controlTermArr['ommaterialsample']['storageLocation'])){
$limitToList = $controlTermArr['ommaterialsample']['storageLocation']['l'];
?>
<select name="ms_storageLocation" id="ms_storageLocation">
<select name="ms_storageLocation">
<option value="">-------</option>
<?php
foreach($controlTermArr['ommaterialsample']['storageLocation']['t'] as $t){
Expand All @@ -261,13 +261,13 @@
}
?>
</span>
</section>
<section class="spaced">
<label for="ms_remarks"><?php echo $MS_LABEL_ARR['remarks']; ?>: </label>
</div>
<div class="smRemarksDiv">
<label><?php echo $MS_LABEL_ARR['remarks']; ?>: </label>
<span class="edit-elem">
<input type="text" name="ms_remarks" id="ms_remarks" value="<?php echo isset($msArr['remarks'])?$msArr['remarks']:''; ?>" />
<input type="text" name="ms_remarks" value="<?php echo isset($msArr['remarks'])?$msArr['remarks']:''; ?>" />
</span>
</section>
</div>
<div style="clear:both;">
<input name="occid" type="hidden" value="<?php echo $occid; ?>" />
<input name="matSampleID" type="hidden" value="<?php echo $matSampleID; ?>" />
Expand Down
2 changes: 1 addition & 1 deletion collections/editor/observationsubmit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
</div>
<div>
<label for="eventdate"><?php echo $LANG['DATE']; ?>:</label>
<input id="eventdate" name="eventdate" style="width:120px;" onchange="verifyDate(this);" title="format: yyyy-mm-dd" required placeholder="yyyy-mm-dd" />
<input type="text" id="eventdate" name="eventdate" style="width:120px;" onchange="verifyDate(this);" title="format: yyyy-mm-dd" required />
<a style="margin:15px 0px 0px 5px;" onclick="toggle('obsextradiv');return false" title="Display additional fields">
<img src="../../images/editplus.png" style="width:15px;" />
</a>
Expand Down
Loading