Skip to content

Commit

Permalink
Merge pull request #34 from BioKIC/master
Browse files Browse the repository at this point in the history 
Merge Symbiota-light developments into bryo-lichen
  • Loading branch information
@egbot
egbot authored Feb 16, 2021
2 parents 09e021b + 7d4a38b commit 8f8b7b3
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 54 deletions.
18 changes: 9 additions & 9 deletions collections/exsiccati/batchimport.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
?>
<html>
<head>
<title><?php echo $DEFAULT_TITLE; ?> Exsiccati Batch Transfer</title>
<title><?php echo $DEFAULT_TITLE; ?> Exsiccatae Batch Transfer</title>
<?php
$activateJQuery = false;
if(file_exists($SERVER_ROOT.'/includes/head.php')){
Expand Down Expand Up @@ -71,7 +71,7 @@ function verifyExsTableForm(f){

function verifyFirstForm(f){
if(f.ometid.value == ""){
alert("Exsiccati title must be selected");
alert("Exsiccata title must be selected");
return false;
}
return true;
Expand Down Expand Up @@ -124,7 +124,7 @@ function openExsPU(omenid){
?>
<div class='navpath'>
<a href="../../index.php">Home</a> &gt;&gt;
<a href="index.php">Exsiccati Index</a> &gt;&gt;
<a href="index.php">Exsiccatae Index</a> &gt;&gt;
<a href="batchimport.php">Batch Import Module</a>
</div>
<!-- This is inner text! -->
Expand All @@ -143,7 +143,7 @@ function openExsPU(omenid){
<legend><b>Batch Import Module</b></legend>
<div style="margin:30px">
<select name="ometid" style="width:500px;" onchange="this.form.submit()">
<option value="">Choose Exsiccati Series</option>
<option value="">Choose Exsiccata Series</option>
<option value="">------------------------------------</option>
<?php
//Get only titles with linked specimens
Expand All @@ -159,10 +159,10 @@ function openExsPU(omenid){
<?php
}
else{
echo '<div style="margin:20px;font-size:120%;"><b>The system does not yet have occurrence linked to exsiccati that can be transferred</b></div>';
echo '<div style="margin:20px;font-size:120%;"><b>The system does not yet have occurrences linked to exsiccatae that can be transferred</b></div>';
}
}
elseif($formSubmit == 'Show Exsiccati Table'){
elseif($formSubmit == 'Show Exsiccatae Table'){
$occurArr = $exsManager->getExsOccArr($ometid, 'ometid');
if($occurArr){
$exsMetadata = $exsManager->getTitleObj($ometid);
Expand All @@ -175,7 +175,7 @@ function openExsPU(omenid){
for import into a local database application.
</div>
<table class="styledtable" style="font-family:Arial;font-size:12px;">
<tr><th><input name="selectAllCB" type="checkbox" onchange="selectAll(this)" /></th><th>Catalog Number</th><th>Exsiccati #</th><th>Details</th></tr>
<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){
//Sort by preferred source collections and ranking
Expand All @@ -197,7 +197,7 @@ function openExsPU(omenid){
$cnt++;
}
foreach($occArr as $occid => $oArr){
//List maximun of three occurrences for each exsiccati number
//List maximun of three occurrences for each exsiccata number
if($cnt < 3 || $oArr['collid'] == $collid){
echo $exsManager->getExsTableRow($occid,$oArr,$omenid,$collid);
$cnt++;
Expand Down Expand Up @@ -292,7 +292,7 @@ function openExsPU(omenid){
<div style="margin:20px">
<input name="collid" type="hidden" value="<?php echo $collid; ?>" />
<input name="ometid" type="hidden" value="<?php echo $ometid; ?>" />
<input name="formsubmit" type="submit" value="Show Exsiccati Table" />
<input name="formsubmit" type="submit" value="Show Exsiccatae Table" />
</div>
</fieldset>
</form>
Expand Down
90 changes: 45 additions & 45 deletions collections/exsiccati/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@

$exsManager = new ExsiccatiManager();
if($isEditor && $formSubmit){
if($formSubmit == 'Add Exsiccati Title'){
if($formSubmit == 'Add Exsiccata Title'){
$exsManager->addTitle($_POST,$PARAMS_ARR['un']);
}
elseif($formSubmit == 'Save'){
$exsManager->editTitle($_POST,$PARAMS_ARR['un']);
}
elseif($formSubmit == 'Delete Exsiccati'){
elseif($formSubmit == 'Delete Exsiccata'){
$statusStr = $exsManager->deleteTitle($ometId);
if(!$statusStr) $ometId = 0;
}
elseif($formSubmit == 'Merge Exsiccati'){
elseif($formSubmit == 'Merge Exsiccata'){
$statusStr = $exsManager->mergeTitles($ometId,$_POST['targetometid']);
if(!$statusStr) $ometId = $_POST['targetometid'];
}
Expand Down Expand Up @@ -85,7 +85,7 @@
?>
<html>
<head>
<title><?php echo $DEFAULT_TITLE; ?> Exsiccati</title>
<title><?php echo $DEFAULT_TITLE; ?> Exsiccatae</title>
<?php
$activateJQuery = false;
if(file_exists($SERVER_ROOT.'/includes/head.php')){
Expand Down Expand Up @@ -140,11 +140,11 @@ function verifyExsEditForm(f){

function verifyExsMergeForm(f){
if(t.targetometid == ""){
alert("You need to select a target exsiccati to merge into");
alert("You need to select a target exsiccata to merge into");
return false;
}
else{
return confirm("Are you sure you want to merge this exsiccati into the target below?");
return confirm("Are you sure you want to merge this exsiccata into the target below?");
}
}

Expand All @@ -166,11 +166,11 @@ function verifyNumEditForm(f){

function verifyNumTransferForm(f){
if(t.targetometid == ""){
alert("You need to select a target exsiccati to merge into");
alert("You need to select a target exsiccata to merge into");
return false;
}
else{
return confirm("Are you sure you want to transfer this exsiccati into the target exsiccati?");
return confirm("Are you sure you want to transfer this exsiccata into the target exsiccata?");
}
}

Expand Down Expand Up @@ -204,11 +204,11 @@ function verifyOccEditForm(f){

function verifyOccTransferForm(f){
if(f.targetometid.value == ""){
alert("Please select an exsiccati title");
alert("Please select an exsiccata title");
return false;
}
if(f.targetexsnumber.value == ""){
alert("Please enter an exsiccati number");
alert("Please enter an exsiccata number");
return false;
}
return true;
Expand Down Expand Up @@ -239,7 +239,7 @@ function openIndPU(occId){

<?php
if($omenId){
//Exsiccati number section can have a large number of ometid select look ups; using javascript makes page more efficient
//Exsiccata number section can have a large number of ometid select look ups; using javascript makes page more efficient
$titleArr = $exsManager->getTitleArr();
$selectValues = '';
//Added "k" prefix to key so that Chrom would maintain the correct sort order
Expand Down Expand Up @@ -277,10 +277,10 @@ function buildExsSelect(selectObj){
<a href="../../index.php">Home</a> &gt;&gt;
<?php
if($ometId || $omenId){
echo '<a href="index.php"><b>Return to main Exsiccati Index</b></a>';
echo '<a href="index.php"><b>Return to main Exsiccatae Index</b></a>';
}
else{
echo '<a href="index.php"><b>Exsiccati Index</b></a>';
echo '<a href="index.php"><b>Exsiccatae Index</b></a>';
}
?>
</div>
Expand Down Expand Up @@ -332,8 +332,8 @@ function buildExsSelect(selectObj){
</div>
<div style="margin-top:5px">
<div style="float:right;">
<span title="Exsiccati download: titles only"><button name="formsubmit" type="submit" value="dlexs_titleOnly"><img src="../../images/dl.png" style="width:15px" /></button></span>
<span title="Exsiccati download: with numbers and occurrences"><button name="formsubmit" type="submit" value="dlexs"><img src="../../images/dl.png" style="width:15px" /></button></span>
<span title="Exsiccata download: titles only"><button name="formsubmit" type="submit" value="dlexs_titleOnly"><img src="../../images/dl.png" style="width:15px" /></button></span>
<span title="Exsiccata download: with numbers and occurrences"><button name="formsubmit" type="submit" value="dlexs"><img src="../../images/dl.png" style="width:15px" /></button></span>
</div>
<div>
<button name="formsubmit" type="submit" value="rebuildList">Rebuild List</button>
Expand All @@ -342,17 +342,17 @@ function buildExsSelect(selectObj){
</fieldset>
</form>
</div>
<div style="font-weight:bold;font-size:120%;">Exsiccati Titles</div>
<div style="font-weight:bold;font-size:120%;">Exsiccatae Titles</div>
<?php
if($isEditor){
?>
<div style="cursor:pointer;float:right;" onclick="toggle('exsadddiv');" title="Edit Exsiccati Number">
<div style="cursor:pointer;float:right;" onclick="toggle('exsadddiv');" title="Edit Exsiccata Number">
<img style="border:0px;" src="../../images/add.png" />
</div>
<div id="exsadddiv" style="display:none;">
<form name="exsaddform" action="index.php" method="post" onsubmit="return verfifyExsAddForm(this)">
<fieldset style="margin:10px;padding:15px;background-color:#B0C4DE;">
<legend><b>Add New Exsiccati</b></legend>
<legend><b>Add New Exsiccata</b></legend>
<div style="margin:2px;">
Title:<br/><input name="title" type="text" value="" style="width:90%;" />
</div>
Expand All @@ -377,7 +377,7 @@ function buildExsSelect(selectObj){
Notes:<br/><input name="notes" type="text" value="" style="width:480px;" />
</div>
<div style="margin:10px;">
<input name="formsubmit" type="submit" value="Add Exsiccati Title" />
<input name="formsubmit" type="submit" value="Add Exsiccata Title" />
</div>
</fieldset>
</form>
Expand All @@ -403,7 +403,7 @@ function buildExsSelect(selectObj){
}
}
else{
echo '<div style="margin:20px;font-size:120%;">There are no exsiccati matching your request</div>';
echo '<div style="margin:20px;font-size:120%;">There are no exsiccatae matching your request</div>';
}
?>
</ul>
Expand All @@ -417,10 +417,10 @@ function buildExsSelect(selectObj){
if($isEditor){
?>
<div style="float:right;">
<span style="cursor:pointer;" onclick="toggleExsEditDiv('exseditdiv');" title="Edit Exsiccati">
<span style="cursor:pointer;" onclick="toggleExsEditDiv('exseditdiv');" title="Edit Exsiccata">
<img style="border:0px;" src="../../images/edit.png" />
</span>
<span style="cursor:pointer;" onclick="toggleNumAddDiv('numadddiv');" title="Add Exsiccati Number">
<span style="cursor:pointer;" onclick="toggleNumAddDiv('numadddiv');" title="Add Exsiccata Number">
<img style="border:0px;" src="../../images/add.png" />
</span>
</div>
Expand Down Expand Up @@ -466,22 +466,22 @@ function buildExsSelect(selectObj){
</div>
</fieldset>
</form>
<form name="exdeleteform" action="index.php" method="post" onsubmit="return confirm('Are you sure you want to delete this exsiccati?');">
<form name="exdeleteform" action="index.php" method="post" onsubmit="return confirm('Are you sure you want to delete this exsiccata?');">
<fieldset style="margin:10px;padding:15px;background-color:#B0C4DE;">
<legend><b>Delete Exsiccati</b></legend>
<legend><b>Delete Exsiccata</b></legend>
<div style="margin:10px;">
<input name="ometid" type="hidden" value="<?php echo $ometId; ?>" />
<input name="formsubmit" type="submit" value="Delete Exsiccati" />
<input name="formsubmit" type="submit" value="Delete Exsiccata" />
</div>
</fieldset>
</form>
<form name="exmergeform" action="index.php" method="post" onsubmit="return verifyExsMergeForm(this);">
<fieldset style="margin:10px;padding:15px;background-color:#B0C4DE;">
<legend><b>Merge Exsiccati</b></legend>
<legend><b>Merge Exsiccatae</b></legend>
<div style="margin:10px;">
Target Exsiccati<br/>
Target Exsiccata<br/>
<select name="targetometid" style="width:650px;">
<option value="">Select the Target Exsiccati</option>
<option value="">Select the Target Exsiccata</option>
<option value="">-------------------------------</option>
<?php
$titleArr = $exsManager->getTitleArr();
Expand All @@ -494,7 +494,7 @@ function buildExsSelect(selectObj){
</div>
<div style="margin:10px;">
<input name="ometid" type="hidden" value="<?php echo $ometId; ?>" />
<input name="formsubmit" type="submit" value="Merge Exsiccati" />
<input name="formsubmit" type="submit" value="Merge Exsiccatae" />
</div>
</fieldset>
</form>
Expand All @@ -503,9 +503,9 @@ function buildExsSelect(selectObj){
<div id="numadddiv" style="display:none;">
<form name="numaddform" action="index.php" method="post" onsubmit="return verifyNumAddForm(this);">
<fieldset style="margin:10px;padding:15px;background-color:#B0C4DE;">
<legend><b>Add Exsiccati Number</b></legend>
<legend><b>Add Exsiccata Number</b></legend>
<div style="margin:2px;">
Exsiccati Number: <input name="exsnumber" type="text" />
Exsiccata Number: <input name="exsnumber" type="text" />
</div>
<div style="margin:2px;">
Notes: <input name="notes" type="text" style="width:90%" />
Expand Down Expand Up @@ -538,7 +538,7 @@ function buildExsSelect(selectObj){
}
else{
echo '<div style="font-weight:bold;font-size:110%;">';
echo 'There are no exsiccati numbers in database ';
echo 'There are no exsiccata numbers in database ';
echo '</div>';
}
?>
Expand All @@ -551,10 +551,10 @@ function buildExsSelect(selectObj){
if($isEditor){
?>
<div style="float:right;">
<span style="cursor:pointer;" onclick="toggleNumEditDiv('numeditdiv');" title="Edit Exsiccati Number">
<span style="cursor:pointer;" onclick="toggleNumEditDiv('numeditdiv');" title="Edit Exsiccata Number">
<img style="border:0px;" src="../../images/edit.png"/>
</span>
<span style="cursor:pointer;" onclick="toggleOccAddDiv('occadddiv');" title="Add Occurrence to Exsiccati Number">
<span style="cursor:pointer;" onclick="toggleOccAddDiv('occadddiv');" title="Add Occurrence to Exsiccata Number">
<img style="border:0px;" src="../../images/add.png" />
</span>
</div>
Expand All @@ -580,7 +580,7 @@ function buildExsSelect(selectObj){
<div id="numeditdiv" style="display:none;">
<form name="numeditform" action="index.php" method="post" onsubmit="return verifyNumEditForm(this)">
<fieldset style="margin:10px;padding:15px;background-color:#B0C4DE;">
<legend><b>Edit Exsiccati Number</b></legend>
<legend><b>Edit Exsiccata Number</b></legend>
<div style="margin:2px;">
Number: <input name="exsnumber" type="text" value="<?php echo $mdArr['exsnumber']; ?>" style="width:500px;" />
</div>
Expand All @@ -593,9 +593,9 @@ function buildExsSelect(selectObj){
</div>
</fieldset>
</form>
<form name="numdelform" action="index.php" method="post" onsubmit="return confirm('Are you sure you want to delete this exsiccati number?')">
<form name="numdelform" action="index.php" method="post" onsubmit="return confirm('Are you sure you want to delete this exsiccata number?')">
<fieldset style="margin:10px;padding:15px;background-color:#B0C4DE;">
<legend><b>Delete Exsiccati Number</b></legend>
<legend><b>Delete exsiccata Number</b></legend>
<div style="margin:10px;">
<input name="omenid" type="hidden" value="<?php echo $omenId; ?>" />
<input name="ometid" type="hidden" value="<?php echo $mdArr['ometid']; ?>" />
Expand All @@ -605,11 +605,11 @@ function buildExsSelect(selectObj){
</form>
<form name="numtransferform" action="index.php" method="post" onsubmit="return verifyNumTransferForm(this);">
<fieldset style="margin:10px;padding:15px;background-color:#B0C4DE;">
<legend><b>Transfer Exsiccati Number</b></legend>
<legend><b>Transfer Exsiccata Number</b></legend>
<div style="margin:10px;">
Target Exsiccati<br/>
Target Exsiccata<br/>
<select name="targetometid" style="width:650px;" onfocus="buildExsSelect(this)">
<option value="">Select the Target Exsiccati</option>
<option value="">Select the Target Exsiccata</option>
<option value="">-------------------------------</option>
</select>
</div>
Expand All @@ -624,7 +624,7 @@ function buildExsSelect(selectObj){
<div id="occadddiv" style="display:<?php echo ($occidToAdd?'block':'none') ?>;">
<form name="occaddform" action="index.php" method="post" onsubmit="return verifyOccAddForm(this)">
<fieldset style="margin:10px;padding:15px;background-color:#B0C4DE;">
<legend><b>Add Occurrence Record to Exsiccati Number</b></legend>
<legend><b>Add Occurrence Record to Exsiccata Number</b></legend>
<div style="margin:2px;">
Collection: <br/>
<select name="occaddcollid">
Expand Down Expand Up @@ -783,14 +783,14 @@ function buildExsSelect(selectObj){
<fieldset style="margin:10px;padding:15px;background-color:#B0C4DE;">
<legend><b>Transfer Specimen Link</b></legend>
<div style="margin:10px;">
Target Exsiccati Title<br/>
Target Exsiccata Title<br/>
<select name="targetometid" style="width:650px;" onfocus="buildExsSelect(this)">
<option value="">Select the Target Exsiccati</option>
<option value="">Select the Target Exsiccata</option>
<option value="">-------------------------------</option>
</select>
</div>
<div style="margin:10px;">
Target Exsiccati Number<br/>
Target Exsiccata Number<br/>
<input name="targetexsnumber" type="text" value="" />
</div>
<div style="margin:10px;">
Expand All @@ -813,7 +813,7 @@ function buildExsSelect(selectObj){
<?php
}
else{
echo '<li>There are no specimens linked to this exsiccati number</li>';
echo '<li>There are no specimens linked to this exsiccata number</li>';
}
?>
</div>
Expand Down

0 comments on commit 8f8b7b3

Please sign in to comment.