Merge pull request #6 from BioKIC/master

Merge BioKIC/Symbiota developments
BioKIC · May 4, 2022 · 242f7d7 · 242f7d7
2 parents 5c83fe6 + 922b1e0
commit 242f7d7
Show file tree

Hide file tree

Showing 238 changed files with 73,475 additions and 2,452 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@
 .project
 .settings/org.eclipse.core.resources.prefs
 content/lang/header.fr.php
-.settings/org.eclipse.php.ui.prefs
+.settings/org.eclipse.php.ui.prefs
diff --git a/checklists/checklist.php b/checklists/checklist.php
diff --git a/checklists/checklistadmin.php b/checklists/checklistadmin.php
@@ -65,7 +65,7 @@
 <html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $CHARSET; ?>"/>
-	<title><?php echo $DEFAULT_TITLE.' - '.$LANG['CHECKADMIN'];?></title>
+	<title><?php echo $DEFAULT_TITLE.' - '.$LANG['CHECKLIST_ADMIN'];?></title>
 	<?php
 	$activateJQuery = true;
 	include_once($SERVER_ROOT.'/includes/head.php');
@@ -123,7 +123,7 @@ function validateAddProjectForm(f){
 <div class="navpath">
 	<a href="../index.php"><?php echo $LANG['NAV_HOME'];?></a> &gt;&gt;
 	<a href="checklist.php?clid=<?php echo $clid.'&pid='.$pid; ?>"><?php echo $LANG['RETURNCHECK'];?></a> &gt;&gt;
-	<b><?php echo $LANG['CHECKADMIN']; ?></b>
+	<b><?php echo $LANG['CHECKLIST_ADMIN']; ?></b>
 </div>
 <div id='innertext'>
 	<div style="color:#990000;font-size:20px;font-weight:bold;margin:0px 10px 10px 0px;">

diff --git a/checklists/checklistadminmeta.php b/checklists/checklistadminmeta.php
@@ -238,7 +238,7 @@ function openMappingPolyAid() {
 				</fieldset>
 			</div>
 			<div style="clear:both;margin-top:5px;">
-				<fieldset style="width:300px;">
+				<fieldset style="width:600px;">
 					<legend><b><?php echo (isset($LANG['DEFAULTDISPLAY'])?$LANG['DEFAULTDISPLAY']:'Default Display Settings');?></b></legend>
 					<div>
 						<?php
@@ -254,7 +254,12 @@ function openMappingPolyAid() {
 					<div>
 						<!-- Display as Images: 0 = false, 1 = true  -->
 						<input name='dimages' id='dimages' type='checkbox' value='1' <?php echo (($defaultArr&&$defaultArr["dimages"])?"checked":""); ?> onclick="showImagesDefaultChecked(this.form);" />
-						<?php echo $LANG['DISPLAYIMG'];?>
+						<?php echo $LANG['DISPLAYIMAGES'];?>
+					</div>
+					<div>
+						<!-- Display as Voucher Images: 0 = false, 1 = true  -->
+						<input name='dvoucherimages' id='dvoucherimages' type='checkbox' value='1' <?php echo ((isset($defaultArr['dvoucherimages'])&&$defaultArr['dvoucherimages'])?"checked":""); ?> />
+						<?php echo $LANG['DISPLAYVOUCHERIMAGES'];?>
 					</div>
 					<div>
 						<!-- Display Details: 0 = false, 1 = true  -->

diff --git a/checklists/index.php b/checklists/index.php
@@ -14,14 +14,7 @@
 	<title><?php echo $DEFAULT_TITLE; ?> Species Lists</title>
 	<?php
 	$activateJQuery = false;
-	if(file_exists($SERVER_ROOT.'/includes/head.php')){
-		include_once($SERVER_ROOT.'/includes/head.php');
-	}
-	else{
-		echo '<link href="'.$CLIENT_ROOT.'/css/jquery-ui.css" type="text/css" rel="stylesheet" />';
-		echo '<link href="'.$CLIENT_ROOT.'/css/base.css?ver=1" type="text/css" rel="stylesheet" />';
-		echo '<link href="'.$CLIENT_ROOT.'/css/main.css?ver=1" type="text/css" rel="stylesheet" />';
-	}
+	include_once($SERVER_ROOT.'/includes/head.php');
 	include_once($SERVER_ROOT.'/includes/googleanalytics.php');
 	?>
 </head>