[3.1] Font unification (BioKIC#1301)

* remove some font-family references * remove in-line styling for font-family in all files not .scss, .css, vendor, .js, .less, .html, or .map * remove <b> from one of the fieldset-likes * add reference to font-family in reset.css * remove unecessary font-size restriction on fields-available chips
GJongsma · May 21, 2024 · cd4ec15 · cd4ec15
1 parent bf52c85
commit cd4ec15
Show file tree

Hide file tree

Showing 43 changed files with 49 additions and 59 deletions.
diff --git a/checklists/checklistadmin.php b/checklists/checklistadmin.php
@@ -216,14 +216,16 @@ function validateAddProjectForm(f){
 							foreach($editorArr as $uid => $uNameArr){
 								?>
 								<li>
-									<?php echo '<span title="'.($uNameArr['assignedby'] ? $LANG['ASSIGNED_BY'] . ' ' . $uNameArr['assignedby']:'') . '">' . $uNameArr['name'] . '</span>'; ?>
-									<form name="delEditorForm-<?php echo $uid; ?>" action="checklistadmin.php" method="post" onclick="return confirm(<?php echo $LANG['REMOVEEDITPRIVCONFIRM']; ?>);" title="<?php echo $LANG['DELETETHISU'];?>" style="display:inline">
-										<input name="clid" type="hidden" value="<?php echo $clid; ?>" />
-										<input name="pid" type="hidden" value="<?php echo $pid; ?>" />
-										<input name="deleteuid" type="hidden" value="<?php echo $uid; ?>" />
-										<input name="submitaction" type="hidden" value="DeleteEditor" />
-										<input name="submit" type="image" src="../images/drop.png" style="width:1em;" alt="<?php echo $LANG['DROP_ICON_FOR_EDITOR']; ?>" />
-									</form>
+									<div style="display: flex; align-items: center;">
+										<?php echo '<span title="'.($uNameArr['assignedby'] ? $LANG['ASSIGNED_BY'] . ' ' . $uNameArr['assignedby']:'') . '">' . $uNameArr['name'] . '</span>'; ?>
+										<form name="delEditorForm-<?php echo $uid; ?>" action="checklistadmin.php" method="post" onclick="return confirm(<?php echo $LANG['REMOVEEDITPRIVCONFIRM']; ?>);" title="<?php echo $LANG['DELETETHISU'];?>" style="display:inline">
+											<input name="clid" type="hidden" value="<?php echo $clid; ?>" />
+											<input name="pid" type="hidden" value="<?php echo $pid; ?>" />
+											<input name="deleteuid" type="hidden" value="<?php echo $uid; ?>" />
+											<input name="submitaction" type="hidden" value="DeleteEditor" />
+											<input name="submit" type="image" src="../images/drop.png" style="width:1em; margin:0;" alt="<?php echo $LANG['DROP_ICON_FOR_EDITOR']; ?>" />
+										</form>
+									</div>
 								</li>
 								<?php
 							}
@@ -236,7 +238,7 @@ function validateAddProjectForm(f){
 					}
 					?>
                     <section class="fieldset-like">
-							<h2><span><b><?php echo $LANG['ADDNEWUSER']; ?></b></span></h2>
+							<h2><span><?php echo $LANG['ADDNEWUSER']; ?></span></h2>
 						<form name="adduser" action="checklistadmin.php" method="post" onsubmit="return verifyAddUser(this)">
 							<div>
 							    <label for="editoruid"><?php echo $LANG['SELECTUSER']; ?></label>

diff --git a/checklists/nonvoucheredtab.php b/checklists/nonvoucheredtab.php
@@ -65,7 +65,7 @@
 						if($specArr = $clManager->getNewVouchers($startPos, $displayMode)){
 							?>
 							<form name="batchnonvoucherform" method="post" action="voucheradmin.php" onsubmit="return validateBatchNonVoucherForm(this)">
-								<table class="styledtable" style="font-family:Arial;font-size:12px;">
+								<table class="styledtable" style="font-size:12px;">
 									<tr>
 										<th>
 											<span title="Select All">

diff --git a/checklists/vaconflicts.php b/checklists/vaconflicts.php
@@ -54,7 +54,7 @@ function validateBatchConflictForm(f){
 		echo '<div style="font-weight:bold;">' . $LANG['CONFLICT_COUNT'] . ': ' . count($conflictArr) . '</div>';
 		?>
 		<form name="batchConflictForm" method="post" action="voucheradmin.php">
-			<table class="styledtable" style="font-family:Arial;font-size:12px;">
+			<table class="styledtable" style="font-size:12px;">
 				<tr>
 					<th><input type="checkbox" onclick="selectAll(this)" /></th>
 					<th><b><?php echo $LANG['CHECK_ID']; ?></b></th>

diff --git a/checklists/voucheradmin.php b/checklists/voucheradmin.php
@@ -86,7 +86,7 @@
 		.family-div{ font-weight: bold; }
 		.taxa-block{ margin: 10px; font-style: italic; }
 		.taxon-input{ width: 200px; }
-		.styledtable{ font-family:Arial; font-size: 1rem; }
+		.styledtable{ font-size: 1rem; }
 		.voucher-admin-header {
 			font-size: 2em;
 			font-weight: bold;

diff --git a/classes/ChecklistLoaderManager.php b/classes/ChecklistLoaderManager.php
@@ -147,7 +147,7 @@ public function uploadCsvList($thesId){
 	public function resolveProblemTaxa(){
 		if($this->problemTaxa){
 			//$taxHarvester = new TaxonomyHarvester();
-			echo '<table class="styledtable" style="font-family:Arial;font-size:12px;">';
+			echo '<table class="styledtable" style="font-size:12px;">';
 			echo '<tr><th>Cnt</th><th>Name</th><th>Actions</th></tr>';
 			$cnt = 1;
 			foreach($this->problemTaxa as $nameStr){

diff --git a/classes/PluginsManager.php b/classes/PluginsManager.php
diff --git a/classes/SpecUploadBase.php b/classes/SpecUploadBase.php
@@ -406,7 +406,7 @@ public function echoFieldMapTable($autoMap, $mode){
 			return false;
 		}
 		//Output table rows for source data
-		echo '<table class="styledtable" style="width:600px;font-family:Arial;font-size:12px;">';
+		echo '<table class="styledtable" style="width:600px;font-size:12px;">';
 		echo '<tr><th>Source Field</th><th>Target Field</th></tr>'."\n";
 		foreach($sourceArr as $fieldName){
 			if($fieldName == 'coreid') continue;

diff --git a/classes/UtilitiesFileImport.php b/classes/UtilitiesFileImport.php
@@ -126,7 +126,7 @@ protected function deleteImportFile(){
 
 	//Field mapping functions
 	public function getFieldMappingTable(){
-		$tableHtml = '<table class="styledtable" style="width:600px;font-family:Arial;font-size:12px;">';
+		$tableHtml = '<table class="styledtable" style="width:600px;font-size:12px;">';
 		$tableHtml .= '<tr><th>Source Field</th><th>Target Field</th></tr>';
 		$sourceFieldArr = $this->getHeaderArr();
 		foreach($sourceFieldArr as $i => $sourceField){

diff --git a/classes/WordCloud.php b/classes/WordCloud.php
@@ -172,7 +172,7 @@ private function getWordCloud(){
 				$grade = $this->gradeFrequency(($useCount * 100) / $maxCount);
 				$retStr .= ('<a href="'. $this->tagUrl.urlencode($tag).'" style="color:' . $this->wordColors[$grade] . ';" target="_blank">'.
 					'<span style="color:'.$this->wordColors[$grade].'; letter-spacing:3px; '.
-					'padding:4px; font-family:Tahoma; font-weight:900; font-size:'.
+					'padding:4px;  font-weight:900; font-size:'.
 					(0.6 + 0.1 * $grade).'em">'.$tag.'</span></a> ');
 			}
 			$retStr .= '</div>';

diff --git a/collections/admin/uploadreviewer.php b/collections/admin/uploadreviewer.php
@@ -105,7 +105,7 @@
 					'datelastmodified' => 'dateLastModified','processingstatus' => 'processingStatus','recordenteredby' => 'recordEnteredBy',
 					'basisofrecord' => 'basisOfRecord','occid' => 'occid (Primary Key)','dbpk'=>'dbpk (Source Identifier)');
 				?>
-				<table class="styledtable" style="font-family:Arial;font-size:12px;">
+				<table class="styledtable" style="font-size:12px;">
 					<tr>
 						<?php
 						foreach($headerArr as $k => $v){

diff --git a/collections/cleaning/duplicatesearch.php b/collections/cleaning/duplicatesearch.php
@@ -129,7 +129,7 @@ function batchSwitchTargetSpecimens(cbElem){
 							?>
 						</div>
 						<div style="clear: both">
-							<table class="styledtable" style="font-family:Arial;font-size:12px;">
+							<table class="styledtable" style="font-size:12px;">
 								<tr>
 									<th style="width:40px;"><?php echo $LANG['ID']; ?></th>
 									<th style="width:20px;"><input name="selectalldupes" type="checkbox" title="<?php echo $LANG['SEL_DESEL_ALL']; ?>" onclick="selectAllDuplicates(this.form)" /></th>

diff --git a/collections/datasets/datapublisher.php b/collections/datasets/datapublisher.php
@@ -540,7 +540,7 @@ function checkAllColl(cb) {
 			}
 			if ($dwcaArr = $dwcaManager->getDwcaItems()) {
 				?>
-				<table class="styledtable" style="font-family:Arial;font-size:12px;margin:10px;">
+				<table class="styledtable" style="font-size:12px;margin:10px;">
 					<tr>
 						<th><?php echo $LANG['CODE']; ?></th>
 						<th><?php echo $LANG['COL_NAME']; ?></th>

diff --git a/collections/datasets/datasetmanager.php b/collections/datasets/datasetmanager.php
@@ -319,7 +319,7 @@ function targetDownloadPopup(f) {
 								<div style="float:right;margin-right:10px">
 									<?php echo '<b>'.$LANG['COUNT'].': '.count($occArr).' '.$LANG['RECORDS'].'</b>'; ?>
 								</div>
-								<table class="styledtable" style="font-family:Arial;font-size:12px;">
+								<table class="styledtable" style="font-size:12px;">
 									<tr>
 										<th><input name="" value="" type="checkbox" onclick="selectAll(this);" title="<?php echo $LANG['SEL_DESEL_SPCS']; ?>" /></th>
 										<th><?php echo $LANG['CAT_NUM']; ?></th>

diff --git a/collections/editor/batchdeterminations.php b/collections/editor/batchdeterminations.php
@@ -358,7 +358,7 @@ function openPopup(urlStr){
 							<input name="accselectall" value="" type="checkbox" onclick="selectAll(this);" checked />
 							<?php echo $LANG['SELECT_DESELECT']; ?>
 						</div>
-						<table class="styledtable" style="font-family:Arial;font-size: 1.45rem;">
+						<table class="styledtable" style="font-size: 1.45rem;">
 							<thead>
 								<tr>
 									<th style="width:25px;text-align:center;">&nbsp;</th>

diff --git a/collections/editor/dupesearch.php b/collections/editor/dupesearch.php
@@ -171,7 +171,7 @@ function reloadParent(){
 				/*
 				?>
 				<div id="tableview" style="display:none;">
-					<table class="styledtable" style="font-family:Arial;font-size:12px;">
+					<table class="styledtable" style="font-size:12px;">
 						<tr>
 							<th>&nbsp;</th>
 							<th>&nbsp;</th>

diff --git a/collections/editor/editreviewer.php b/collections/editor/editreviewer.php
@@ -356,7 +356,7 @@ function openIndPU(occid,clid){
 					<?php
 					echo '<div style="clear:both">'.$navStr.'</div>';
 					?>
-					<table class="styledtable" style="font-family:Arial;font-size:1.25rem;" aria-label="<?php echo (isset($LANG['TABLE']) ? $LANG['TABLE'] : 'Table of Records'); ?>" aria-labeledby="table-desc">
+					<table class="styledtable" style="font-size:1.25rem;" aria-label="<?php echo (isset($LANG['TABLE']) ? $LANG['TABLE'] : 'Table of Records'); ?>" aria-labeledby="table-desc">
 						<caption id="table-desc" class="bottom-breathing-room-rel top-breathing-room-rel screen-reader-only">
 							<?php echo $LANG['TABLE_DESC']; ?>
 						</caption>

diff --git a/collections/exsiccati/batchimport.php b/collections/exsiccati/batchimport.php
@@ -167,7 +167,7 @@ function openExsPU(omenid){
 						Enter your catalog numbers in field associated with record and then transfer into your collection or download as a spreadsheet (CSV)
 						for import into a local database application.
 					</div>
-					<table class="styledtable" style="font-family:Arial;font-size:12px;">
+					<table class="styledtable" style="font-size:12px;">
 						<tr><th><input name="selectAllCB" type="checkbox" onchange="selectAll(this)" /></th><th>Catalog Number</th><th>Exsiccata #</th><th>Details</th></tr>
 						<?php
 						foreach($occurArr as $omenid => $occArr){

diff --git a/collections/georef/geolocatetools.php b/collections/georef/geolocatetools.php
@@ -120,7 +120,7 @@
 
 					?>
 					<form name="coordsubmitform" action="geolocatetool" method="post">
-						<table class="styledtable" style="font-family:Arial;font-size:12px;">
+						<table class="styledtable" style="font-size:12px;">
 							<tr>
 								<th>occid</th>
 								<th>Map Tool</th>

diff --git a/collections/listtabledisplay.php b/collections/listtabledisplay.php
@@ -170,7 +170,7 @@
 				if($recArr){
 					?>
 					<div style="clear:both;height:5px;"></div>
-					<table class="styledtable" style="font-family:Arial;font-size:12px;">
+					<table class="styledtable" style="font-size:12px;">
 						<tr>
 							<th><?php echo (isset($LANG['SYMB_ID']) ? $LANG['SYMB_ID'] : 'Symbiota ID'); ?></th>
 							<th><?php echo (isset($LANG['COLLECTION']) ? $LANG['COLLECTION'] : 'Collection'); ?></th>

diff --git a/collections/loans/exchange.php b/collections/loans/exchange.php
@@ -244,7 +244,7 @@
 									</div>
 								</div>
 								<div style="padding-top:8px;padding-bottom:8px;">
-									<table class="styledtable" style="font-family:Arial;font-size:12px;">
+									<table class="styledtable" style="font-size:12px;">
 										<tr>
 											<th style="width:220px;text-align:center;"><?php echo $LANG['GIFT_SPECIMENS']; ?></th>
 											<th style="width:220px;text-align:center;"><?php echo $LANG['EXCH_SPECIMENS']; ?></th>

diff --git a/collections/loans/incoming.php b/collections/loans/incoming.php
@@ -345,7 +345,7 @@ function verifyLoanInEditForm(f){
 				if($specList){
 					?>
 					<div id="specdiv">
-						<table class="styledtable" style="font-family:Arial;font-size:12px;">
+						<table class="styledtable" style="font-size:12px;">
 							<tr>
 								<th style="width:100px;text-align:center;"><?php echo $LANG['CATNO']; ?></th>
 								<th style="width:375px;text-align:center;"><?php echo $LANG['DETAILS']; ?></th>

diff --git a/collections/loans/reports/defaultenvelope.php b/collections/loans/reports/defaultenvelope.php
@@ -79,7 +79,6 @@
 			include_once($SERVER_ROOT.'/includes/head.php');
 			?>
 			<style type="text/css">
-				body {font-family:arial,sans-serif;}
 				p.printbreak {page-break-after:always;}
 				.accnum {margin-left:2.5in;font:8pt arial,sans-serif;}
 				.toaddress {margin-left:3in;font:12pt arial,sans-serif;}

diff --git a/collections/loans/reports/defaultinvoice.php b/collections/loans/reports/defaultinvoice.php
@@ -376,7 +376,6 @@
 			include_once($SERVER_ROOT.'/includes/head.php');
 			?>
 			<style type="text/css">
-				body {font-family:arial,sans-serif;}
 				p.printbreak {page-break-after:always;}
 				.header {width:100%;text-align:center;font:bold 12pt arial,sans-serif;margin-bottom:30px;}
 				.toaddress {float:left;text-align:left;font:10pt arial,sans-serif;margin-top:10px;}

diff --git a/collections/loans/reports/defaultmailinglabel.php b/collections/loans/reports/defaultmailinglabel.php
@@ -98,7 +98,6 @@
 			include_once($SERVER_ROOT.'/includes/head.php');
 			?>
 			<style type="text/css">
-				body {font-family:arial,sans-serif;}
 				p.printbreak {page-break-after:always;}
 				.fromaddress {font:10pt arial,sans-serif;}
 				.toaddress {margin-left:1in;font:14pt arial,sans-serif;}

diff --git a/collections/loans/reports/defaultspecimenlist.php b/collections/loans/reports/defaultspecimenlist.php
@@ -88,7 +88,6 @@
 			include_once($SERVER_ROOT.'/includes/head.php');
 			?>
 			<style type="text/css">
-				body {font-family:arial,sans-serif;}
 				p.printbreak {page-break-after:always;}
 				.header {width:100%;text-align:left;font:14pt arial,sans-serif;}
 				.loaninfo {width:100%;text-align:left;font:11pt arial,sans-serif;}

diff --git a/collections/loans/specimentab.php b/collections/loans/specimentab.php
@@ -400,7 +400,7 @@ function hideAll(){
 					<input name="tabindex" type="hidden" value="1" />
 				</fieldset>
 			</div>
-			<table class="styledtable" style="font-family:Arial;font-size:12px;">
+			<table class="styledtable" style="font-size:12px;">
 				<tr>
 					<th class="form-checkbox"><input type="checkbox" onclick="selectAll(this);" title="<?php echo $LANG['SEC_DESEL_ALL']; ?>" /></th>
 					<th>&nbsp;</th>

diff --git a/collections/map/index.php b/collections/map/index.php
@@ -267,8 +267,6 @@
 		}
 
 		#mapSearchRecordsTable {
-
-		font-family:Arial;
 		font-size:12px;
 		}
 

diff --git a/collections/map/occurrencelist.php b/collections/map/occurrencelist.php
@@ -94,7 +94,7 @@
 		if($occArr){
 			?>
 			<form name="selectform" id="selectform" action="" method="post" onsubmit="" target="_blank">
-				<table class="styledtable" style="font-family:Arial;font-size:12px;margin-left:-15px;">
+				<table class="styledtable" style="font-size:12px;margin-left:-15px;">
 					<tr>
 						<!--
 						<th style="width:10px;" title="Select/Deselect all Records">

diff --git a/collections/misc/collorderstats.php b/collections/misc/collorderstats.php
@@ -41,7 +41,7 @@
 			<h1 class="page-heading"><?= $LANG['ORDER_DIST']; ?></h1>
 			<fieldset id="orderdistbox" style="clear:both;margin-top:15px;width:800px;">
 				<legend><b><?php echo (isset($LANG['ORDER_DIST'])?$LANG['ORDER_DIST']:'Order Distribution'); ?></b></legend>
-				<table class="styledtable" style="font-family:Arial;font-size:12px;width:780px;">
+				<table class="styledtable" style="font-size:12px;width:780px;">
 					<tr>
 						<th style="text-align:center;"><?php echo (isset($LANG['ORDER'])?$LANG['ORDER']:'Order'); ?></th>
 						<th style="text-align:center;"><?php echo (isset($LANG['SPECIMENS'])?$LANG['SPECIMENS']:'Specimens'); ?></th>

diff --git a/collections/misc/collyearstats.php b/collections/misc/collyearstats.php
@@ -43,7 +43,7 @@
 			<h1 class="page-heading">Year Statistics</h1>
 			<fieldset id="yearstatsbox" style="clear:both;margin-top:15px;width:97%;">
 				<legend><b>Month Totals</b></legend>
-				<table class="styledtable" style="font-family:Arial;font-size:12px;width:98%;">
+				<table class="styledtable" style="font-size:12px;width:98%;">
 					<tr>
 						<th style="text-align:center;">Institution</th>
 						<th style="text-align:center;">Object</th>

diff --git a/collections/reports/barcodes.php b/collections/reports/barcodes.php
@@ -21,7 +21,7 @@
 	<head>
 		<title><?php echo $DEFAULT_TITLE; ?> Labels</title>
 		<style type="text/css">
-			body { background-color:#ffffff;font-family:arial,sans-serif; font-size:10pt; }
+			body { background-color:#ffffff; font-size:10pt; }
 			.barcode { width:220px; height:50px; float:left; padding:10px; text-align:center; }
 			.screen-reader-only {
 				position: absolute;

diff --git a/collections/reports/defaultannotations.php b/collections/reports/defaultannotations.php
@@ -25,7 +25,6 @@
 	<head>
 		<title><?php echo $DEFAULT_TITLE; ?> Default Annotations</title>
 		<style type="text/css">
-			body {font-family:arial,sans-serif;}
 			table.labels { page-break-before:auto; }
 			table.labels tr td { page-break-inside: avoid; white-space: nowrap; }
 			<?php