From 759ece053ba09e3b7a91bae35c657752e18c3aa8 Mon Sep 17 00:00:00 2001 From: Nikita Salikov Date: Wed, 8 May 2024 12:40:08 -0700 Subject: [PATCH 01/32] added space between green lines and option box --- checklists/checklist.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checklists/checklist.php b/checklists/checklist.php index 6227c29bad..9d16efecb9 100644 --- a/checklists/checklist.php +++ b/checklists/checklist.php @@ -584,7 +584,7 @@ function changeImageSource(elem){ ?> -
+
getImageLimit():$clManager->getTaxaLimit()); @@ -610,7 +610,7 @@ function changeImageSource(elem){ } ?>
-
+
Date: Wed, 8 May 2024 13:28:19 -0700 Subject: [PATCH 02/32] Fixing lang tag typo (#1246) --- collections/editor/occurrenceeditor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collections/editor/occurrenceeditor.php b/collections/editor/occurrenceeditor.php index e2ccf4efc0..7b7f357f2d 100644 --- a/collections/editor/occurrenceeditor.php +++ b/collections/editor/occurrenceeditor.php @@ -957,7 +957,7 @@ function requestImage(){
- : + :
From 599039bb2eb95a4c008e300fe6439d2c728df31c Mon Sep 17 00:00:00 2001 From: Edward Gilbert Date: Thu, 9 May 2024 07:57:13 -0400 Subject: [PATCH 03/32] Activate create user variable warning - Avoid warning when $SHOULD_BE_ABLE_TO_CREATE_PUBLIC_USER variable has not been set within symbini.php config file - Create new user should be active by default Addresses GitHub issue: https://github.com/BioKIC/Symbiota/issues/1252 --- profile/newprofile.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/profile/newprofile.php b/profile/newprofile.php index 28042b4c99..a5e6fa47e6 100644 --- a/profile/newprofile.php +++ b/profile/newprofile.php @@ -149,9 +149,13 @@ function validateform(f){ echo ''.(isset($LANG['CREATE_NEW'])?$LANG['CREATE_NEW']:'Create New Profile').''; echo "
"; } - $shouldBeAbleToCreatePublicUser = ($SHOULD_BE_ABLE_TO_CREATE_PUBLIC_USER || $adminRegister) ?? true; + $shouldBeAbleToCreatePublicUser = true; + if(isset($SHOULD_BE_ABLE_TO_CREATE_PUBLIC_USER) && !$SHOULD_BE_ABLE_TO_CREATE_PUBLIC_USER){ + $shouldBeAbleToCreatePublicUser = false; + if($adminRegister) $shouldBeAbleToCreatePublicUser = true; + } if($shouldBeAbleToCreatePublicUser){ - ?> + ?>
'.(isset($LANG['CREATE_NEW']) ? $LANG['CREATE_NEW'] : 'Create New Profile') . ''; @@ -276,13 +280,13 @@ function validateform(f){
- + ?>

- From 997de89a1acd0a6d9815840f45c2b1625f910608 Mon Sep 17 00:00:00 2001 From: Edward Gilbert Date: Thu, 9 May 2024 10:11:41 -0400 Subject: [PATCH 04/32] Hotfix 2024 04 29 (#1254) - DWC-A publushing -- Close and destroy file handlers and class instances, thus ensuring full output of buffers. Integrates [Dev bug fix #1223](https://github.com/BioKIC/Symbiota/pull/1233) into master. - Occurrence Search: -- URL encode search variables to ensure "copy link" function and map links work when spaces or special characters are included within terms. Addresses issue: https://github.com/BioKIC/Symbiota/issues/1212 - Occurrence Editor: -- Ensure that image tids are updated to make occurrence identifications. Integrates [Dev bug fix #1239](https://github.com/BioKIC/Symbiota/pull/1239) into master. --- checklists/checklist.php | 1 + classes/DwcArchiverBaseManager.php | 1 + classes/DwcArchiverCore.php | 10 ++++++++-- classes/OccurrenceEditorDeterminations.php | 11 +++++++++++ collections/list.php | 2 +- config/symbbase.php | 2 +- js/symb/collections.list.js | 16 ++++++++++++++-- taxa/taxonomy/taxoneditor.php | 2 +- 8 files changed, 38 insertions(+), 7 deletions(-) diff --git a/checklists/checklist.php b/checklists/checklist.php index 984ae21268..1ebc9fdf8e 100644 --- a/checklists/checklist.php +++ b/checklists/checklist.php @@ -132,6 +132,7 @@ function changeImageSource(elem){ } ?> #editsppon { display: none; color:green; font-size: 70%; font-weight:bold; padding-bottom: 5px; position: relative; top: -4px; } + .moredetails{ clear: both } diff --git a/classes/DwcArchiverBaseManager.php b/classes/DwcArchiverBaseManager.php index 0f32d4ed2e..849030edac 100644 --- a/classes/DwcArchiverBaseManager.php +++ b/classes/DwcArchiverBaseManager.php @@ -42,6 +42,7 @@ public function writeOutRecordBlock($occidArr){ $this->writeOutRecord($r); } $rs->free(); + fclose($this->fileHandler); } else{ $this->logOrEcho('ERROR writing out to extension file: '.$this->conn->error."\n"); diff --git a/classes/DwcArchiverCore.php b/classes/DwcArchiverCore.php index cb27e1a219..8fda99a43c 100644 --- a/classes/DwcArchiverCore.php +++ b/classes/DwcArchiverCore.php @@ -1785,11 +1785,17 @@ private function writeOccurrenceFile(){ } if ($this->includeAttributes){ $this->writeAttributeData($batchOccidArr); - if($this->attributeHandler !== null) $this->attributeHandler->__destruct(); + if($this->attributeHandler !== null){ + $this->attributeHandler->__destruct(); + $this->attributeHandler = null; + } } if ($this->includeMaterialSample){ $this->writeMaterialSampleData($batchOccidArr); - if($this->materialSampleHandler !== null) $this->materialSampleHandler->__destruct(); + if($this->materialSampleHandler !== null){ + $this->materialSampleHandler->__destruct(); + $this->materialSampleHandler = null; + } } } else { diff --git a/classes/OccurrenceEditorDeterminations.php b/classes/OccurrenceEditorDeterminations.php index 139f70331c..8f648b42b5 100644 --- a/classes/OccurrenceEditorDeterminations.php +++ b/classes/OccurrenceEditorDeterminations.php @@ -259,6 +259,17 @@ private function updateBaseOccurrence($detId){ if(isset($taxonArr['security']) && $taxonArr['security']) $sql .= ', o.localitysecurity = '.$taxonArr['security'].', o.localitysecurityreason = ""'; $sql .= ' WHERE (d.iscurrent = 1) AND (d.detid = '.$detId.')'; $this->conn->query($sql); + $updated_base = $this->conn->query($sql); + + //Whenever occurrence is updated also update associated images + if($updated_base && isset($taxonArr['tid']) && $taxonArr['tid']) { + $sql = <<<'SQL' + UPDATE images i + INNER JOIN omoccurdeterminations od on od.occid = i.occid + SET tid = ? WHERE detid = ?; + SQL; + $this->conn->execute_query($sql, [$taxonArr['tid'], $detId]); + } } } diff --git a/collections/list.php b/collections/list.php index ff10e307db..d78c16bff1 100644 --- a/collections/list.php +++ b/collections/list.php @@ -89,7 +89,7 @@ function displayDatasetTools() { }); } - + - -

Taxon Map

-
+ +

Taxon Map

+
@@ -284,7 +282,7 @@ function loadShape(mapMode) { } } let formShape = loadShape(""); - //let mapModeStrict = ; + let mapModeStrict = ; function leafletInit() { const MapOptions = { center: [, ], From f56e6be5d7acdc3543d6014a74cef24a71b3b742 Mon Sep 17 00:00:00 2001 From: Mark Date: Mon, 13 May 2024 17:09:23 -0700 Subject: [PATCH 17/32] invoke jquery-ui in the head instead of the body (#1273) --- collections/search/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collections/search/index.php b/collections/search/index.php index 6c619d045f..1615fd6cfa 100644 --- a/collections/search/index.php +++ b/collections/search/index.php @@ -38,6 +38,7 @@ + - + + @@ -1748,7 +1750,8 @@ function initialize() { data-records="" data-external-portal-hosts="" class="service-container" - /> + > +
From 4b6c775f8d740d8a42aa193bef09bcce0e0990c0 Mon Sep 17 00:00:00 2001 From: Logan Wilt <91149982+MuchQuak@users.noreply.github.com> Date: Tue, 14 May 2024 11:32:50 -0700 Subject: [PATCH 22/32] adusting html to allow for mutliple grid columns in locality accordion (#1279) --- collections/search/index.php | 66 ++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/collections/search/index.php b/collections/search/index.php index 1615fd6cfa..3467fcc418 100644 --- a/collections/search/index.php +++ b/collections/search/index.php @@ -144,39 +144,39 @@
-
-
- - -
-
- - -
-
- - -
-
- - -
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ +
From e2bb3e67301f927f32abf9dbcaca1fde830308f5 Mon Sep 17 00:00:00 2001 From: Logan Wilt <91149982+MuchQuak@users.noreply.github.com> Date: Tue, 14 May 2024 11:33:16 -0700 Subject: [PATCH 23/32] Bugfix/3.1/collection map point aid fix (#1278) * adjust styling to fix map rendering * fixing html formatting and submit button spacing --- collections/tools/mappointaid.php | 53 ++++++++++++++++--------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/collections/tools/mappointaid.php b/collections/tools/mappointaid.php index 72fe40edb9..c14b151562 100644 --- a/collections/tools/mappointaid.php +++ b/collections/tools/mappointaid.php @@ -359,13 +359,15 @@ function updateParentForm(f) { } - +

Point-Radius Aid

-
-
-
-
-
-
- - -
-
- : - - : - - - - : - - - -
-
-
+
+
+
+
+
+ + +
+
+ : + + : + + + + : + + + +
+
+
From 7c749e68eab65bb852362793dec2c6a3e1551206 Mon Sep 17 00:00:00 2001 From: Logan Wilt <91149982+MuchQuak@users.noreply.github.com> Date: Tue, 14 May 2024 11:34:00 -0700 Subject: [PATCH 24/32] Bugfix/3.1/delete button styles (#1269) * adds option styling of delete buttons with button danger class if --danger-color variable exists * add button-danger to user profile * adds btn danger to index and voucher admin * checklist danger button * clspedtior danger btn * voucher tab uses normal button stytles * danger button for dataset tools * danger button for collection editor * danger button for occurrence profile * danger button for loans * image recycler danger button * collections misc danger button * specprocessor danger button * collections admin igsn danger button * loan lang tag fixes * projects lang tag fixes * added disabled styling to primary, secondary, and danger buttons * geothesuarus danger button and editor map display bug fix * danger button glossory * danger button image lib * danger button for project editing pages * taxonomy editor danger buttons * fixing duplicate button and input onf form * move button styles into base.css * added reset btn styles --- checklists/checklistadmin.php | 4 +- checklists/checklistadminmeta.php | 2 +- checklists/clsppeditor.php | 4 +- checklists/imgvouchertab.php | 6 +- checklists/voucheradmin.php | 10 +- collections/admin/igsnmanagement.php | 2 +- collections/cleaning/imagerecycler.php | 4 +- collections/datasets/datapublisher.php | 2 +- collections/datasets/datasetmanager.php | 4 +- collections/datasets/duplicatemanager.php | 4 +- collections/editor/includes/admintab.php | 4 +- .../editor/includes/determinationtab.php | 4 +- collections/editor/includes/imagetab.php | 2 +- collections/editor/includes/resourcetab.php | 6 +- collections/editor/includes/traittab.php | 4 +- collections/individual/index.php | 2 +- collections/loans/exchange.php | 6 +- collections/loans/incoming.php | 4 +- collections/loans/outgoing.php | 4 +- collections/map/index.php | 2 +- collections/misc/commentlist.php | 2 +- collections/misc/institutioneditor.php | 4 +- collections/search/css/searchStyles.css | 6 + .../specprocessor/crowdsource/review.php | 4 +- collections/specprocessor/imageprocessor.php | 2 +- .../lang/collections/loans/loan_langs.en.php | 4 +- .../lang/collections/loans/loan_langs.es.php | 2 +- .../lang/collections/loans/loan_langs.fr.php | 4 +- content/lang/projects/index.en.php | 13 ++ content/lang/projects/index.es.php | 17 ++- content/lang/projects/index.fr.php | 15 +- css/base.css | 139 +++++++++++++----- css/v202209/symbiota/base.css | 135 ++++++++++++----- css/v202209/symbiota/main.css | 16 +- css/v202209/symbiota/variables.css | 1 + geothesaurus/index.php | 11 +- glossary/sources.php | 4 +- glossary/termdetails.php | 8 +- imagelib/imgdetails.php | 2 +- profile/userprofile.php | 4 +- projects/checklisttab.php | 15 +- projects/index.php | 19 ++- projects/managertab.php | 13 +- taxa/profile/tpdesceditor.php | 2 +- taxa/profile/tpeditor.php | 2 +- taxa/taxonomy/taxonomydelete.php | 2 +- 46 files changed, 368 insertions(+), 158 deletions(-) diff --git a/checklists/checklistadmin.php b/checklists/checklistadmin.php index 0b2eedba30..3b584804f9 100644 --- a/checklists/checklistadmin.php +++ b/checklists/checklistadmin.php @@ -326,7 +326,7 @@ function validateAddProjectForm(f){
- +
@@ -392,4 +392,4 @@ function validateAddProjectForm(f){ include($SERVER_ROOT.'/includes/footer.php'); ?> - \ No newline at end of file + diff --git a/checklists/checklistadminmeta.php b/checklists/checklistadminmeta.php index bdefc0fc81..6685fd39df 100644 --- a/checklists/checklistadminmeta.php +++ b/checklists/checklistadminmeta.php @@ -318,7 +318,7 @@ function enableDisableExtServiceFields() { /> diff --git a/checklists/clsppeditor.php b/checklists/clsppeditor.php index af9fbace9e..959ea36a8f 100644 --- a/checklists/clsppeditor.php +++ b/checklists/clsppeditor.php @@ -274,7 +274,7 @@ function removeTaxon(){ - +
@@ -363,4 +363,4 @@ function removeTaxon(){ ?>
- \ No newline at end of file + diff --git a/checklists/imgvouchertab.php b/checklists/imgvouchertab.php index 77b71c1256..8d3dbf457d 100644 --- a/checklists/imgvouchertab.php +++ b/checklists/imgvouchertab.php @@ -31,8 +31,10 @@
- />
+
-
\ No newline at end of file +
diff --git a/checklists/voucheradmin.php b/checklists/voucheradmin.php index e2be3b47c2..dbacbaa543 100644 --- a/checklists/voucheradmin.php +++ b/checklists/voucheradmin.php @@ -233,7 +233,9 @@
- + @@ -250,8 +252,10 @@
- - + +
diff --git a/collections/admin/igsnmanagement.php b/collections/admin/igsnmanagement.php index dae4024544..f4ed3a535b 100644 --- a/collections/admin/igsnmanagement.php +++ b/collections/admin/igsnmanagement.php @@ -172,7 +172,7 @@ function verifyProfileForm(f){ - + diff --git a/collections/cleaning/imagerecycler.php b/collections/cleaning/imagerecycler.php index 5f24bcd252..c131fc46df 100644 --- a/collections/cleaning/imagerecycler.php +++ b/collections/cleaning/imagerecycler.php @@ -75,7 +75,7 @@ function verifyRecycleForm(f){
- +
@@ -88,4 +88,4 @@ function verifyRecycleForm(f){ include($SERVER_ROOT.'/includes/footer.php'); ?> - \ No newline at end of file + diff --git a/collections/datasets/datapublisher.php b/collections/datasets/datapublisher.php index 956bf7324c..912300e6d8 100644 --- a/collections/datasets/datapublisher.php +++ b/collections/datasets/datapublisher.php @@ -599,4 +599,4 @@ function checkAllColl(cb) { include($SERVER_ROOT . '/includes/footer.php'); ?> - \ No newline at end of file + diff --git a/collections/datasets/datasetmanager.php b/collections/datasets/datasetmanager.php index 4030d3740c..5e738e7197 100644 --- a/collections/datasets/datasetmanager.php +++ b/collections/datasets/datasetmanager.php @@ -420,7 +420,7 @@ function targetDownloadPopup(f) {
- +
@@ -505,4 +505,4 @@ function targetDownloadPopup(f) { include($SERVER_ROOT.'/includes/footer.php'); ?> - \ No newline at end of file + diff --git a/collections/datasets/duplicatemanager.php b/collections/datasets/duplicatemanager.php index dde63d5eeb..a48c68bee5 100644 --- a/collections/datasets/duplicatemanager.php +++ b/collections/datasets/duplicatemanager.php @@ -245,7 +245,7 @@ function toggle(target){ - +
@@ -312,4 +312,4 @@ function toggle(target){ include($SERVER_ROOT.'/includes/footer.php'); ?> - \ No newline at end of file + diff --git a/collections/editor/includes/admintab.php b/collections/editor/includes/admintab.php index d52d74512c..0a37aaf363 100644 --- a/collections/editor/includes/admintab.php +++ b/collections/editor/includes/admintab.php @@ -133,7 +133,7 @@
- +
: @@ -164,7 +164,7 @@
diff --git a/collections/editor/includes/determinationtab.php b/collections/editor/includes/determinationtab.php index f7a7007d1d..48477990e1 100644 --- a/collections/editor/includes/determinationtab.php +++ b/collections/editor/includes/determinationtab.php @@ -357,7 +357,7 @@ - +
@@ -371,4 +371,4 @@ ?>
- \ No newline at end of file + diff --git a/collections/editor/includes/imagetab.php b/collections/editor/includes/imagetab.php index 06226397e8..f933b770a0 100644 --- a/collections/editor/includes/imagetab.php +++ b/collections/editor/includes/imagetab.php @@ -405,7 +405,7 @@ function verifyImgRemapForm(f){
- +
diff --git a/collections/editor/includes/resourcetab.php b/collections/editor/includes/resourcetab.php index 76beee3301..522253add4 100644 --- a/collections/editor/includes/resourcetab.php +++ b/collections/editor/includes/resourcetab.php @@ -575,7 +575,7 @@ function submitAddGeneticResource(f){ echo '
'; echo '
'.$LANG['CLUSTER_TITLE'].': '.$dupArr['title']; echo '
'; - echo ''; + echo ''; echo '
'; $note = trim($dupArr['description'].'; '.$dupArr['notes'],' ;'); if($note) echo ' - '.$notes; @@ -732,7 +732,7 @@ function submitAddGeneticResource(f){
- + @@ -746,4 +746,4 @@ function submitAddGeneticResource(f){ ?>
-
\ No newline at end of file +
diff --git a/collections/editor/includes/traittab.php b/collections/editor/includes/traittab.php index 7535234277..2dc1b4ee0f 100644 --- a/collections/editor/includes/traittab.php +++ b/collections/editor/includes/traittab.php @@ -174,7 +174,7 @@ function submitEditForm(butElem){
- +
@@ -184,4 +184,4 @@ function submitEditForm(butElem){ } } ?> - \ No newline at end of file + diff --git a/collections/individual/index.php b/collections/individual/index.php index 8db4c1acdb..44612e9b90 100644 --- a/collections/individual/index.php +++ b/collections/individual/index.php @@ -1268,7 +1268,7 @@ function initializeMap(){ - +
- + - +
@@ -396,4 +396,4 @@ include($SERVER_ROOT.'/includes/footer.php'); ?> - \ No newline at end of file + diff --git a/collections/loans/incoming.php b/collections/loans/incoming.php index 328aec8ee4..16e8ab77e0 100644 --- a/collections/loans/incoming.php +++ b/collections/loans/incoming.php @@ -399,7 +399,7 @@ function verifyLoanInEditForm(f){ - + @@ -418,4 +418,4 @@ function verifyLoanInEditForm(f){ include($SERVER_ROOT . '/includes/footer.php'); ?> - \ No newline at end of file + diff --git a/collections/loans/outgoing.php b/collections/loans/outgoing.php index edab6258bd..aae610df26 100644 --- a/collections/loans/outgoing.php +++ b/collections/loans/outgoing.php @@ -407,7 +407,7 @@ function verifyLoanOutEditForm(){ - + @@ -426,4 +426,4 @@ function verifyLoanOutEditForm(){ include($SERVER_ROOT . '/includes/footer.php'); ?> - \ No newline at end of file + diff --git a/collections/map/index.php b/collections/map/index.php index 387d87b8d5..dd20acada0 100644 --- a/collections/map/index.php +++ b/collections/map/index.php @@ -1929,7 +1929,7 @@ class="service-container"
- +
diff --git a/collections/misc/commentlist.php b/collections/misc/commentlist.php index 0ee807067e..09f499e0f2 100644 --- a/collections/misc/commentlist.php +++ b/collections/misc/commentlist.php @@ -264,7 +264,7 @@ } ?> - + diff --git a/collections/misc/institutioneditor.php b/collections/misc/institutioneditor.php index 6a64054ad0..4248e82bfa 100644 --- a/collections/misc/institutioneditor.php +++ b/collections/misc/institutioneditor.php @@ -441,7 +441,7 @@ function validateAddCollectionForm(f){
- + ' . $LANG['DELETION_OF_ADDRESS'] . '
'; @@ -643,4 +643,4 @@ function validateAddCollectionForm(f){ include($SERVER_ROOT.'/includes/footer.php'); ?> - \ No newline at end of file + diff --git a/collections/search/css/searchStyles.css b/collections/search/css/searchStyles.css index 1bb56da870..66e8bbf986 100644 --- a/collections/search/css/searchStyles.css +++ b/collections/search/css/searchStyles.css @@ -814,6 +814,12 @@ box-shadow: 0px 2px 4px -1px rgb(0 0 0 / 20%), 0px 4px 5px 0px rgb(0 0 0 / 14%), 0px 1px 10px 0px rgb(0 0 0 / 12%); } +.inner-search button#reset-btn { + background-color: var(--medium-color) !important; + &:hover { + background-color: var(--bright-color) !important; + } +} .inner-search input[type="text"], .inner-search input[type="number"], diff --git a/collections/specprocessor/crowdsource/review.php b/collections/specprocessor/crowdsource/review.php index 7122eaac74..aa77da1f41 100644 --- a/collections/specprocessor/crowdsource/review.php +++ b/collections/specprocessor/crowdsource/review.php @@ -284,7 +284,7 @@ function showAdditionalActions(){
- \ No newline at end of file + diff --git a/collections/specprocessor/imageprocessor.php b/collections/specprocessor/imageprocessor.php index 4d0e87884a..db569e1977 100644 --- a/collections/specprocessor/imageprocessor.php +++ b/collections/specprocessor/imageprocessor.php @@ -518,7 +518,7 @@ function validateFileUploadForm(f){ - +
diff --git a/content/lang/collections/loans/loan_langs.en.php b/content/lang/collections/loans/loan_langs.en.php index f7d56b38b1..431d3fa8d4 100644 --- a/content/lang/collections/loans/loan_langs.en.php +++ b/content/lang/collections/loans/loan_langs.en.php @@ -50,7 +50,6 @@ PDFs, images, and text files are preferred, since they will display in the browser.'; $LANG['RETURN_LOAN_INDEX'] = 'Return to Loan Index Page'; $LANG['SURE_DELETE_EX'] = 'Are you sure you want to permanently delete this exchange?'; -$LANG['DEL_EXCHANGE'] = 'Delete Exchange'; $LANG['NOT_AUTHORIZED'] = 'You are not authorized to add occurrence records'; $LANG['UNKNOWN_ERROR'] = 'ERROR: unknown error, please contact system administrator'; @@ -61,6 +60,7 @@ $LANG['ADD_NEW_INST'] = 'Add a New Institution'; $LANG['ADD_A_NEW_INST'] = 'Include a New Institution'; $LANG['CREATE_EXCHANGE'] = 'Create Exchange'; +$LANG['DELETE_EXCHANGE'] = 'Delete Exchange'; $LANG['TRANS_BY_INST'] = 'Transaction Records by Institution'; $LANG['OUTGOING_EX_SENT'] = 'Outgoing exchange; Sent '; $LANG['INCLUDING'] = 'including'; @@ -224,4 +224,4 @@ $LANG['SAVE_EDITS'] = 'Save Edits'; -?> \ No newline at end of file +?> diff --git a/content/lang/collections/loans/loan_langs.es.php b/content/lang/collections/loans/loan_langs.es.php index 0d673b5556..4dc2438cc7 100644 --- a/content/lang/collections/loans/loan_langs.es.php +++ b/content/lang/collections/loans/loan_langs.es.php @@ -50,12 +50,12 @@ PDFs, imágenes y archivos de texto son preferidos, ya que serán desplegados en el navegador.'; $LANG['RETURN_LOAN_INDEX'] = 'Regresar a Página de Índice de Préstamos'; $LANG['SURE_DELETE_EX'] = 'Está seguro que quiere borrar permanentemente este intercambio?'; -$LANG['DEL_EXCHANGE'] = 'Borrar Intercambio'; $LANG['NOT_AUTHORIZED'] = 'No está autorizado para añadir registros de ocurrencia'; $LANG['UNKNOWN_ERROR'] = 'ERROR: error desconocido, por favor contacte al administrador del sistema'; // from exchangetab.php $LANG['CREATE_NEW_EXCHANGE'] = 'Crear un Nuevo Intercambio'; +$LANG['DELETE_EXCHANGE'] = 'Borrar Intercambio'; $LANG['NEW_GIFT'] = 'Nuevo Obsequio/Intercambio'; $LANG['SEL_INST'] = 'Seleccionar Institución'; $LANG['ADD_NEW_INST'] = 'Añadir una Nueva Institución'; diff --git a/content/lang/collections/loans/loan_langs.fr.php b/content/lang/collections/loans/loan_langs.fr.php index 26d8056854..4f79adca7b 100644 --- a/content/lang/collections/loans/loan_langs.fr.php +++ b/content/lang/collections/loans/loan_langs.fr.php @@ -53,12 +53,12 @@ Les fichiers PDF, images et texte sont préférés, car ils s\'afficheront dans le navigateur.'; $LANG['RETURN_LOAN_INDEX'] = 'Retourner à la page d\'index des prêts'; $LANG['SURE_DELETE_EX'] = 'Êtes-vous sûr de vouloir supprimer définitivement cet échange ?'; -$LANG['DEL_EXCHANGE'] = 'Supprimer l\'échange'; $LANG['NOT_AUTHORIZED'] = 'Vous n\'êtes pas autorisé à ajouter des enregistrements d\'occurrence'; $LANG['UNKNOWN_ERROR'] = 'ERREUR : erreur inconnue, veuillez contacter l\'administrateur système'; // from exchangetab.php $LANG['CREATE_NEW_EXCHANGE'] = 'Créer un nouvel échange'; +$LANG['DELETE_EXCHANGE'] = 'Supprimer l\'échange'; $LANG['NEW_GIFT'] = 'Nouveau cadeau/échange'; $LANG['SEL_INST'] = 'Sélectionner un établissement'; $LANG['ADD_NEW_INST'] = 'Ajouter un nouvel établissement'; @@ -229,4 +229,4 @@ $LANG['SAVE_EDITS'] = 'Enregistrer les modifications'; -?> \ No newline at end of file +?> diff --git a/content/lang/projects/index.en.php b/content/lang/projects/index.en.php index 611245c35a..28ec75c934 100644 --- a/content/lang/projects/index.en.php +++ b/content/lang/projects/index.en.php @@ -57,4 +57,17 @@ $LANG['ADD_NEW_PRJ'] = 'Add New Project'; $LANG['EDIT_PRJ'] = 'Edit Project'; +//Manager Tab +$LANG['INVENTORY_PROJECT_MANAGERS'] = 'Inventory Project Managers'; +$LANG['ADD_NEW_MANAGER'] = 'Add a New Manager'; +$LANG['ADD_TO_MANAGER_LIST'] = 'Add to Manager List'; +$LANG['SELECT_USER'] = 'Select a User'; + +//Checklist Tab +$LANG['ADD_A_CHECKLIST'] = 'Add a Checklist'; +$LANG['SELECT_CHECKLIST_TO_ADD'] = 'Select Checklist to Add'; +$LANG['ADD_CHECKLIST'] = 'Add Checklist'; +$LANG['DELETE_A_CHECKLIST'] = 'Delete a Checklist'; +$LANG['SELECT_CHECKLIST_TO_DELETE'] = 'Select Checklist to Delete'; +$LANG['DELETE_CHECKLIST'] = 'Delete Checklist'; ?> diff --git a/content/lang/projects/index.es.php b/content/lang/projects/index.es.php index 70171f2988..535b5c1f1e 100644 --- a/content/lang/projects/index.es.php +++ b/content/lang/projects/index.es.php @@ -10,7 +10,7 @@ $LANG['PROJMANAG'] = 'Administradores de Proyectos:'; $LANG['METADATA'] = 'Metadatos'; $LANG['INVMANAG'] = 'Administradores de Inventarios'; -$LANG['CHECKMANAG'] = 'Administración de Listados de Comprobación'; +$LANG['CHECKMANAG'] = 'Administración de Listados de Comprobación'; $LANG['MANAG'] = 'Administradores'; $LANG['DESCRIP'] = 'Descripción'; $LANG['NOTES'] = 'Notas'; @@ -49,8 +49,21 @@ $LANG['TRIANGLE_ALT'] = 'una imagen de un triángulo. Solo se usa para hacer que la ventana emergente parezca más una burbuja de diálogo'; $LANG['EDIT'] = 'Editar'; $LANG['KEY'] = 'Clave'; -$LANG['GOLDEN_KEY_SYMBOL'] = 'Símbolo de la llave dorada'; +$LANG['KEY_SYMBOL'] = 'Símbolo clave'; $LANG['ADD_NEW'] = 'Agregar nuevo proyecto'; $LANG['EDIT'] = 'Editar proyecto'; +//Manager Tab +$LANG['INVENTORY_PROJECT_MANAGERS'] = 'Gestores de proyectos de inventario'; +$LANG['ADD_NEW_MANAGER'] = 'Agregar un nuevo gerente'; +$LANG['ADD_TO_MANAGER_LIST'] = 'Agregar a la lista de administradores'; +$LANG['SELECT_USER'] = 'Seleccione un usuario'; + +//Checklist Tab +$LANG['ADD_A_CHECKLIST'] = 'Agregar una lista de verificación'; +$LANG['SELECT_CHECKLIST_TO_ADD'] = 'Seleccione la lista de verificación para agregar'; +$LANG['ADD_CHECKLIST'] = 'Agregar lista de verificación'; +$LANG['DELETE_A_CHECKLIST'] = 'Eliminar una lista de verificación'; +$LANG['SELECT_CHECKLIST_TO_DELETE'] = 'Seleccione la lista de verificación para eliminar'; +$LANG['DELETE_CHECKLIST'] = 'Eliminar lista de verificación'; ?> diff --git a/content/lang/projects/index.fr.php b/content/lang/projects/index.fr.php index f3547f4e9f..41d4d3940d 100644 --- a/content/lang/projects/index.fr.php +++ b/content/lang/projects/index.fr.php @@ -53,8 +53,21 @@ $LANG['TRIANGLE_ALT'] = 'une image d\'un triangle. Juste utilisé pour que la fenêtre contextuelle ressemble davantage à une bulle de dialogue'; $LANG['EDIT'] = 'Modifier'; $LANG['KEY'] = 'Clé'; -$LANG['GOLDEN_KEY_SYMBOL'] = 'Symbole de la clé d\'or'; +$LANG['KEY_SYMBOL'] = 'Symbole de clé'; $LANG['ADD_NEW'] = 'Ajouter un nouveau projet'; $LANG['EDIT'] = 'Modifier le projet'; +//Manager Tab +$LANG['INVENTORY_PROJECT_MANAGERS'] = 'Chefs de projets d\'inventaire'; +$LANG['ADD_NEW_MANAGER'] = 'Ajouter un nouveau gestionnaire'; +$LANG['ADD_TO_MANAGER_LIST'] = 'Ajouter à la liste des gestionnaires'; +$LANG['SELECT_USER'] = 'Sélectionnez un utilisateur'; + +//Checklist Tab +$LANG['ADD_A_CHECKLIST'] = 'Ajouter une liste de contrôle'; +$LANG['SELECT_CHECKLIST_TO_ADD'] = 'Sélectionnez la liste de contrôle à ajouter'; +$LANG['ADD_CHECKLIST'] = 'Ajouter une liste de contrôle'; +$LANG['DELETE_A_CHECKLIST'] = 'Supprimer une liste de contrôle'; +$LANG['SELECT_CHECKLIST_TO_DELETE'] = 'Supprimer la liste de contrôle'; +$LANG['DELETE_CHECKLIST'] = 'Supprimer la liste de contrôle'; ?> diff --git a/css/base.css b/css/base.css index 7def06bdc2..f3e51fdc6d 100644 --- a/css/base.css +++ b/css/base.css @@ -86,27 +86,6 @@ span[class="link"]:hover { color: #c0c0c0; } -button { - font-family: Verdana, Arial, sans-serif; - font-size: 1em; - margin: 2px; - padding: 3px 8px; - cursor: pointer; - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; - border-top-right-radius: 4px; - border-top-left-radius: 4px; -} - -button:hover { - background: #e4f2fb; -} - -button.icon-button { - margin: 5px; - padding: 5px; -} - /* /collections/ folder pages */ .collectiontable { @@ -159,21 +138,6 @@ button.icon-button { border: medium double #990000; } -/*Download buttons on the search display pages*/ -div.button { - background-color: #ffffd7; - padding: 3px; - border: 1px outset #a0a0a0; -} - -div.button img { - border: 0px; -} - -div.button:hover { - border: 1px inset #a0a0a0; -} - /* Species list component */ #taxalist-div { @@ -412,3 +376,106 @@ ol.mp_list li.mp_highlighted { .page-heading { font-size: 3rem; } + +/* Base Button CSS +========================================================================== */ + +button { + font-family: Verdana, Arial, sans-serif; + font-size: 1em; + margin: 2px; + padding: 3px 8px; + cursor: pointer; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; + border-top-right-radius: 4px; + border-top-left-radius: 4px; +} + +button:hover { + background: #e4f2fb; +} + +button.icon-button { + margin: 5px; + padding: 5px; +} + +/*Download buttons on the search display pages*/ +div.button { + background-color: #ffffd7; + padding: 3px; + border: 1px outset #a0a0a0; +} + +div.button img { + border: 0px; +} + +div.button:hover { + border: 1px inset #a0a0a0; +} + +.button { + border: none; + border-radius: 5px; + padding: 0.6rem 1rem; + font-family: var(--heading-font-family); + letter-spacing: 1px; + text-align: center; + cursor: pointer; + transition: all 0.2s ease-in-out; + width: fit-content; +} + +.button > a { + text-decoration: none; + font-weight: 600; + transition: all 0.2s ease-in-out; +} + +.button-primary { + background-color: var(--darkest-color); +} + +.button-danger { + background-color: var(--danger-color, var(--darkest-color)); +} + +.button-primary:hover, +.button-secondary:hover, +.button-danger:hover +{ + background-color: var(--medium-color); +} + +.button-primary:disabled, +.button-secondary:disabled, +.button-danger:disabled +{ + opacity: 50%; + pointer-events: none; +} + +.button-primary:hover > a, +.button-secondary:hover > a { + color: var(--light-color); +} + +.button-primary > a { + color: var(--light-color); +} + +.button-secondary { + background-color: var(--bright-color); +} + +.button-secondary > a { + color: var(--darkest-color); +} + +.button-tertiary { + background-color: none; + border: 1px solid var(--bright-color); + padding: 0.5rem 0.9rem; +} diff --git a/css/v202209/symbiota/base.css b/css/v202209/symbiota/base.css index a0eab87000..bbcfa7fc67 100644 --- a/css/v202209/symbiota/base.css +++ b/css/v202209/symbiota/base.css @@ -67,18 +67,6 @@ span[class="link"]:hover { margin-left: 3px; } -button.icon-button { - margin: 2px 5px; - padding: 6px; - border-width: 1px; - border-style: outset; - border-color: buttonborder; -} - -button.icon-button:hover { - background: var(--medium-color); -} - /* Species list component */ #taxalist-div { line-height: 1em; @@ -309,7 +297,6 @@ ol.mp_list li.mp_highlighted { top: 1rem; float: right; } - .fieldset-like { /* borrowed from: https://www.geeksforgeeks.org/how-to-achieve-fieldset-like-effect-without-using-fieldset-tag/ */ border: 0.2em solid; @@ -453,6 +440,44 @@ fieldset { border-image: initial; } +i { + font-style: italic; +} + +b { + font-weight: bold; +} + +.gridlike-form { + margin: 15px; + display: flex; + flex-direction: column; +} + +.gridlike-form-row { + flex: 1; + display: flex; + align-items: center; + gap: 10px; +} + +.screen-reader-only { + position: absolute; + left: -10000px; +} + +.welcome-text { + display: flex; + align-items: center; + margin-left: 1rem; +} + +.page-heading { + font-size: 3rem; +} + +/* Base Button Button CSS +========================================================================== */ button { appearance: auto; text-rendering: auto; @@ -476,38 +501,78 @@ button { border-image: initial; } -i { - font-style: italic; +button.icon-button { + margin: 2px 5px; + padding: 6px; + border-width: 1px; + border-style: outset; + border-color: buttonborder; } -b { - font-weight: bold; +button.icon-button:hover { + background: var(--medium-color); } -.gridlike-form { - margin: 15px; - display: flex; - flex-direction: column; +.button { + border: none; + border-radius: 5px; + padding: 0.6rem 1rem; + font-family: var(--heading-font-family); + letter-spacing: 1px; + text-align: center; + cursor: pointer; + transition: all 0.2s ease-in-out; + width: fit-content; } -.gridlike-form-row { - flex: 1; - display: flex; - align-items: center; - gap: 10px; +.button > a { + text-decoration: none; + font-weight: 600; + transition: all 0.2s ease-in-out; } -.screen-reader-only { - position: absolute; - left: -10000px; +.button-primary { + background-color: var(--darkest-color); } -.welcome-text { - display: flex; - align-items: center; - margin-left: 1rem; +.button-danger { + background-color: var(--danger-color, var(--darkest-color)); } -.page-heading { - font-size: 3rem; +.button-primary:hover, +.button-secondary:hover, +.button-danger:hover +{ + background-color: var(--medium-color); +} + +.button-primary:disabled, +.button-secondary:disabled, +.button-danger:disabled +{ + opacity: 50%; + pointer-events: none; +} + +.button-primary:hover > a, +.button-secondary:hover > a { + color: var(--light-color); +} + +.button-primary > a { + color: var(--light-color); +} + +.button-secondary { + background-color: var(--bright-color); +} + +.button-secondary > a { + color: var(--darkest-color); +} + +.button-tertiary { + background-color: none; + border: 1px solid var(--bright-color); + padding: 0.5rem 0.9rem; } diff --git a/css/v202209/symbiota/main.css b/css/v202209/symbiota/main.css index 85c8a37114..8d493adf71 100644 --- a/css/v202209/symbiota/main.css +++ b/css/v202209/symbiota/main.css @@ -233,11 +233,25 @@ hr { background-color: var(--darkest-color); } +.button-danger { + background-color: var(--danger-color, var(--darkest-color)); +} + .button-primary:hover, -.button-secondary:hover { +.button-secondary:hover, +.button-danger:hover +{ background-color: var(--medium-color); } +.button-primary:disabled, +.button-secondary:disabled, +.button-danger:disabled +{ + opacity: 50%; + pointer-events: none; +} + .button-primary:hover > a, .button-secondary:hover > a { color: var(--light-color); diff --git a/css/v202209/symbiota/variables.css b/css/v202209/symbiota/variables.css index d2d1430e4f..a9098f3dfb 100644 --- a/css/v202209/symbiota/variables.css +++ b/css/v202209/symbiota/variables.css @@ -28,5 +28,6 @@ --medium-color: #5a5a53; --light-color: #f2f0e9; --bright-color: #b9d432; + --danger-color: #b31b1b; --max-innertext-width: 1024px; } diff --git a/geothesaurus/index.php b/geothesaurus/index.php index 4f2895b52e..38dcaaacae 100644 --- a/geothesaurus/index.php +++ b/geothesaurus/index.php @@ -119,6 +119,8 @@ function toggleEditor(){ toggle("#editButton-div", "block"); toggle("#edit-legend"); toggle("#unitDel-div", "block"); + let map = document.getElementById("map_canvas"); + if(map) map.style.display = map.style.display === 'none'?'block': 'none'; } function toggle (target, defaultDisplay = "inline"){ @@ -182,8 +184,9 @@ function navigateGeothesaursSearch() {
+ data-geo-unit='' + > +
@@ -431,7 +434,7 @@ function navigateGeothesaursSearch() { -
+
<?= $LANG[' /> @@ -454,7 +457,7 @@ function navigateGeothesaursSearch() { - + * ' . $LANG['CANT_DELETE'] . ''; diff --git a/glossary/sources.php b/glossary/sources.php index e7ad367c20..ec18e79a4d 100644 --- a/glossary/sources.php +++ b/glossary/sources.php @@ -93,7 +93,7 @@
- +
- \ No newline at end of file + diff --git a/glossary/termdetails.php b/glossary/termdetails.php index ed57b9b647..21ad76315a 100644 --- a/glossary/termdetails.php +++ b/glossary/termdetails.php @@ -744,7 +744,7 @@ function verifyImageEditForm(f){ - + @@ -772,7 +772,9 @@ function verifyImageEditForm(f){ echo ''; } ?> - /> + @@ -789,4 +791,4 @@ function verifyImageEditForm(f){ //include($SERVER_ROOT.'/includes/footer.php'); ?> - \ No newline at end of file + diff --git a/imagelib/imgdetails.php b/imagelib/imgdetails.php index 7125ad5d77..b810ffa9ec 100644 --- a/imagelib/imgdetails.php +++ b/imagelib/imgdetails.php @@ -340,7 +340,7 @@ function openOccurrenceSearch(target) {
- +
diff --git a/profile/userprofile.php b/profile/userprofile.php index 0642abaefc..4a324c0be7 100644 --- a/profile/userprofile.php +++ b/profile/userprofile.php @@ -171,7 +171,7 @@
- +
@@ -328,4 +328,4 @@ \ No newline at end of file +?> diff --git a/projects/checklisttab.php b/projects/checklisttab.php index 427c4ab526..a9db271976 100644 --- a/projects/checklisttab.php +++ b/projects/checklisttab.php @@ -1,6 +1,7 @@
- Add a Checklist +
- +
- Delete a Checklist +
- +
- \ No newline at end of file + diff --git a/projects/index.php b/projects/index.php index 9669ccb190..c7917ae650 100644 --- a/projects/index.php +++ b/projects/index.php @@ -278,8 +278,8 @@ function isNumeric(sText){ -
    • -
    • +
    • +
    • @@ -291,22 +291,22 @@ function isNumeric(sText){
    - "/> + "/>
    - "/> + "/>
    - +
    - "/> + "/>
    @@ -342,8 +342,11 @@ function isNumeric(sText){
    + + 1 || $researchList)?'disabled':'').' />'; echo '
    '; if(count($managerArr) > 1){ if(isset($LANG['DELCONDITION1'])) echo $LANG['DELCONDITION1']; @@ -471,4 +474,4 @@ function isNumeric(sText){ include($SERVER_ROOT.'/includes/footer.php'); ?> - \ No newline at end of file + diff --git a/projects/managertab.php b/projects/managertab.php index 7b13634959..b31ccd3149 100644 --- a/projects/managertab.php +++ b/projects/managertab.php @@ -1,6 +1,7 @@ setPid($pid); ?>
    -
    Inventory Project Managers
    +
      getManagers('ProjAdmin', 'fmprojects', $pid); @@ -27,10 +28,10 @@ ?>
    - Add a New Manager + - +
    -
    \ No newline at end of file +
    diff --git a/taxa/profile/tpdesceditor.php b/taxa/profile/tpdesceditor.php index 27beafc321..ed9fb6275a 100644 --- a/taxa/profile/tpdesceditor.php +++ b/taxa/profile/tpdesceditor.php @@ -154,7 +154,7 @@ - +
    diff --git a/taxa/profile/tpeditor.php b/taxa/profile/tpeditor.php index 9ca0bfd930..adaef6720e 100644 --- a/taxa/profile/tpeditor.php +++ b/taxa/profile/tpeditor.php @@ -327,7 +327,7 @@ function openOccurrenceSearch(target) {
    - +
    diff --git a/taxa/taxonomy/taxonomydelete.php b/taxa/taxonomy/taxonomydelete.php index f8a1a6ac8c..8996e8f65f 100644 --- a/taxa/taxonomy/taxonomydelete.php +++ b/taxa/taxonomy/taxonomydelete.php @@ -291,7 +291,7 @@ function submitRemapTaxonForm(f){ if(array_key_exists('syn',$verifyArr)) $deactivateStr = 'disabled'; if($verifyArr['img'] > 0) $deactivateStr = 'disabled'; if(array_key_exists('tdesc',$verifyArr)) $deactivateStr = 'disabled'; - echo ''; + echo ''; ?> From 40029b098a6c837713ce3c573bf25e7db5aef91a Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 14 May 2024 13:19:29 -0700 Subject: [PATCH 25/32] add styling missing from occurrenceeditor and include head.php (#1277) --- collections/editor/occurrenceeditor.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/collections/editor/occurrenceeditor.php b/collections/editor/occurrenceeditor.php index 80805467b2..0cd0219bb7 100644 --- a/collections/editor/occurrenceeditor.php +++ b/collections/editor/occurrenceeditor.php @@ -442,6 +442,9 @@ <?= $DEFAULT_TITLE . ' ' . $LANG['OCCEDITOR'] ?> + fieldset{ padding:15px } fieldset > legend{ font-weight:bold; } - .fieldGroup-div{ clear:both; overflow: auto; margin-bottom: 2px; } - .field-div{ margin: 2px; } + .fieldGroupDiv{ clear:both; margin-bottom: 1rem; overflow: auto} + .fieldDiv{ float:left; margin-right: 1rem;} select{ height: 20px; margin-bottom: 2px; } #identifierDiv img{ width:10px; margin-left: 5px; } + #innertext{ background-color: white; margin: 0px 10px; } + + .editimg{ width: 15px; } .button-toggle { background-color: transparent; From cd259a7c88c9e502ab8cc04faafa5a6a5d57a657 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 14 May 2024 13:21:18 -0700 Subject: [PATCH 26/32] globally replace
    -
    +

    diff --git a/admin/portalindex.php b/admin/portalindex.php index b93c61de3f..a7e47b22de 100644 --- a/admin/portalindex.php +++ b/admin/portalindex.php @@ -52,7 +52,7 @@ function validateHandshakeForm(f){ Home >> Portal Index Control Panel
    -
    +
    -
    +

    Database Schema Manager

    -
    +

    Forbidden

    You don't have permission to access this page. diff --git a/checklists/checklistadminchildren.php b/checklists/checklistadminchildren.php index 8d2e04b856..cc62e3c117 100644 --- a/checklists/checklistadminchildren.php +++ b/checklists/checklistadminchildren.php @@ -60,7 +60,7 @@ function validateAddChildForm(f){ button{ margin:20px; } -
    +
    diff --git a/checklists/index.php b/checklists/index.php index 9a9772b07f..77047a1cc8 100644 --- a/checklists/index.php +++ b/checklists/index.php @@ -39,7 +39,7 @@ >>
    -
    +

    -
    +

    diff --git a/checklists/tools/checklistloader.php b/checklists/tools/checklistloader.php index 9f490b3552..54203fe9a5 100644 --- a/checklists/tools/checklistloader.php +++ b/checklists/tools/checklistloader.php @@ -64,7 +64,7 @@ function displayErrors(clickObj){
    -
    +

    diff --git a/checklists/tools/index.php b/checklists/tools/index.php index dfc893e02e..3b32d17440 100644 --- a/checklists/tools/index.php +++ b/checklists/tools/index.php @@ -17,7 +17,7 @@ include($SERVER_ROOT.'/includes/header.php'); ?> -
    +

    Checklist Tools

    Forbidden

    diff --git a/checklists/vaconflicts.php b/checklists/vaconflicts.php index bdd778cc66..f0b5cf437e 100644 --- a/checklists/vaconflicts.php +++ b/checklists/vaconflicts.php @@ -43,7 +43,7 @@ function validateBatchConflictForm(f){ f.submit(); } -
    +
    getMissingProblemTaxa(); else $missingArr = $vManager->getMissingTaxa(); ?> -
    +
    -
    +

    Word Cloud

    '; $htmlStr .= $cloudStr; $htmlStr .= '
    diff --git a/classes/index.php b/classes/index.php index 32fc72775f..251aa822b6 100644 --- a/classes/index.php +++ b/classes/index.php @@ -17,7 +17,7 @@ include($SERVER_ROOT.'/includes/header.php'); ?> -
    +

    Access Denied

    Forbidden

    diff --git a/collections/admin/guidmapper.php b/collections/admin/guidmapper.php index b86b823c35..944ca0c42b 100644 --- a/collections/admin/guidmapper.php +++ b/collections/admin/guidmapper.php @@ -75,7 +75,7 @@ function verifyGuidAdminForm(f){
    -
    +

    diff --git a/collections/admin/igsnmanagement.php b/collections/admin/igsnmanagement.php index f4ed3a535b..a71f6315b6 100644 --- a/collections/admin/igsnmanagement.php +++ b/collections/admin/igsnmanagement.php @@ -133,7 +133,7 @@ function verifyProfileForm(f){ >>
    -
    +

    -
    +

    -
    +

    getCollectionName(); ?>

    ">
    -
    +

    getCollMeta('collName'); ?>

    diff --git a/collections/admin/index.php b/collections/admin/index.php index 35c6842b9a..9ed2524774 100644 --- a/collections/admin/index.php +++ b/collections/admin/index.php @@ -17,7 +17,7 @@ include($SERVER_ROOT.'/includes/header.php'); ?> -

    '; diff --git a/collections/cleaning/politicalunits.php b/collections/cleaning/politicalunits.php index e1dee2bba4..01311feaeb 100644 --- a/collections/cleaning/politicalunits.php +++ b/collections/cleaning/politicalunits.php @@ -146,7 +146,7 @@ function verifyNullCountyForm(f){
    -
    +
    Geography Cleaning Tools: ' . $collMap['collectionname'] . ' (' . $collMap['code'] . ')'; if($statusStr){ diff --git a/collections/cleaning/taxonomycleaner.php b/collections/cleaning/taxonomycleaner.php index 75685786e9..e7f4b9e383 100644 --- a/collections/cleaning/taxonomycleaner.php +++ b/collections/cleaning/taxonomycleaner.php @@ -174,7 +174,7 @@ function verifyCleanerForm(f){
    -
    +
    getCollMap(); if($collid){ diff --git a/collections/datasets/datapublisher.php b/collections/datasets/datapublisher.php index 912300e6d8..c465306565 100644 --- a/collections/datasets/datapublisher.php +++ b/collections/datasets/datapublisher.php @@ -210,7 +210,7 @@ function checkAllColl(cb) {
    -
    +
    diff --git a/collections/datasets/datasetmanager.php b/collections/datasets/datasetmanager.php index 5e738e7197..c7cdb95bf8 100644 --- a/collections/datasets/datasetmanager.php +++ b/collections/datasets/datasetmanager.php @@ -282,7 +282,7 @@ function targetDownloadPopup(f) {
    -
    +

    -
    +

    Duplicate Manager

    -
    +
    -
    +

    Add Occurrences to Dataset

    diff --git a/collections/datasets/public.php b/collections/datasets/public.php index 3384582c84..080f695f01 100644 --- a/collections/datasets/public.php +++ b/collections/datasets/public.php @@ -37,7 +37,7 @@ :
    -
    +

    :

      diff --git a/collections/datasets/publiclist.php b/collections/datasets/publiclist.php index ef3f59c200..62ae4c146f 100644 --- a/collections/datasets/publiclist.php +++ b/collections/datasets/publiclist.php @@ -25,7 +25,7 @@
    -
    +

      -
      +

      diff --git a/collections/editor/batchdeterminations.php b/collections/editor/batchdeterminations.php index 854c7a076a..0ac29c2937 100644 --- a/collections/editor/batchdeterminations.php +++ b/collections/editor/batchdeterminations.php @@ -301,7 +301,7 @@ function openPopup(urlStr){
      -
      +

      -
      +

      Forbidden

      You don't have permission to access this page. diff --git a/collections/editor/dev/occurdataentry.php b/collections/editor/dev/occurdataentry.php index c2b0c71924..1aec77812a 100644 --- a/collections/editor/dev/occurdataentry.php +++ b/collections/editor/dev/occurdataentry.php @@ -56,7 +56,7 @@ -
      +
      diff --git a/collections/editor/dupesearch.php b/collections/editor/dupesearch.php index 93642a0538..31932cac52 100644 --- a/collections/editor/dupesearch.php +++ b/collections/editor/dupesearch.php @@ -137,7 +137,7 @@ function reloadParent(){ -
      +

      Duplicate Record Search

      '; ?> -
      +

      Occurrence Edit Reviewer

      &emode=1"> >>
      -
      +

      -
      +

      . diff --git a/collections/editor/index.php b/collections/editor/index.php index a698baac51..c721a56922 100644 --- a/collections/editor/index.php +++ b/collections/editor/index.php @@ -18,7 +18,7 @@ include($SERVER_ROOT.'/includes/header.php'); ?> -
      +

      . diff --git a/collections/editor/observationsubmit.php b/collections/editor/observationsubmit.php index 306a89997e..3ebe7214f6 100644 --- a/collections/editor/observationsubmit.php +++ b/collections/editor/observationsubmit.php @@ -90,7 +90,7 @@ echo '' . (isset($LANG['OBS_SUB']) ? $LANG['OBS_SUB'] : 'Observation Submission') . ''; echo '
      '; ?> -
      +

      -
      +
      Occurrence Editor: ' . $collMap['collectionname'].' ('.$collMap['institutioncode'].($collMap['collectioncode']?':'.$collMap['collectioncode']:'').') '; diff --git a/collections/editor/rpc/dupelist.php b/collections/editor/rpc/dupelist.php index a9d771589b..048bcbc0b0 100644 --- a/collections/editor/rpc/dupelist.php +++ b/collections/editor/rpc/dupelist.php @@ -47,7 +47,7 @@ function openIndWindow(occid){ -
      +

      diff --git a/collections/editor/rpc/index.php b/collections/editor/rpc/index.php index b940962cf1..1226efa4ff 100644 --- a/collections/editor/rpc/index.php +++ b/collections/editor/rpc/index.php @@ -17,7 +17,7 @@ include($SERVER_ROOT.'/includes/header.php'); ?> -
      +

      Forbidden

      You don't have permission to access this page. diff --git a/collections/editor/skeletalsubmit.php b/collections/editor/skeletalsubmit.php index 234f25c26b..10e512fc67 100644 --- a/collections/editor/skeletalsubmit.php +++ b/collections/editor/skeletalsubmit.php @@ -60,7 +60,7 @@
      -
      +

      -
      +

      Forbidden

      You don't have permission to access this page. diff --git a/collections/exsiccati/batchimport.php b/collections/exsiccati/batchimport.php index 7e150c2b79..1f07eebda7 100644 --- a/collections/exsiccati/batchimport.php +++ b/collections/exsiccati/batchimport.php @@ -121,7 +121,7 @@ function openExsPU(omenid){ Batch Import Module
      -
      +

      Exsiccatae Batch Import

      -
      +

      Exsiccatae

      Batch GeoLocate Tools
      -
      +

      GeoLocate Batch Processes

      " /> -
      +

      Georeference Clone Tool

      diff --git a/collections/georef/index.php b/collections/georef/index.php index eb9a6c7184..8fc07949e2 100644 --- a/collections/georef/index.php +++ b/collections/georef/index.php @@ -17,7 +17,7 @@ include($SERVER_ROOT.'/includes/header.php'); ?> -
      +

      Forbidden

      You don't have permission to access this page. diff --git a/collections/harvestparams.php b/collections/harvestparams.php index e99df9062f..284e4281ab 100644 --- a/collections/harvestparams.php +++ b/collections/harvestparams.php @@ -71,7 +71,7 @@ -
      +

      Search

      diff --git a/collections/index.php b/collections/index.php index 438b7b9f9e..6d9b0242d7 100644 --- a/collections/index.php +++ b/collections/index.php @@ -70,7 +70,7 @@ } ?> -
      +

      Collections List

        diff --git a/collections/list.php b/collections/list.php index 5b10c0860a..3d5895ceed 100644 --- a/collections/list.php +++ b/collections/list.php @@ -142,7 +142,7 @@ function displayDatasetTools() { } ?> -
        +

        Search Results (List)

          diff --git a/collections/loans/exchange.php b/collections/loans/exchange.php index 392aa3c828..9687d27ce8 100644 --- a/collections/loans/exchange.php +++ b/collections/loans/exchange.php @@ -78,7 +78,7 @@
        -
        +

        ">
        -
        +

        ">
        -
        +

        ">
        -
        +

        " data-lng="" >
        -
        +

        Static distribution map generator

        diff --git a/collections/misc/assocmanagement.php b/collections/misc/assocmanagement.php index 34373ca783..b7207e8059 100644 --- a/collections/misc/assocmanagement.php +++ b/collections/misc/assocmanagement.php @@ -58,7 +58,7 @@
        -
        +

        '; ?> -
        +

        -
        +

        Download Backup File

        -
        +

        ' . (isset($LANG['CREATE_COLL']) ? $LANG['CREATE_COLL'] : 'Create New Collection Profile') . ''; echo '
        '; ?> -
        +
        diff --git a/collections/misc/collorderstats.php b/collections/misc/collorderstats.php index c6a3939c5a..1371a48f8d 100644 --- a/collections/misc/collorderstats.php +++ b/collections/misc/collorderstats.php @@ -37,7 +37,7 @@ $displayLeftMenu = (isset($collections_misc_collstatsMenu)?$collections_misc_collstatsMenu:false); include($SERVER_ROOT.'/includes/header.php'); ?> -
        +

        diff --git a/collections/misc/collpermissions.php b/collections/misc/collpermissions.php index 96b362cd57..5c02ba5358 100644 --- a/collections/misc/collpermissions.php +++ b/collections/misc/collpermissions.php @@ -127,7 +127,7 @@ function verifyAddRights(f){ ?> -
        +

        >>
        -
        +
        diff --git a/collections/misc/collstats.php b/collections/misc/collstats.php index 9a43b6d877..2d75ce6a42 100644 --- a/collections/misc/collstats.php +++ b/collections/misc/collstats.php @@ -414,7 +414,7 @@ function changeCollForm(f){ } ?> -
        +

          diff --git a/collections/misc/collyearstats.php b/collections/misc/collyearstats.php index 4ca8ec5993..0e6e920781 100644 --- a/collections/misc/collyearstats.php +++ b/collections/misc/collyearstats.php @@ -39,7 +39,7 @@ $displayLeftMenu = (isset($collections_misc_collstatsMenu)?$collections_misc_collstatsMenu:false); include($SERVER_ROOT.'/includes/header.php'); ?> -
          +

          Year Statistics

          Month Totals diff --git a/collections/misc/commentlist.php b/collections/misc/commentlist.php index 09f499e0f2..cfa3f3f0da 100644 --- a/collections/misc/commentlist.php +++ b/collections/misc/commentlist.php @@ -120,7 +120,7 @@ } ?> -
          +

          Occurrence Comments For:

          diff --git a/collections/misc/index.php b/collections/misc/index.php index eb9a6c7184..8fc07949e2 100644 --- a/collections/misc/index.php +++ b/collections/misc/index.php @@ -17,7 +17,7 @@ include($SERVER_ROOT.'/includes/header.php'); ?> -
          +

          Forbidden

          You don't have permission to access this page. diff --git a/collections/misc/institutioneditor.php b/collections/misc/institutioneditor.php index 4248e82bfa..21e4442ce2 100644 --- a/collections/misc/institutioneditor.php +++ b/collections/misc/institutioneditor.php @@ -176,7 +176,7 @@ function validateAddCollectionForm(f){
          -
          +