From 6c93f943d6f922297523507ea137ab03e601ad7c Mon Sep 17 00:00:00 2001
From: Laura Rocha Prado <lauraprado@asu.edu>
Date: Fri, 14 Feb 2020 15:55:14 -0700
Subject: [PATCH 1/2] Adapts `collections` root files to new framework
structure
---
collections/harvestparams.php | 14 +++++++++++---
collections/index.php | 14 +++++++++++---
collections/listtabledisplay.php | 14 +++++++++++---
3 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/collections/harvestparams.php b/collections/harvestparams.php
index 86a67abff9..d97b56daae 100644
--- a/collections/harvestparams.php
+++ b/collections/harvestparams.php
@@ -10,9 +10,17 @@
<html>
<head>
<title><?php echo $DEFAULT_TITLE.' '.$LANG['PAGE_TITLE']; ?></title>
- <link href="../css/base.css?ver=<?php echo $CSS_VERSION; ?>" type="text/css" rel="stylesheet" />
- <link href="../css/main.css<?php echo (isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:''); ?>" type="text/css" rel="stylesheet" />
- <link href="../js/jquery-ui-1.12.1/jquery-ui.min.css?ver=3" type="text/css" rel="Stylesheet" />
+ <?php
+ $activateJQuery = true;
+ 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" />';
+ }
+ ?>
<script src="../js/jquery-3.2.1.min.js?ver=3" type="text/javascript"></script>
<script src="../js/jquery-ui-1.12.1/jquery-ui.min.js?ver=3" type="text/javascript"></script>
<script src="../js/symb/collections.harvestparams.js?ver=180721" type="text/javascript"></script>
diff --git a/collections/index.php b/collections/index.php
index b0475056d9..8eb380597f 100644
--- a/collections/index.php
+++ b/collections/index.php
@@ -21,9 +21,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $CHARSET;?>">
<title><?php echo $DEFAULT_TITLE.' '.$LANG['PAGE_TITLE']; ?></title>
- <link href="../css/base.css?ver=<?php echo $CSS_VERSION; ?>" type="text/css" rel="stylesheet" />
- <link href="../css/main.css<?php echo (isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:''); ?>" type="text/css" rel="stylesheet" />
- <link href="../js/jquery-ui-1.12.1/jquery-ui.min.css" type="text/css" rel="Stylesheet" />
+ <?php
+ $activateJQuery = true;
+ 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" />';
+ }
+ ?>
<script src="../js/jquery-3.2.1.min.js" type="text/javascript"></script>
<script src="../js/jquery-ui-1.12.1/jquery-ui.min.js" type="text/javascript"></script>
<script src="../js/symb/collections.index.js?ver=20171215" type="text/javascript"></script>
diff --git a/collections/listtabledisplay.php b/collections/listtabledisplay.php
index d3e8ca0ea5..d1c64757a4 100644
--- a/collections/listtabledisplay.php
+++ b/collections/listtabledisplay.php
@@ -27,9 +27,17 @@
white-space: nowrap;
}
</style>
- <link href="../css/base.css?ver=<?php echo $CSS_VERSION; ?>" type="text/css" rel="stylesheet" />
- <link href="../css/main.css<?php echo (isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:''); ?>" type="text/css" rel="stylesheet" />
- <link href="../js/jquery-ui-1.12.1/jquery-ui.min.css" type="text/css" rel="Stylesheet" />
+ <?php
+ $activateJQuery = true;
+ 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" />';
+ }
+ ?>
<script src="../js/jquery-3.2.1.min.js" type="text/javascript"></script>
<script src="../js/jquery-ui-1.12.1/jquery-ui.min.js" type="text/javascript"></script>
<script type="text/javascript">
From cfd300dfffd0aa1e02cfb304500c4c93ffdfd621 Mon Sep 17 00:00:00 2001
From: Laura Rocha Prado <lauraprado@asu.edu>
Date: Fri, 14 Feb 2020 16:28:25 -0700
Subject: [PATCH 2/2] Adapts `collections/admin` files to new framework
structure
---
collections/admin/guidmapper.php | 13 +++++++++++--
collections/admin/igsnmanagement.php | 13 +++++++++++--
collections/admin/igsnmapper.php | 13 +++++++++++--
collections/admin/index.php | 13 +++++++++++--
collections/admin/institutioneditor.php | 13 +++++++++++--
collections/admin/logs/index.php | 12 +++++++++++-
collections/admin/restorebackup.php | 16 ++++++++++++----
collections/admin/specupload.php | 14 +++++++++++---
collections/admin/specuploadmanagement.php | 13 +++++++++++--
collections/admin/uploadreviewer.php | 13 +++++++++++--
10 files changed, 111 insertions(+), 22 deletions(-)
diff --git a/collections/admin/guidmapper.php b/collections/admin/guidmapper.php
index 0987488176..a7cff3ef94 100644
--- a/collections/admin/guidmapper.php
+++ b/collections/admin/guidmapper.php
@@ -20,8 +20,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $CHARSET; ?>">
<title>UUID GUID Mapper</title>
- <link rel="stylesheet" href="../../css/base.css?ver=<?php echo $CSS_VERSION; ?>" type="text/css" />
- <link rel="stylesheet" href="../../css/main.css<?php echo (isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:''); ?>" type="text/css" />
+ <?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" />';
+ }
+ ?>
<script type="text/javascript">
function toggle(target){
var objDiv = document.getElementById(target);
diff --git a/collections/admin/igsnmanagement.php b/collections/admin/igsnmanagement.php
index e7d1a2c657..2b7a585a4a 100644
--- a/collections/admin/igsnmanagement.php
+++ b/collections/admin/igsnmanagement.php
@@ -52,8 +52,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $CHARSET; ?>">
<title>IGSN GUID Management</title>
- <link rel="stylesheet" href="../../css/base.css?ver=<?php echo $CSS_VERSION; ?>" type="text/css" />
- <link rel="stylesheet" href="../../css/main.css<?php echo (isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:''); ?>" type="text/css" />
+ <?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" />';
+ }
+ ?>
<script type="text/javascript" src="../../js/jquery.js"></script>
<script type="text/javascript">
function validateCredentials(f){
diff --git a/collections/admin/igsnmapper.php b/collections/admin/igsnmapper.php
index 073cbe9104..903555396d 100644
--- a/collections/admin/igsnmapper.php
+++ b/collections/admin/igsnmapper.php
@@ -62,8 +62,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $CHARSET; ?>">
<title>IGSN GUID Mapper</title>
- <link rel="stylesheet" href="../../css/base.css?ver=<?php echo $CSS_VERSION; ?>" type="text/css" />
- <link rel="stylesheet" href="../../css/main.css<?php echo (isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:''); ?>" type="text/css" />
+ <?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" />';
+ }
+ ?>
<script type="text/javascript" src="../../js/jquery.js"></script>
<script type="text/javascript">
function validateCredentials(f){
diff --git a/collections/admin/index.php b/collections/admin/index.php
index b6198d813f..b83c9ba598 100644
--- a/collections/admin/index.php
+++ b/collections/admin/index.php
@@ -7,8 +7,17 @@
<html>
<head>
<title>Page</title>
- <link href="<?php echo $CLIENT_ROOT; ?>/css/base.css?ver=<?php echo $CSS_VERSION; ?>" type="text/css" rel="stylesheet" />
- <link href="<?php echo $CLIENT_ROOT; ?>/css/main.css<?php echo (isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:''); ?>" type="text/css" rel="stylesheet" />
+ <?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" />';
+ }
+ ?>
</head>
<body>
<?php
diff --git a/collections/admin/institutioneditor.php b/collections/admin/institutioneditor.php
index a6313464b8..984e90fc28 100644
--- a/collections/admin/institutioneditor.php
+++ b/collections/admin/institutioneditor.php
@@ -86,8 +86,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $CHARSET; ?>">
<title><?php echo $DEFAULT_TITLE; ?> Institution Editor</title>
- <link type="text/css" href="../../css/base.css?ver=<?php echo $CSS_VERSION; ?>" rel="stylesheet" />
- <link type="text/css" href="../../css/main.css<?php echo (isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:''); ?>" rel="stylesheet" />
+ <?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" />';
+ }
+ ?>
<script language=javascript>
function toggle(target){
diff --git a/collections/admin/logs/index.php b/collections/admin/logs/index.php
index 2b24ea8cdc..99867125e7 100644
--- a/collections/admin/logs/index.php
+++ b/collections/admin/logs/index.php
@@ -7,7 +7,17 @@
<html>
<head>
<title>Page</title>
- <link rel="stylesheet" href="<?php echo $CLIENT_ROOT; ?>/css/main.css<?php echo (isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:''); ?>" type="text/css" />
+ <?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" />';
+ }
+ ?>
</head>
<body>
<?php
diff --git a/collections/admin/restorebackup.php b/collections/admin/restorebackup.php
index 55147a9998..16290d9647 100644
--- a/collections/admin/restorebackup.php
+++ b/collections/admin/restorebackup.php
@@ -86,10 +86,18 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $CHARSET; ?>">
<title><?php echo $DEFAULT_TITLE; ?> Restore Backup</title>
- <link href="../../css/base.css?ver=<?php echo $CSS_VERSION; ?>" type="text/css" rel="stylesheet" />
- <link href="../../css/main.css<?php echo (isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:''); ?>" type="text/css" rel="stylesheet" />
- <link href="../../css/jquery-ui.css" type="text/css" rel="stylesheet" />
- <script src="../../js/jquery.js" type="text/javascript"></script>
+ <?php
+ $activateJQuery = true;
+ 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" />';
+ }
+ ?>
+ <script src="../../js/jquery.js" type="text/javascript"></script>
<script src="../../js/jquery-ui.js" type="text/javascript"></script>
<script src="../../js/symb/shared.js" type="text/javascript"></script>
<script>
diff --git a/collections/admin/specupload.php b/collections/admin/specupload.php
index 6587824fe6..3c886655fd 100644
--- a/collections/admin/specupload.php
+++ b/collections/admin/specupload.php
@@ -167,9 +167,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $CHARSET; ?>">
<title><?php echo $DEFAULT_TITLE; ?> Specimen Uploader</title>
- <link href="../../css/base.css?ver=<?php echo $CSS_VERSION; ?>" type="text/css" rel="stylesheet" />
- <link href="../../css/main.css<?php echo (isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:''); ?>" type="text/css" rel="stylesheet" />
- <link href="../../css/jquery-ui.css" type="text/css" rel="stylesheet" />
+ <?php
+ $activateJQuery = true;
+ 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" />';
+ }
+ ?>
<script src="../../js/jquery.js" type="text/javascript"></script>
<script src="../../js/jquery-ui.js" type="text/javascript"></script>
<script src="../../js/symb/shared.js" type="text/javascript"></script>
diff --git a/collections/admin/specuploadmanagement.php b/collections/admin/specuploadmanagement.php
index 9201772189..bebec2c82e 100644
--- a/collections/admin/specuploadmanagement.php
+++ b/collections/admin/specuploadmanagement.php
@@ -62,8 +62,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $CHARSET; ?>">
<title><?php echo $DEFAULT_TITLE; ?> Specimen Upload Profile Manager</title>
- <link href="../../css/base.css?ver=<?php echo $CSS_VERSION; ?>" type="text/css" rel="stylesheet" />
- <link href="../../css/main.css<?php echo (isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:''); ?>" type="text/css" rel="stylesheet" />
+ <?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" />';
+ }
+ ?>
<script>
function checkUploadListForm(f){
if(f.uspid.length == null){
diff --git a/collections/admin/uploadreviewer.php b/collections/admin/uploadreviewer.php
index df7054ad57..b19005c933 100644
--- a/collections/admin/uploadreviewer.php
+++ b/collections/admin/uploadreviewer.php
@@ -85,8 +85,17 @@
white-space: nowrap;
}
</style>
- <link href="../../css/base.css?ver=<?php echo $CSS_VERSION; ?>" type="text/css" rel="stylesheet" />
- <link href="../../css/main.css<?php echo (isset($CSS_VERSION_LOCAL)?'?ver='.$CSS_VERSION_LOCAL:''); ?>" type="text/css" rel="stylesheet" />
+ <?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" />';
+ }
+ ?>
</head>
<body style="margin-left: 0px; margin-right: 0px;background-color:white;">
<!-- inner text -->