From bde3daf2f8fa0913ab86d3178a02cbfa58af6c0f Mon Sep 17 00:00:00 2001
From: Jeff Sturek <jsturek8@unl.edu>
Date: Mon, 20 Jul 2020 15:56:59 -0500
Subject: [PATCH] Support WDN templates 5.2
---
composer.json | 2 +-
composer.lock | 12 ++++++------
www/index.php | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/composer.json b/composer.json
index 767eb2b..283feca 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
}
},
"require": {
- "unl/php-wdn-templates": "^5.1",
+ "unl/php-wdn-templates": "^5.2",
"ezyang/htmlpurifier": "^4.7"
}
}
diff --git a/composer.lock b/composer.lock
index 8897e5e..7647059 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "ee7a16fee0840a658c0ca7f8fd37f46a",
+ "content-hash": "4809634aac5a9b0350d6a0c7d7de5805",
"packages": [
{
"name": "ezyang/htmlpurifier",
@@ -106,16 +106,16 @@
},
{
"name": "unl/php-wdn-templates",
- "version": "v5.1.0",
+ "version": "v5.2.1",
"source": {
"type": "git",
"url": "https://github.com/unl/phpunltemplates.git",
- "reference": "44e42acb1252e41569810660998adb00d108aa06"
+ "reference": "7648850d99cc8b6f03307a7feca7d31b18e9a233"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/unl/phpunltemplates/zipball/44e42acb1252e41569810660998adb00d108aa06",
- "reference": "44e42acb1252e41569810660998adb00d108aa06",
+ "url": "https://api.github.com/repos/unl/phpunltemplates/zipball/7648850d99cc8b6f03307a7feca7d31b18e9a233",
+ "reference": "7648850d99cc8b6f03307a7feca7d31b18e9a233",
"shasum": ""
},
"require": {
@@ -159,7 +159,7 @@
],
"description": "A PHP library for rendering the UNL templates",
"homepage": "http://wdn.unl.edu/",
- "time": "2020-03-11T16:55:17+00:00"
+ "time": "2020-07-16T20:24:35+00:00"
},
{
"name": "zaininnari/html-minifier",
diff --git a/www/index.php b/www/index.php
index 71f9d78..9dbecb8 100644
--- a/www/index.php
+++ b/www/index.php
@@ -31,7 +31,7 @@ $isEmbed = isset($_GET['embed']) && $_GET['embed'];
// While the site proper is skinned with a specific version, the templates used
// used in embed search need to be supported in legacy sites.
// ?embed=1 : 4.1
-// ?embed=(not 1) : 5.1
+// ?embed=(not 1) : 5.2
if ($isEmbed && $_GET['embed'] === '1') {
$pageTemplate = 'Fixed';
$page = Templates::factory($pageTemplate, Templates::VERSION_4_1);
@@ -47,7 +47,7 @@ if ($isEmbed && $_GET['embed'] === '1') {
} else {
$pageTemplate = 'AppLocal';
- $page = Templates::factory($pageTemplate, Templates::VERSION_5_1);
+ $page = Templates::factory($pageTemplate, Templates::VERSION_5_2);
$templatePath = 'templates/5.0/';
$localScriptUrl = './js/search-tabs.min.js?v=' . $cacheVersion;
@@ -58,7 +58,7 @@ if ($isEmbed && $_GET['embed'] === '1') {
}
if (!$isEmbed) {
- if (file_exists(__DIR__ . '/wdn/templates_5.1')) {
+ if (file_exists(__DIR__ . '/wdn/templates_5.2')) {
$page->setLocalIncludePath(__DIR__);
}
@@ -66,7 +66,7 @@ if ($isEmbed && $_GET['embed'] === '1') {
$page->head .= '<link rel="home" href="./" />';
// Add WDN Deprecated Styles
- $page->head .= '<link rel="preload" href="/wdn/templates_5.1/css/deprecated.css" as="style" onload="this.onload=null;this.rel=\'stylesheet\'"> <noscript><link rel="stylesheet" href="/wdn/templates_5.1/css/deprecated.css"></noscript>';
+ $page->head .= '<link rel="preload" href="/wdn/templates_5.2/css/deprecated.css" as="style" onload="this.onload=null;this.rel=\'stylesheet\'"> <noscript><link rel="stylesheet" href="/wdn/templates_5.2/css/deprecated.css"></noscript>';
// no menu items, so hide mobile menu
$page->addStyleDeclaration("#dcf-mobile-toggle-menu {display: none!important}");
--
GitLab