Skip to content

Commit

Permalink
Merge pull request egbot#164 from BioKIC/Development
Browse files Browse the repository at this point in the history 
Pull updates from BioKIC/Development
  • Loading branch information
@GregoryPost
GregoryPost authored May 16, 2024
2 parents 8fe2d62 + 65d75af commit f8492d8
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 20 deletions.
8 changes: 4 additions & 4 deletions classes/KeyMatrixEditor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,10 @@ private function processTaxa($tid,$indent=0){
private function echoTaxaRow($tid,$sciname,$indent = 0){
if(!is_numeric($indent)) $indent = 0;
if(is_numeric($tid)){
echo '<tr><td>';
echo '<tr><td><div style="display: flex;align-items: center;gap: 0.5rem;line-height: 1; padding: 0.5rem 0">';
echo '<span style="margin-left:'.($indent*10).'px"><b>'.($indent?'<i>':'').htmlspecialchars($sciname, ENT_QUOTES, 'UTF-8').($indent?'</i>':'').'</b></span>';
echo '<a href="editor.php?tid=' . htmlspecialchars($tid, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE) . '" target="_blank"> <img src="../../images/edit.png" /></a>';
echo '</td>';
echo '<a href="editor.php?tid=' . htmlspecialchars($tid, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE) . '" target="_blank"><img style="width:1.5em" src="../../images/edit.png" /></a>';
echo '</div></td>';
foreach($this->stateArr as $cs => $csName){
$isSelected = false;
$isInherited = false;
Expand Down Expand Up @@ -299,4 +299,4 @@ public function setClid($clid){
}
}
}
?>
?>
2 changes: 1 addition & 1 deletion collections/list.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
include_once($SERVER_ROOT . '/includes/googleanalytics.php');
?>
<link href="<?php echo htmlspecialchars($CSS_BASE_PATH, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE); ?>/symbiota/collections/listdisplay.css" type="text/css" rel="stylesheet" />
<link href="<?php echo $CSS_BASE_PATH; ?>/jquery-ui.css" type="text/css" rel="stylesheet">
<link href="<?php echo $CSS_BASE_PATH; ?>/jquery-ui.min.css" type="text/css" rel="stylesheet">
<script src="<?php echo $CLIENT_ROOT; ?>/js/jquery-3.7.1.min.js" type="text/javascript"></script>
<script src="<?php echo $CLIENT_ROOT; ?>/js/jquery-ui.min.js" type="text/javascript"></script>
<script type="text/javascript">
Expand Down
16 changes: 9 additions & 7 deletions collections/specprocessor/crowdsource/review.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,15 @@ function showAdditionalActions(){
</script>
</head>
<body style="margin-left: 0px; margin-right: 0px;background-color:white;">
<div class='navpath'>
<a href="../../../index.php"><?php echo htmlspecialchars($LANG['HOME'], ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE); ?></a> &gt;&gt;
<a href="index.php"><?php echo htmlspecialchars($LANG['SCORE_BOARD'], ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE); ?></a> &gt;&gt;
<?php
if($collid) echo '<a href="../index.php?tabindex=1&collid=' . htmlspecialchars($collid, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE) . '">' . htmlspecialchars($LANG['CONTROL_PANEL'], ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE) . '</a> &gt;&gt;';
?>
<b><?php echo $LANG['CROWDSOURCING_REVIEW']; ?></b>
<div style="width:850px;clear:both;">
<div class='navpath' style="float:left; padding-left: 5px">
<a href="../../../index.php"><?php echo htmlspecialchars($LANG['HOME'], ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE); ?></a> &gt;&gt;
<a href="index.php"><?php echo htmlspecialchars($LANG['SCORE_BOARD'], ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE); ?></a> &gt;&gt;
<?php
if($collid) echo '<a href="../index.php?tabindex=1&collid=' . htmlspecialchars($collid, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE) . '">' . htmlspecialchars($LANG['CONTROL_PANEL'], ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE) . '</a> &gt;&gt;';
?>
<b><?php echo $LANG['CROWDSOURCING_REVIEW']; ?></b>
</div>
</div>
<div style="margin:10px;">
<h1 class="page-heading">Review Crowdsourced Records</h1>
Expand Down
2 changes: 1 addition & 1 deletion css/v202209/jquery-ui.min.css
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions css/v202209/symbiota/collections/editor/occurrenceeditor.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,11 @@ body{
margin: 15px 30px;
}

#editortd{
vertical-align: top;
padding-right: 1em;
}

/*Misc styling*/
img.docimg {
border: 0px;
Expand Down
12 changes: 6 additions & 6 deletions ident/tools/matrixeditor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

$muManager = new KeyMatrixEditor();
$muManager->setClid($clid);
if($langValue) $muManager->setLang($langValue);
if($langValue) $muManager->setLanguage($langValue);
if($cidValue) $muManager->setCid($cidValue);

$isEditor = false;
Expand Down Expand Up @@ -49,7 +49,7 @@

function verifyClose() {
if(dataChanged == true) {
return <?php echo (isset($LANG['DATA_CHANGED']) ? $LANG['DATA_CHANGED'] : 'You will lose any unsaved data if you don\'t first save your changes!'); ?>;
return "<?php echo (isset($LANG['DATA_CHANGED']) ? $LANG['DATA_CHANGED'] : 'You will lose any unsaved data if you don\'t first save your changes!'); ?>";
}
}

Expand Down Expand Up @@ -98,7 +98,7 @@ function submitAttrs(){
submitForm = true;
}
if(submitForm) sform.submit();
else alert(<?php echo (isset($LANG['NO_EDITS_MADE']) ? $LANG['NO_EDITS_MADE'] : 'It doesn\'t appear that any edits have been made'); ?>);
else alert("<?php echo (isset($LANG['NO_EDITS_MADE']) ? $LANG['NO_EDITS_MADE'] : 'It doesn\'t appear that any edits have been made'); ?>");
}
</script>
<style>
Expand Down Expand Up @@ -142,7 +142,7 @@ function submitAttrs(){
<b> <?php echo (isset($LANG['MTRX_EDIT']) ? $LANG['MTRX_EDIT'] : 'Matrix Editor'); ?> </b>
</div>
<!-- This is inner text! -->
<div role="main" id="innertext">
<div role="main" id="innertext" style="padding-top: 0">
<h1 class="page-heading"><?= $LANG['MTRX_EDIT']; ?></h1>
<?php
if($clid && $isEditor){
Expand Down Expand Up @@ -192,7 +192,7 @@ function submitAttrs(){
else{
$inheritStr = '&nbsp;<span title="' . (isset($LANG['STATE_INHERITED']) ? $LANG['STATE_INHERITED'] : 'State has been inherited from parent taxon') . '"><b>(i)</b></span>';
?>
<div><?php echo $inheritStr; ?> <?php echo (isset($LANG['INHERITED_TRUE']) ? $LANG['INHERITED_TRUE'] : ' = character state is inherited as true from a parent taxon (genus, family, etc)') ?> </div>
<div style="margin-bottom:1rem"><?php echo $inheritStr; ?> <?php echo (isset($LANG['INHERITED_TRUE']) ? $LANG['INHERITED_TRUE'] : ' = character state is inherited as true from a parent taxon (genus, family, etc)') ?> </div>
<table class="styledtable" style="font-family:Arial;font-size:12px;">
<?php
$muManager->echoTaxaList($taxonFilter,$generaOnly);
Expand All @@ -217,4 +217,4 @@ function submitAttrs(){
include($SERVER_ROOT.'/includes/footer.php');
?>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion imagelib/search.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
include_once($SERVER_ROOT . '/includes/googleanalytics.php');
?>

<link href="<?= $CSS_BASE_PATH ?>/jquery-ui.css" type="text/css" rel="stylesheet">
<link href="<?= $CSS_BASE_PATH ?>/jquery-ui.min.css" type="text/css" rel="stylesheet">
<link href="<?= $CSS_BASE_PATH; ?>/symbiota/collections/listdisplay.css" type="text/css" rel="stylesheet" />
<link href="<?= $CSS_BASE_PATH; ?>/symbiota/collections/sharedCollectionStyling.css" type="text/css" rel="stylesheet" />
<style>
Expand Down

0 comments on commit f8492d8

Please sign in to comment.