diff --git a/composer.json b/composer.json index 5cd5855808e23a8b3a62c0396771f365dd9cf9c8..767eb2bbc31c2fd51d748c669f2cf9779d7725f2 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ } }, "require": { - "unl/php-wdn-templates": "^5.0", + "unl/php-wdn-templates": "^5.1", "ezyang/htmlpurifier": "^4.7" } } diff --git a/composer.lock b/composer.lock index f50ad29b888ea3e268be5a6bd5ed80650c0773f9..8897e5eba834bf6802f19579a84610ee69ce88b7 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": "5b4d3f4300c7da1219010337c3541456", + "content-hash": "ee7a16fee0840a658c0ca7f8fd37f46a", "packages": [ { "name": "ezyang/htmlpurifier", @@ -106,16 +106,16 @@ }, { "name": "unl/php-wdn-templates", - "version": "v5.0.0", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/unl/phpunltemplates.git", - "reference": "2928e588f409c2628bfeccb5293ab0dd34a506c5" + "reference": "44e42acb1252e41569810660998adb00d108aa06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/unl/phpunltemplates/zipball/2928e588f409c2628bfeccb5293ab0dd34a506c5", - "reference": "2928e588f409c2628bfeccb5293ab0dd34a506c5", + "url": "https://api.github.com/repos/unl/phpunltemplates/zipball/44e42acb1252e41569810660998adb00d108aa06", + "reference": "44e42acb1252e41569810660998adb00d108aa06", "shasum": "" }, "require": { @@ -123,8 +123,7 @@ "unl/php-dwt-parser": "1.0.*" }, "require-dev": { - "phpunit/phpunit": "~4.0", - "satooshi/php-coveralls": "^0.7.0" + "phpunit/phpunit": "~5.0" }, "type": "library", "autoload": { @@ -137,10 +136,15 @@ "BSD-3-Clause" ], "authors": [ + { + "name": "Jeff Sturek (jsturek)", + "email": "jsturek8@unl.edu", + "role": "Developer" + }, { "name": "Kevin Abel (kabel)", "email": "kabel2@unl.edu", - "role": "Developer" + "role": "Retired Developer" }, { "name": "Brett Bieber (saltybeagle)", @@ -155,7 +159,7 @@ ], "description": "A PHP library for rendering the UNL templates", "homepage": "http://wdn.unl.edu/", - "time": "2018-12-12T16:32:30+00:00" + "time": "2020-03-11T16:55:17+00:00" }, { "name": "zaininnari/html-minifier", @@ -258,6 +262,7 @@ "code", "zf2" ], + "abandoned": "laminas/laminas-code", "time": "2016-04-20T17:26:42+00:00" }, { @@ -312,6 +317,7 @@ "events", "zf2" ], + "abandoned": "laminas/laminas-eventmanager", "time": "2018-04-25T15:33:34+00:00" } ], diff --git a/www/index.php b/www/index.php index dc4d73c1a934ef914c6885fe6326d8733b303ab6..85b18bf675ff593a89e103522596aee7b79b55f0 100644 --- a/www/index.php +++ b/www/index.php @@ -38,7 +38,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=5.0 : 5.0 +// ?embed=(not 1) : 5.1 if ($isEmbed && $_GET['embed'] === '1') { $pageTemplate = 'Fixed'; $page = Templates::factory($pageTemplate, Templates::VERSION_4_1); @@ -46,12 +46,12 @@ if ($isEmbed && $_GET['embed'] === '1') { $page->addStyleSheet('css/search.css?v=20180901'); } else { - $pageTemplate = 'App'; - $page = Templates::factory($pageTemplate, Templates::VERSION_5); + $pageTemplate = 'AppLocal'; + $page = Templates::factory($pageTemplate, Templates::VERSION_5_1); $templatePath = 'templates/5.0/'; if (!$isEmbed) { - if (file_exists(__DIR__ . '/wdn/templates_5.0')) { + if (file_exists(__DIR__ . '/wdn/templates_5.1')) { $page->setLocalIncludePath(__DIR__); } @@ -59,7 +59,7 @@ if ($isEmbed && $_GET['embed'] === '1') { $page->head .= '<link rel="home" href="./" />'; // Add WDN Deprecated Styles - $page->head .= '<link rel="preload" href="https://unlcms.unl.edu/wdn/templates_5.0/css/deprecated.css" as="style" onload="this.onload=null;this.rel=\'stylesheet\'"> <noscript><link rel="stylesheet" href="https://unlcms.unl.edu/wdn/templates_5.0/css/deprecated.css"></noscript>'; + $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>'; // no menu items, so hide mobile menu