Compare revisions

Jeff Sturek · Jeff Sturek · Jeff Sturek · Eric Rasmussen · Jeff Sturek · Eric Rasmussen
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,10 @@
 /node_modules
 /.project
 /.settings
-/www/css
-/www/less/lib
 /www/wdn
 /.buildpath
 /vendor
 /tmp
 .DS_Store
 .idea
+/data/error_log.csv
\ No newline at end of file
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
+# To use this script, you must have the following variables defined
+# You can define them at the project or the group level
+#
+# SONAR_URL:   Full URL to the SonarQube server
+# SONAR_TOKEN: API token for SonarQube
+
+
+stages:
+  - Test
+  - Security
+  - QA
+
+
+PHP Lint:
+  stage: Test
+  image: its-registry.unl.edu/unl-its/docker-ci/php-lint:7.3
+  tags:
+    - docker
+  script:
+    - php-lint -d . -e .php -e .phtml
+
+Dependency Check:
+  stage: Security
+  image: its-registry.unl.edu/unl-its/docker-ci/dependency-check
+  tags:
+    - docker
+  cache:
+    policy: push
+    paths:
+      - dep_check
+  script:
+    - dependency-check -noupdate -f JSON -f XML -f HTML -s . -o ./dep_check --project "$CI_PROJECT_TITLE" --enableExperimental
+
+SonarQube:
+  stage: QA
+  image: its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:php
+  tags:
+    - docker
+  only:
+    - master
+  cache:
+    policy: pull
+    paths:
+      - dep_check
+  script:
+    - sonar-scanner -Dsonar.host.url=$SONAR_URL -Dsonar.login=$SONAR_TOKEN
+      -Dsonar.projectKey=$CI_PROJECT_PATH_SLUG -Dsonar.projectName="$CI_PROJECT_TITLE"
+      -Dsonar.sources=.
+      -Dsonar.dependencyCheck.reportPath=./dep_check/dependency-check-report.xml
+      -Dsonar.dependencyCheck.jsonReportPath=./dep_check/dependency-check-report.json
+      -Dsonar.dependencyCheck.htmlReportPath=./dep_check/dependency-check-report.html
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,7 +6,6 @@ module.exports = function (grunt) {
  var lessDir = 'www/less';
  var lessVendorDir = lessDir + '/lib';
  var sassDir = 'www/scss';
-//   var sassVendorDir = sassDir + '/mixins';
  var cssDir = 'www/css';
  var jsDir = 'www/js';

@@ -17,31 +16,9 @@ module.exports = function (grunt) {

  var jsFiles = [
    jsDir + '/search.js',
+    jsDir + '/search-tabs.js'
  ];

-  //TODO Update or remove for 5.0?
-  var wdnMixinLibBaseUrl = 'https://raw.githubusercontent.com/unl/wdntemplates/4.1/wdn/templates_4.1/less/_mixins/';
-  var wdnMixins = [
-    'breakpoints.less',
-    'colors.less',
-    'fonts.less',
-  ];
-  var allMixinsExist = every(wdnMixins, function(value) {
-    return fs.existsSync(lessVendorDir + '/' + value);
-  });
-
-// TODO: Import DCF and UNLedu 5.0 mixins and variables
-//   var dcfMixinLibBaseUrl = 'https://raw.githubusercontent.com/d-c-n/dcf/master/assets/dist/scss/mixins/';
-//   var dcfMixins = [
-//     '_mixins.backgrounds.scss',
-//     '_mixins.margins.scss',
-//     '_mixins.padding.scss',
-//     '_mixins.typography.scss'
-//   ];
-//   var allMixinsExist = every(dcfMixins, function(value) {
-//     return fs.existsSync(sassVendorDir + '/' + value);
-//   });
-
  var lessFiles = {};
  cssFiles.forEach(function(file) {
    lessFiles[cssDir + '/' + file + '.css'] = lessDir + '/' + file + '.less';
@@ -53,7 +30,8 @@ module.exports = function (grunt) {
  });

  var builtJsFiles = {};
-  builtJsFiles[jsDir + '/search.min.js'] = jsFiles;
+  builtJsFiles[jsDir + '/search.min.js'] = jsDir + '/search.js';
+  builtJsFiles[jsDir + '/search-tabs.min.js'] = jsDir + '/search-tabs.js';

  var autoprefixPlugin = new (require('less-plugin-autoprefix'))({browsers: ["last 2 versions"]});
  var cleanCssPlugin = new (require('less-plugin-clean-css'))();
@@ -63,22 +41,6 @@ module.exports = function (grunt) {

  grunt.initConfig({

-    'curl-dir': {
-      'less-libs': {
-        src: wdnMixins.map(function(file) {
-          return wdnMixinLibBaseUrl + file;
-        }),
-        dest: lessVendorDir
-      }
-//       'dcf-mixins': {
-//         src: dcfMixins.map(function(file) {
-//           return dcfMixinLibBaseUrl + file;
-//         }),
-//         dest: sassVendorDir
-//       }
-      // TODO: add UNLedu 5.0 mixins
-    },
-
    less: {
      all: {
        files: lessFiles,
@@ -98,9 +60,6 @@ module.exports = function (grunt) {
 				options: {
          implementation: sass,
 					sourceMap: true
-// 					includePaths: [
-// 						__dirname+'/node_modules/modularscale-sass/stylesheets'
-// 					]
 				}
 			},
    },
@@ -159,7 +118,6 @@ module.exports = function (grunt) {

    clean: {
      lessCss: Object.keys(lessFiles).concat(lessVendorDir),
-//       css: Object.keys(sassFiles).concat(sassVendorDir),
      sassCss: Object.keys(sassFiles),
      js: Object.keys(builtJsFiles).concat(jsDir + '/**/*.map')
    },
@@ -180,9 +138,6 @@ module.exports = function (grunt) {
  // establish grunt default
  var defaultTasks = ['less', 'sass', 'postcss', 'uglify', 'requirejs'];
  var localTasks = defaultTasks.slice();
-  if (!allMixinsExist) {
-    defaultTasks.unshift('curl-dir');
-  }
  grunt.registerTask('default', defaultTasks);
  grunt.registerTask('all-local', localTasks);


--- a/README.md
+++ b/README.md
+# THIS PROJECT HAS BEEN DEPRECATED AND WILL NO LONGER RECEIVE UPDATES
+
 This project runs the WDN search results engine.

 Three panels of results are shown, local site results, global results,

--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
    }
  },
  "require": {
-    "unl/php-wdn-templates": "^5.0",
+    "unl/php-wdn-templates": "^5.3",
    "ezyang/htmlpurifier": "^4.7"
  }
 }
--- 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": "da8d7d7163891b3718434cb4ef424d29",
    "packages": [
        {
            "name": "ezyang/htmlpurifier",
@@ -106,16 +106,16 @@
        },
        {
            "name": "unl/php-wdn-templates",
-            "version": "v5.0.0",
+            "version": "v5.3.4",
            "source": {
                "type": "git",
                "url": "https://github.com/unl/phpunltemplates.git",
-                "reference": "2928e588f409c2628bfeccb5293ab0dd34a506c5"
+                "reference": "845d8e05a6ae636797b350659f64b5f03b466166"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/unl/phpunltemplates/zipball/2928e588f409c2628bfeccb5293ab0dd34a506c5",
-                "reference": "2928e588f409c2628bfeccb5293ab0dd34a506c5",
+                "url": "https://api.github.com/repos/unl/phpunltemplates/zipball/845d8e05a6ae636797b350659f64b5f03b466166",
+                "reference": "845d8e05a6ae636797b350659f64b5f03b466166",
                "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,11 @@
            ],
            "description": "A PHP library for rendering the UNL templates",
            "homepage": "http://wdn.unl.edu/",
-            "time": "2018-12-12T16:32:30+00:00"
+            "support": {
+                "issues": "https://github.com/unl/phpunltemplates/issues",
+                "source": "https://github.com/unl/phpunltemplates/tree/v5.3.4"
+            },
+            "time": "2022-01-24T19:05:47+00:00"
        },
        {
            "name": "zaininnari/html-minifier",
@@ -258,6 +266,7 @@
                "code",
                "zf2"
            ],
+            "abandoned": "laminas/laminas-code",
            "time": "2016-04-20T17:26:42+00:00"
        },
        {
@@ -312,6 +321,7 @@
                "events",
                "zf2"
            ],
+            "abandoned": "laminas/laminas-eventmanager",
            "time": "2018-04-25T15:33:34+00:00"
        }
    ],
@@ -322,5 +332,6 @@
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": [],
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "2.1.0"
 }
--- a/config.sample.php
+++ b/config.sample.php
@@ -13,5 +13,13 @@ require __DIR__ . '/vendor/autoload.php';
 // the following key is only "valid" for http://ucommabel.unl.edu/workspace/UNL_Search/www/
 // UNL_Search::$jsapiKeys[] = 'ABQIAAAAGAtSvF89-VbesSJ07TEeoBTpxXZziuBpIcFFfJO7Mm8wj1oQWRRwVSIfGRIEAC9DlOSQX7rAAWHjhA';

-
 // UNL_Search::$mode = 'debug';
+
+// Site Notice
+$siteNotice = new stdClass();
+$siteNotice->display = false;
+$siteNotice->noticePath = 'dcf-notice';
+$siteNotice->containerID = 'dcf-main';
+$siteNotice->type = 'dcf-notice-info';
+$siteNotice->title = 'Maintenance Notice';
+$siteNotice->message = 'We will be performing site maintenance on February 4th from 4:30 to 5:00 pm CST.  This site may not be available during this time.';
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -6,20 +6,20 @@
  "devDependencies": {
    "autoprefixer": "^9.1.1",
    "cssnano": "^4.0.5",
-    "grunt": "^1.0.3",
+    "grunt": "^1.1.0",
    "grunt-contrib-clean": "^1.1.0",
    "grunt-contrib-less": "^2.0.0",
    "grunt-contrib-requirejs": "^1.0.0",
    "grunt-contrib-uglify": "^0.9.2",
    "grunt-contrib-watch": "^1.1.0",
-    "grunt-curl": "^2.2.0",
+    "grunt-curl": "^2.5.1",
    "grunt-postcss": "^0.9.0",
    "grunt-sass": "^3.0.1",
    "less-plugin-autoprefix": "^2.0.0",
    "less-plugin-clean-css": "^1.5.1",
    "load-grunt-tasks": "^3.2.0",
    "lodash": "^3.10.1",
-    "node-sass": "^4.9.3"
+    "node-sass": "^4.14.1"
  },
  "scripts": {},
  "repository": {

--- a/www/css/search-5.0.css
+++ b/www/css/search-5.0.css
+#wdn_search,.embed #visitorChat{display:none!important}.search-bg{background-image:url(../images/search-bg-640.jpg)}@media (min-width:640px){.search-bg{background-image:url(../images/search-bg-960.jpg)}}@media (min-width:960px){.search-bg{background-image:url(../images/search-bg-1280.jpg)}}@media (min-width:1280px){.search-bg{background-image:url(../images/search-bg-1920.jpg)}}@media (min-width:1920px){.search-bg{background-image:url(../images/search-bg-2560.jpg)}}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-resolution:2dppx),only screen and (min-resolution:192dpi){.search-bg{background-image:url(../images/search-bg-1280.jpg)}}@media only screen and (-webkit-min-device-pixel-ratio:2) and (min-width:640px),only screen and (min-resolution:2dppx) and (min-width:640px),only screen and (min-resolution:192dpi) and (min-width:640px){.search-bg{background-image:url(../images/search-bg-1920.jpg)}}@media only screen and (-webkit-min-device-pixel-ratio:2) and (min-width:960px),only screen and (min-resolution:2dppx) and (min-width:960px),only screen and (min-resolution:192dpi) and (min-width:960px){.search-bg{background-image:url(../images/search-bg-2560.jpg)}}.webp .search-bg{background-image:url(../images/search-bg-640.webp)}@media (min-width:640px){.webp .search-bg{background-image:url(../images/search-bg-960.webp)}}@media (min-width:960px){.webp .search-bg{background-image:url(../images/search-bg-1280.webp)}}@media (min-width:1280px){.webp .search-bg{background-image:url(../images/search-bg-1920.webp)}}@media (min-width:1920px){.webp .search-bg{background-image:url(../images/search-bg-2560.webp)}}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-resolution:2dppx),only screen and (min-resolution:192dpi){.webp .search-bg{background-image:url(../images/search-bg-1280.webp)}}@media only screen and (-webkit-min-device-pixel-ratio:2) and (min-width:640px),only screen and (min-resolution:2dppx) and (min-width:640px),only screen and (min-resolution:192dpi) and (min-width:640px){.webp .search-bg{background-image:url(../images/search-bg-1920.webp)}}@media only screen and (-webkit-min-device-pixel-ratio:2) and (min-width:960px),only screen and (min-resolution:2dppx) and (min-width:960px),only screen and (min-resolution:192dpi) and (min-width:960px){.webp .search-bg{background-image:url(../images/search-bg-2560.webp)}}#searchform .dcf-input-group{margin:0 auto;max-width:30em!important}.google-search,.search-results h3{display:none}.search-faux-tab{border-color:var(--b);margin-bottom:-1px}#directory_results .cInfo,#directory_results .overflow .roles .organization-name,#directory_results .result_head,#directory_results h3,#directory_results h4,[data-uid=kfarrell2] .given-name{display:none}#directory_results .dep_result,#directory_results .ppl_Sresult{margin-bottom:1.77em}#directory_results .overflow>.recordDetails{align-self:center;flex:1 1 auto}#directory_results .overflow .roles li{margin-bottom:.32em}#directory_results .overflow .roles:last-child{margin-bottom:0}#directory_results .overflow .roles .organization-unit,#directory_results .overflow .roles .title{display:block}#directory_results .given-name{font-size:1rem;margin-left:1em;text-transform:uppercase}
+/*# sourceMappingURL=search-5.0.css.map */
\ No newline at end of file
--- a/www/css/search-5.0.css.map
+++ b/www/css/search-5.0.css.map
+{"version":3,"sources":["../scss/search.scss"],"names":[],"mappings":"AAKA,gCAEE,sBAAwB,CACzB,AAID,WACE,iDAAoD,CAiBrD,AAfC,yBAHF,WAG8B,iDAAoD,CAejF,CAAA,AAdC,yBAJF,WAI8B,kDAAqD,CAclF,CAAA,AAbC,0BALF,WAK+B,kDAAqD,CAanF,CAAA,AAZC,0BANF,WAM+B,kDAAqD,CAYnF,CAAA,AAVC,yIARF,WAYI,kDAAqD,CAMxD,CAAA,AAJG,2MAdJ,WAcgC,kDAAqD,CAIpF,CAAA,AAHG,2MAfJ,WAegC,kDAAqD,CAGpF,CAAA,AAGD,iBACE,kDAAqD,CAiBtD,AAfC,yBAHF,iBAG8B,kDAAqD,CAelF,CAAA,AAdC,yBAJF,iBAI8B,mDAAsD,CAcnF,CAAA,AAbC,0BALF,iBAK+B,mDAAsD,CAapF,CAAA,AAZC,0BANF,iBAM+B,mDAAsD,CAYpF,CAAA,AAVC,yIARF,iBAYI,mDAAsD,CAMzD,CAAA,AAJG,2MAdJ,iBAcgC,mDAAsD,CAIrF,CAAA,AAHG,2MAfJ,iBAegC,mDAAsD,CAGrF,CAAA,AAGD,6BACE,cAAc,AACd,wBAAyB,CAC1B,AAED,kCAEC,YAAa,CACb,AAED,iBACE,sBAAsB,AACtB,kBAAmB,CACpB,AAID,8LAME,YAAa,CACd,AAGD,+DAEE,oBAAqB,CACtB,AAGD,4CACE,kBAAkB,AAClB,aAAc,CACf,AAGD,uCACE,mBAAoB,CACrB,AAGD,+CACE,eAAgB,CACjB,AAGD,kGAEE,aAAc,CACf,AAGD,+BACE,eAAe,AACf,gBAAgB,AAChB,wBAAyB,CAC1B","file":"search-5.0.css"}
\ No newline at end of file
--- a/www/css/search-google-5.0.css
+++ b/www/css/search-google-5.0.css
+.unl .gcsc-branding,.unl .gsc-table-cell-snippet-close .gs-title,.unl .gsc-url-bottom{display:none}.unl .google-results table,.unl .google-results tbody td,.unl .google-results tbody th{border:0!important}.unl .google-results tbody td,.unl .google-results tbody th{padding:0}.unl .gsc-control-cse{font-family:inherit;font-size:inherit}.unl .cse .gsc-control-cse,.unl .gsc-control-cse{background-color:transparent;border:0;padding:0}.unl .gsc-control-cse .gsc-table-result{display:flex;font-family:inherit;font-size:inherit;padding:0}.unl .gsc-above-wrapper-area{border:0;margin-bottom:2.37em;padding:0}.unl .gsc-result-info{font-size:inherit;margin:0;padding:0;color:var(--dark-gray)}.unl .gsc-webResult .gsc-result{border:0;padding-bottom:2.37em;padding-top:0}.unl .gsc-thumbnail-inside{padding-left:0}.unl .gs-promotion-image-box .gs-promotion-image,.unl .gs-result .gs-image,.unl .gs-result .gs-promotion-image,.unl .gs-web-image-box .gs-image{border:0}.unl .gsc-thumbnail-inside>.gs-title,.unl .gsc-thumbnail-inside>.gs-title *{color:var(--link);height:auto;text-decoration:none;line-height:1.25em}.unl .gsc-thumbnail-inside>.gs-title{font-size:1.5em;margin-bottom:.18em}.unl .gsc-thumbnail-inside>.gs-title *{font-size:1rem}.unl .gsc-thumbnail-left{display:block;margin-bottom:.43em}.unl .gs-snippet{margin-bottom:.43em}.unl .gsc-control-cse .gs-snippet{color:inherit}.unl .gs-promotion-image-box,.unl .gs-web-image-box{padding:0}.unl .gs-promotion-image-box img.gs-promotion-image,.unl .gs-web-image-box img.gs-image{height:4.21em;-o-object-fit:cover;object-fit:cover;width:4.21em}.unl .gs-image-box.gs-web-image-box.gs-web-image-box-landscape,.unl .gs-image-box.gs-web-image-box.gs-web-image-box-portrait,.unl .gs-promotion-image-box{margin-left:0;margin-right:1em;margin-top:.24em}.unl .gsc-result.gsc-webResult:hover{border:0}.unl .gsc-url-top{display:block;padding:0 0 1em;font-size:.75em}.unl .gsc-results .gsc-cursor-box{border-bottom:1px solid var(--b);border-radius:0;border-top:1px solid var(--b);margin:0 0 .75em;padding-bottom:.56em;padding-top:.56em}.unl .gsc-cursor-container-next,.unl .gsc-cursor-container-previous{padding:1em 0}.unl .gs-result .gs-visibleUrl,.unl .gsc-author .unl .gs-result a.gs-visibleUrl,.unl .gsc-location,.unl .gsc-org,.unl .gsc-reviewer,.unl .gsc-role,.unl .gsc-snippet-metadata,.unl .gsc-tel{color:var(--darker-gray)}.unl .gs-result .gs-visibleUrl,.unl .gs-result a.gs-visibleUrl{padding-bottom:0}.unl .gcsc-find-more-on-google-root{font-size:.84em;margin-top:1em;text-align:left}.unl .gcsc-more-maybe-branding-box{border:0;margin:0;padding:0}.unl .gcsc-find-more-on-google-magnifier,.unl .gsc-cursor{fill:var(--link)}.unl .gcsc-find-more-on-google,.unl .gs-spelling a,.unl .gsc-results .gsc-cursor-box .gsc-cursor-page{color:var(--link)}.unl .gsc-results .gsc-cursor-box .gsc-cursor-page.gsc-cursor-current-page{font-weight:700;text-decoration:underline}.unl .gs-spelling{color:var(--body);font-size:unset;padding:0}
+/*# sourceMappingURL=search-google-5.0.css.map */
\ No newline at end of file
--- a/www/css/search-google-5.0.css.map
+++ b/www/css/search-google-5.0.css.map
+{"version":3,"sources":["../scss/search-google.scss"],"names":[],"mappings":"AASA,sFAGE,YAAa,CACd,AAED,uFAGE,kBAAoB,CACrB,AAED,4DAEE,SAAU,CACX,AAED,sBAIE,oBAAoB,AACpB,iBAAkB,CAEnB,AAED,iDAPE,6BAA6B,AAC7B,SAAS,AAGT,SAAU,CAQX,AAED,wCACE,aAAa,AACb,oBAAoB,AACpB,kBAAkB,AAClB,SAAU,CACX,AAED,6BACE,SAAS,AAET,qBAAqB,AACrB,SAAU,CACX,AAED,sBACE,kBAAkB,AAClB,SAAS,AACT,UAAU,AACV,sBAAuB,CACxB,AAED,gCACE,SAAS,AAET,sBAAsB,AACtB,aAAc,CACf,AAED,2BACE,cAAe,CAChB,AAED,gJAIE,QAAS,CACV,AAED,4EAGE,kBAAkB,AAClB,YAAe,AACf,qBAAqB,AAErB,kBAAmB,CACpB,AAED,qCAEE,gBAAgB,AAChB,mBAAoB,CACrB,AAED,uCAEE,cAAe,CAChB,AAED,yBACE,cAAc,AAEd,mBAAoB,CACrB,AAED,iBAEE,mBAAoB,CACrB,AAED,kCACE,aAAc,CACf,AAED,oDAEE,SAAU,CACX,AAED,wFAEE,cAAc,AACd,oBAAiB,AAAjB,iBAAiB,AACjB,YAAa,CACd,AAED,0JAGE,cAAc,AACd,iBAAiB,AACjB,gBAAiB,CAClB,AAED,qCACE,QAAS,CACV,AAED,kBACE,cAAc,AACd,gBAAkB,AAElB,eAAgB,CACjB,AAcD,kCACE,iCAAiC,AACjC,gBAAgB,AAChB,8BAA8B,AAC9B,iBAAmB,AACnB,qBAAqB,AACrB,iBAAkB,CACnB,AAED,oEAEE,aAAc,CACf,AAED,4LASE,wBAAyB,CAC1B,AAED,+DAEE,gBAAiB,CAClB,AAED,oCACE,gBAAgB,AAChB,eAAe,AACf,eAAgB,CACjB,AAED,mCACE,SAAS,AACT,SAAS,AACT,SAAU,CACX,AAED,0DAEE,gBAAiB,CAClB,AAED,sGAGE,iBAAkB,CACnB,AAED,2EACE,gBAAiB,AACjB,yBAA0B,CAC3B,AAED,kBACE,kBAAkB,AAClB,gBAAgB,AAChB,SAAU,CACX","file":"search-google-5.0.css"}
\ No newline at end of file
--- a/www/css/search-google.css
+++ b/www/css/search-google.css
+.gsc-control-cse,.gsc-control-cse .gsc-table-result{font-family:inherit;font-size:inherit}.gsc-thumbnail-inside{padding-left:0;padding-right:0}.gsc-control-cse .gs-snippet{color:inherit}.gsc-thumbnail .gs-image-box{padding-right:.5em}.gsc-url-top{font-size:80%;padding-left:0;padding-right:0}.gsc-control-cse{padding:0}.gsc-webResult .gsc-result{border:0;padding:.75em 0}.gsc-result .gs-title{height:1.662em}.gsc-result.gsc-webResult:hover{border:none}.gs-result .gs-title,.gs-result .gs-title *{color:#d00000;text-decoration:none}.gs-result .gs-visibleUrl,.gs-result .gsc-url-top,.gs-result a.gs-visibleUrl{color:#554721}.gsc-result-info{font-style:italic;margin:0 0 10px;color:#5b5b5a}.gsc-results .gsc-cursor-box{border-top:1px solid #eae9e6;padding:1em 0 0;margin-top:1em;font-family:Gotham SSm A,Gotham SSm B,Verdana,sans-serif;font-weight:400;font-style:normal}.gsc-results .gsc-cursor-box .gsc-cursor-page{border:1px solid #eae9e6;padding:2px 8px;margin-bottom:1em;min-width:2.2em;display:inline-block;text-align:center;text-decoration:none;color:#d00000}.gsc-results .gsc-cursor-box .gsc-cursor-current-page{font-weight:400;color:#5b5b5a;border:0}.gcsc-branding{margin-bottom:1.3333em;display:none}td.gcsc-branding-text{font-style:italic;width:auto}td.gcsc-branding-text div.gcsc-branding-text{text-align:left;color:#5b5b5a}td.gcsc-branding-text-name{width:100%}.gs-promotion-image-box img.gs-promotion-image,.gs-web-image-box img.gs-image{max-width:100%;max-height:none}
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNlYXJjaC1nb29nbGUuY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFpQixvREFBb0Qsb0JBQW9CLGlCQUFpQixDQUFDLHNCQUFzQixlQUFlLGVBQWUsQ0FBQyw2QkFBNkIsYUFBYSxDQUFDLDZCQUE2QixrQkFBa0IsQ0FBQyxhQUFhLGNBQWMsZUFBZSxlQUFlLENBQUMsaUJBQWlCLFNBQVMsQ0FBQywyQkFBMkIsU0FBUyxlQUFlLENBQUMsc0JBQXNCLGNBQWMsQ0FBQyxnQ0FBZ0MsV0FBVyxDQUFDLDRDQUE0QyxjQUFjLG9CQUFvQixDQUFDLDZFQUE2RSxhQUFhLENBQUMsaUJBQWlCLGtCQUFrQixnQkFBZ0IsYUFBYSxDQUFDLDZCQUE2Qiw2QkFBNkIsZ0JBQWdCLGVBQWUseURBQTZELGdCQUFnQixpQkFBaUIsQ0FBQyw4Q0FBOEMseUJBQXlCLGdCQUFnQixrQkFBa0IsZ0JBQWdCLHFCQUFxQixrQkFBa0IscUJBQXFCLGFBQWEsQ0FBQyxzREFBc0QsZ0JBQWdCLGNBQWMsUUFBUSxDQUFDLGVBQWUsdUJBQXVCLFlBQVksQ0FBQyxzQkFBc0Isa0JBQWtCLFVBQVUsQ0FBQyw2Q0FBNkMsZ0JBQWdCLGFBQWEsQ0FBQywyQkFBMkIsVUFBVSxDQUFDLDhFQUE4RSxlQUFlLGVBQWUsQ0FBQyIsImZpbGUiOiJzZWFyY2gtZ29vZ2xlLmNzcyIsInNvdXJjZXNDb250ZW50IjpbIkBjaGFyc2V0IFwiVVRGLThcIjsuZ3NjLWNvbnRyb2wtY3NlLC5nc2MtY29udHJvbC1jc2UgLmdzYy10YWJsZS1yZXN1bHR7Zm9udC1mYW1pbHk6aW5oZXJpdDtmb250LXNpemU6aW5oZXJpdH0uZ3NjLXRodW1ibmFpbC1pbnNpZGV7cGFkZGluZy1sZWZ0OjA7cGFkZGluZy1yaWdodDowfS5nc2MtY29udHJvbC1jc2UgLmdzLXNuaXBwZXR7Y29sb3I6aW5oZXJpdH0uZ3NjLXRodW1ibmFpbCAuZ3MtaW1hZ2UtYm94e3BhZGRpbmctcmlnaHQ6LjVlbX0uZ3NjLXVybC10b3B7Zm9udC1zaXplOjgwJTtwYWRkaW5nLWxlZnQ6MDtwYWRkaW5nLXJpZ2h0OjB9LmdzYy1jb250cm9sLWNzZXtwYWRkaW5nOjB9LmdzYy13ZWJSZXN1bHQgLmdzYy1yZXN1bHR7Ym9yZGVyOjA7cGFkZGluZzouNzVlbSAwfS5nc2MtcmVzdWx0IC5ncy10aXRsZXtoZWlnaHQ6MS42NjJlbX0uZ3NjLXJlc3VsdC5nc2Mtd2ViUmVzdWx0OmhvdmVye2JvcmRlcjpub25lfS5ncy1yZXN1bHQgLmdzLXRpdGxlLC5ncy1yZXN1bHQgLmdzLXRpdGxlICp7Y29sb3I6I2QwMDAwMDt0ZXh0LWRlY29yYXRpb246bm9uZX0uZ3MtcmVzdWx0IC5ncy12aXNpYmxlVXJsLC5ncy1yZXN1bHQgLmdzYy11cmwtdG9wLC5ncy1yZXN1bHQgYS5ncy12aXNpYmxlVXJse2NvbG9yOiM1NTQ3MjF9LmdzYy1yZXN1bHQtaW5mb3tmb250LXN0eWxlOml0YWxpYzttYXJnaW46MCAwIDEwcHg7Y29sb3I6IzViNWI1YX0uZ3NjLXJlc3VsdHMgLmdzYy1jdXJzb3ItYm94e2JvcmRlci10b3A6MXB4IHNvbGlkICNlYWU5ZTY7cGFkZGluZzoxZW0gMCAwO21hcmdpbi10b3A6MWVtO2ZvbnQtZmFtaWx5OidHb3RoYW0gU1NtIEEnLCdHb3RoYW0gU1NtIEInLFZlcmRhbmEsc2Fucy1zZXJpZjtmb250LXdlaWdodDo0MDA7Zm9udC1zdHlsZTpub3JtYWx9LmdzYy1yZXN1bHRzIC5nc2MtY3Vyc29yLWJveCAuZ3NjLWN1cnNvci1wYWdle2JvcmRlcjoxcHggc29saWQgI2VhZTllNjtwYWRkaW5nOjJweCA4cHg7bWFyZ2luLWJvdHRvbToxZW07bWluLXdpZHRoOjIuMmVtO2Rpc3BsYXk6aW5saW5lLWJsb2NrO3RleHQtYWxpZ246Y2VudGVyO3RleHQtZGVjb3JhdGlvbjpub25lO2NvbG9yOiNkMDAwMDB9LmdzYy1yZXN1bHRzIC5nc2MtY3Vyc29yLWJveCAuZ3NjLWN1cnNvci1jdXJyZW50LXBhZ2V7Zm9udC13ZWlnaHQ6NDAwO2NvbG9yOiM1YjViNWE7Ym9yZGVyOjB9Lmdjc2MtYnJhbmRpbmd7bWFyZ2luLWJvdHRvbToxLjMzMzNlbTtkaXNwbGF5Om5vbmV9dGQuZ2NzYy1icmFuZGluZy10ZXh0e2ZvbnQtc3R5bGU6aXRhbGljO3dpZHRoOmF1dG99dGQuZ2NzYy1icmFuZGluZy10ZXh0IGRpdi5nY3NjLWJyYW5kaW5nLXRleHR7dGV4dC1hbGlnbjpsZWZ0O2NvbG9yOiM1YjViNWF9dGQuZ2NzYy1icmFuZGluZy10ZXh0LW5hbWV7d2lkdGg6MTAwJX0uZ3MtcHJvbW90aW9uLWltYWdlLWJveCBpbWcuZ3MtcHJvbW90aW9uLWltYWdlLC5ncy13ZWItaW1hZ2UtYm94IGltZy5ncy1pbWFnZXttYXgtd2lkdGg6MTAwJTttYXgtaGVpZ2h0Om5vbmV9Il19 */
\ No newline at end of file
--- a/www/css/search.css
+++ b/www/css/search.css
+#wdn_search,.embed #visitorChat{display:none!important}#search_results table,#search_results td{border:0;padding:0}#searchform{text-align:center;background:#38431b url(../images/050419.jpg) 50% 50% no-repeat;background-size:cover}#search_wrapper{display:none}.results-group:hover{background-color:#fff}.results-group:hover .result-head{background-color:#474746}.results-group .result-head{background-color:#50504f;color:#fff;position:relative}.results-group .result-head h2{color:inherit;margin:0}.result-tab{color:#d5d5d2;margin:0;padding:0;list-style:none;position:relative}.result-tab li{display:inline}.result-tab li.selected{color:#fff}.result-tab li a{color:inherit;border:0}.result-tab li:before{content:"\b7\a0"}.result-tab li:first-child:before{content:none}.result-tab:after{content:"";position:absolute;border-color:transparent transparent #fff;border-style:solid;border-width:0 6px 6px;bottom:-1.425em;left:0;transition:-webkit-transform .4s;transition:transform .4s;transition:transform .4s,-webkit-transform .4s}#directory_results .result-tab:after{-webkit-transform:translateX(1.3125em);transform:translateX(1.3125em)}#search_results .result-tab:after{-webkit-transform:translateX(1.875em);transform:translateX(1.875em)}#search_results .result-tab:after.no-local{-webkit-transform:translateX(2.2812em);transform:translateX(2.2812em)}#directory_results .result-tab.state-1:after{-webkit-transform:translateX(7em);transform:translateX(7em)}#search_results .result-tab.state-1:after{-webkit-transform:translateX(7.5312em);transform:translateX(7.5312em)}.embed,.search-set{margin:0;background:#fff}.search-results{transition:opacity .4s;opacity:0}.search-results.active{opacity:1}.search-results h3{display:none}.results-group{float:left;width:100%}#directory_results>*{padding:1.425em 9.375%}@media (min-width:48em){#directory_results{width:33.3333%}}.embed #directory_results{width:40%}#search_results>*{padding:1.425em 7.812%}@media (min-width:48em){#search_results{width:66.6667%}#search_results .result-head{border-right:1px solid #474746}#search_results .search-results{border-right:1px solid #f4f3f0}}.embed #search_results{width:60%}.embed #search_results .result-head{border-right:1px solid #474746}.embed #search_results .search-results{border-right:1px solid #f4f3f0}#ppl_results .result_head,#ppl_results h3,#ppl_results h4,.google-search{display:none}#ppl_results .pfResult{padding:0;list-style:none}#ppl_results .dep_result,#ppl_results .ppl_Sresult{margin:1em 0}#ppl_results .cInfo{display:none}#ppl_results .overflow{display:flex}#ppl_results .overflow>.profile_pic{width:40px;min-width:40px;margin-right:1em}#ppl_results .overflow>.recordDetails{flex:1 1 auto;align-self:center}#ppl_results .overflow .photo{border-radius:50%;margin-top:.375em;width:100%;height:40px;-o-object-fit:cover;object-fit:cover}#ppl_results .overflow .roles{padding:0;margin:0;list-style:none}#ppl_results .overflow .roles li{margin-bottom:.618rem}#ppl_results .overflow .roles li:last-child{margin-bottom:0}#ppl_results .overflow .roles .organization-unit,#ppl_results .overflow .roles .title{display:block}#ppl_results .overflow .roles .organization-name{display:none}#ppl_results .fn{font-size:1.128em;font-weight:700}#ppl_results .given-name{margin-left:1em;font-size:1rem;text-transform:uppercase;color:#5b5b5a}[data-uid=kfarrell2] .given-name{display:none}
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNlYXJjaC5jc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQWlCLGdDQUFnQyxzQkFBc0IsQ0FBQyx5Q0FBeUMsU0FBUyxTQUFTLENBQUMsWUFBWSxrQkFBa0IsK0RBQStELHFCQUFxQixDQUFDLGdCQUFnQixZQUFZLENBQUMscUJBQXFCLHFCQUFxQixDQUFDLGtDQUFrQyx3QkFBd0IsQ0FBQyw0QkFBNEIseUJBQXlCLFdBQVcsaUJBQWlCLENBQUMsK0JBQStCLGNBQWMsUUFBUSxDQUFDLFlBQVksY0FBYyxTQUFTLFVBQVUsZ0JBQWdCLGlCQUFpQixDQUFDLGVBQWUsY0FBYyxDQUFDLHdCQUF3QixVQUFVLENBQUMsaUJBQWlCLGNBQWMsUUFBUSxDQUFDLHNCQUFzQixnQkFBZ0IsQ0FBQyxrQ0FBa0MsWUFBWSxDQUFDLGtCQUFrQixXQUFXLGtCQUFrQixBQUEwQywwQ0FBMEMsQUFBMUMsbUJBQTBDLEFBQTFDLHVCQUEwQyxnQkFBZ0IsT0FBTyxBQUF5QyxpQ0FBaUMseUJBQXlCLDhDQUE4QyxDQUFDLHFDQUFxQyx1Q0FBdUMsOEJBQThCLENBQUMsa0NBQWtDLHNDQUFzQyw2QkFBNkIsQ0FBQywyQ0FBMkMsdUNBQXVDLDhCQUE4QixDQUFDLDZDQUE2QyxrQ0FBa0MseUJBQXlCLENBQUMsMENBQTBDLHVDQUF1Qyw4QkFBOEIsQ0FBQyxtQkFBbUIsU0FBUyxlQUFlLENBQUMsZ0JBQStDLHVCQUF1QixTQUFTLENBQUMsdUJBQXVCLFNBQVMsQ0FBQyxtQkFBbUIsWUFBWSxDQUFDLGVBQWUsV0FBVyxVQUFVLENBQUMscUJBQXFCLHNCQUFzQixDQUFDLHdCQUF3QixtQkFBbUIsY0FBYyxDQUFDLENBQUMsMEJBQTBCLFNBQVMsQ0FBQyxrQkFBa0Isc0JBQXNCLENBQUMsd0JBQXdCLGdCQUFnQixjQUFjLENBQUMsNkJBQTZCLDhCQUE4QixDQUFDLGdDQUFnQyw4QkFBOEIsQ0FBQyxDQUFDLHVCQUF1QixTQUFTLENBQUMsb0NBQW9DLDhCQUE4QixDQUFDLHVDQUF1Qyw4QkFBOEIsQ0FBQyxBQUE0Qix5RUFBMEQsWUFBWSxDQUFDLHVCQUF1QixVQUFVLGVBQWUsQ0FBQyxtREFBbUQsWUFBWSxDQUFDLG9CQUFvQixZQUFZLENBQUMsdUJBQStELFlBQVksQ0FBQyxvQ0FBb0MsV0FBVyxlQUFlLGdCQUFnQixDQUFDLHNDQUEyRSxjQUFjLEFBQTJCLGlCQUFpQixDQUFDLDhCQUE4QixrQkFBa0Isa0JBQWtCLFdBQVcsWUFBWSxvQkFBb0IsZ0JBQWdCLENBQUMsOEJBQThCLFVBQVUsU0FBUyxlQUFlLENBQUMsaUNBQWlDLHFCQUFxQixDQUFDLDRDQUE0QyxlQUFlLENBQUMsc0ZBQXNGLGFBQWEsQ0FBQyxpREFBaUQsWUFBWSxDQUFDLGlCQUFpQixrQkFBa0IsZUFBZSxDQUFDLHlCQUF5QixnQkFBZ0IsZUFBZSx5QkFBeUIsYUFBYSxDQUFDLGlDQUFpQyxZQUFZLENBQUMiLCJmaWxlIjoic2VhcmNoLmNzcyIsInNvdXJjZXNDb250ZW50IjpbIkBjaGFyc2V0IFwiVVRGLThcIjsjd2RuX3NlYXJjaCwuZW1iZWQgI3Zpc2l0b3JDaGF0e2Rpc3BsYXk6bm9uZSFpbXBvcnRhbnR9I3NlYXJjaF9yZXN1bHRzIHRhYmxlLCNzZWFyY2hfcmVzdWx0cyB0ZHtib3JkZXI6MDtwYWRkaW5nOjB9I3NlYXJjaGZvcm17dGV4dC1hbGlnbjpjZW50ZXI7YmFja2dyb3VuZDojMzg0MzFiIHVybCguLi9pbWFnZXMvMDUwNDE5LmpwZykgNTAlIDUwJSBuby1yZXBlYXQ7YmFja2dyb3VuZC1zaXplOmNvdmVyfSNzZWFyY2hfd3JhcHBlcntkaXNwbGF5Om5vbmV9LnJlc3VsdHMtZ3JvdXA6aG92ZXJ7YmFja2dyb3VuZC1jb2xvcjojZmZmfS5yZXN1bHRzLWdyb3VwOmhvdmVyIC5yZXN1bHQtaGVhZHtiYWNrZ3JvdW5kLWNvbG9yOiM0NzQ3NDZ9LnJlc3VsdHMtZ3JvdXAgLnJlc3VsdC1oZWFke2JhY2tncm91bmQtY29sb3I6IzUwNTA0Zjtjb2xvcjojZmZmO3Bvc2l0aW9uOnJlbGF0aXZlfS5yZXN1bHRzLWdyb3VwIC5yZXN1bHQtaGVhZCBoMntjb2xvcjppbmhlcml0O21hcmdpbjowfS5yZXN1bHQtdGFie2NvbG9yOiNkNWQ1ZDI7bWFyZ2luOjA7cGFkZGluZzowO2xpc3Qtc3R5bGU6bm9uZTtwb3NpdGlvbjpyZWxhdGl2ZX0ucmVzdWx0LXRhYiBsaXtkaXNwbGF5OmlubGluZX0ucmVzdWx0LXRhYiBsaS5zZWxlY3RlZHtjb2xvcjojZmZmfS5yZXN1bHQtdGFiIGxpIGF7Y29sb3I6aW5oZXJpdDtib3JkZXI6MH0ucmVzdWx0LXRhYiBsaTpiZWZvcmV7Y29udGVudDonXFxiN1xcYTAnfS5yZXN1bHQtdGFiIGxpOmZpcnN0LWNoaWxkOmJlZm9yZXtjb250ZW50Om5vbmV9LnJlc3VsdC10YWI6YWZ0ZXJ7Y29udGVudDonJztwb3NpdGlvbjphYnNvbHV0ZTtib3JkZXItc3R5bGU6c29saWQ7Ym9yZGVyLXdpZHRoOjAgNnB4IDZweDtib3JkZXItY29sb3I6dHJhbnNwYXJlbnQgdHJhbnNwYXJlbnQgI2ZmZjtib3R0b206LTEuNDI1ZW07bGVmdDowOy13ZWJraXQtdHJhbnNpdGlvbjotd2Via2l0LXRyYW5zZm9ybSAuNHM7dHJhbnNpdGlvbjotd2Via2l0LXRyYW5zZm9ybSAuNHM7dHJhbnNpdGlvbjp0cmFuc2Zvcm0gLjRzO3RyYW5zaXRpb246dHJhbnNmb3JtIC40cywtd2Via2l0LXRyYW5zZm9ybSAuNHN9I2RpcmVjdG9yeV9yZXN1bHRzIC5yZXN1bHQtdGFiOmFmdGVyey13ZWJraXQtdHJhbnNmb3JtOnRyYW5zbGF0ZVgoMS4zMTI1ZW0pO3RyYW5zZm9ybTp0cmFuc2xhdGVYKDEuMzEyNWVtKX0jc2VhcmNoX3Jlc3VsdHMgLnJlc3VsdC10YWI6YWZ0ZXJ7LXdlYmtpdC10cmFuc2Zvcm06dHJhbnNsYXRlWCgxLjg3NWVtKTt0cmFuc2Zvcm06dHJhbnNsYXRlWCgxLjg3NWVtKX0jc2VhcmNoX3Jlc3VsdHMgLnJlc3VsdC10YWI6YWZ0ZXIubm8tbG9jYWx7LXdlYmtpdC10cmFuc2Zvcm06dHJhbnNsYXRlWCgyLjI4MTJlbSk7dHJhbnNmb3JtOnRyYW5zbGF0ZVgoMi4yODEyZW0pfSNkaXJlY3RvcnlfcmVzdWx0cyAucmVzdWx0LXRhYi5zdGF0ZS0xOmFmdGVyey13ZWJraXQtdHJhbnNmb3JtOnRyYW5zbGF0ZVgoN2VtKTt0cmFuc2Zvcm06dHJhbnNsYXRlWCg3ZW0pfSNzZWFyY2hfcmVzdWx0cyAucmVzdWx0LXRhYi5zdGF0ZS0xOmFmdGVyey13ZWJraXQtdHJhbnNmb3JtOnRyYW5zbGF0ZVgoNy41MzEyZW0pO3RyYW5zZm9ybTp0cmFuc2xhdGVYKDcuNTMxMmVtKX0uZW1iZWQsLnNlYXJjaC1zZXR7bWFyZ2luOjA7YmFja2dyb3VuZDojZmZmfS5zZWFyY2gtcmVzdWx0c3std2Via2l0LXRyYW5zaXRpb246b3BhY2l0eSAuNHM7dHJhbnNpdGlvbjpvcGFjaXR5IC40cztvcGFjaXR5OjB9LnNlYXJjaC1yZXN1bHRzLmFjdGl2ZXtvcGFjaXR5OjF9LnNlYXJjaC1yZXN1bHRzIGgze2Rpc3BsYXk6bm9uZX0ucmVzdWx0cy1ncm91cHtmbG9hdDpsZWZ0O3dpZHRoOjEwMCV9I2RpcmVjdG9yeV9yZXN1bHRzPip7cGFkZGluZzoxLjQyNWVtIDkuMzc1JX1AbWVkaWEgKG1pbi13aWR0aDo0OGVtKXsjZGlyZWN0b3J5X3Jlc3VsdHN7d2lkdGg6MzMuMzMzMyV9fS5lbWJlZCAjZGlyZWN0b3J5X3Jlc3VsdHN7d2lkdGg6NDAlfSNzZWFyY2hfcmVzdWx0cz4qe3BhZGRpbmc6MS40MjVlbSA3LjgxMiV9QG1lZGlhIChtaW4td2lkdGg6NDhlbSl7I3NlYXJjaF9yZXN1bHRze3dpZHRoOjY2LjY2NjclfSNzZWFyY2hfcmVzdWx0cyAucmVzdWx0LWhlYWR7Ym9yZGVyLXJpZ2h0OjFweCBzb2xpZCAjNDc0NzQ2fSNzZWFyY2hfcmVzdWx0cyAuc2VhcmNoLXJlc3VsdHN7Ym9yZGVyLXJpZ2h0OjFweCBzb2xpZCAjZjRmM2YwfX0uZW1iZWQgI3NlYXJjaF9yZXN1bHRze3dpZHRoOjYwJX0uZW1iZWQgI3NlYXJjaF9yZXN1bHRzIC5yZXN1bHQtaGVhZHtib3JkZXItcmlnaHQ6MXB4IHNvbGlkICM0NzQ3NDZ9LmVtYmVkICNzZWFyY2hfcmVzdWx0cyAuc2VhcmNoLXJlc3VsdHN7Ym9yZGVyLXJpZ2h0OjFweCBzb2xpZCAjZjRmM2YwfS5nb29nbGUtc2VhcmNoe2Rpc3BsYXk6bm9uZX0jcHBsX3Jlc3VsdHMgLnJlc3VsdF9oZWFkLCNwcGxfcmVzdWx0cyBoMywjcHBsX3Jlc3VsdHMgaDR7ZGlzcGxheTpub25lfSNwcGxfcmVzdWx0cyAucGZSZXN1bHR7cGFkZGluZzowO2xpc3Qtc3R5bGU6bm9uZX0jcHBsX3Jlc3VsdHMgLmRlcF9yZXN1bHQsI3BwbF9yZXN1bHRzIC5wcGxfU3Jlc3VsdHttYXJnaW46MWVtIDB9I3BwbF9yZXN1bHRzIC5jSW5mb3tkaXNwbGF5Om5vbmV9I3BwbF9yZXN1bHRzIC5vdmVyZmxvd3tkaXNwbGF5Oi13ZWJraXQtYm94O2Rpc3BsYXk6LW1zLWZsZXhib3g7ZGlzcGxheTpmbGV4fSNwcGxfcmVzdWx0cyAub3ZlcmZsb3c+LnByb2ZpbGVfcGlje3dpZHRoOjQwcHg7bWluLXdpZHRoOjQwcHg7bWFyZ2luLXJpZ2h0OjFlbX0jcHBsX3Jlc3VsdHMgLm92ZXJmbG93Pi5yZWNvcmREZXRhaWxzey13ZWJraXQtYm94LWZsZXg6MTstbXMtZmxleDoxIDEgYXV0bztmbGV4OjEgMSBhdXRvOy1tcy1mbGV4LWl0ZW0tYWxpZ246Y2VudGVyO2FsaWduLXNlbGY6Y2VudGVyfSNwcGxfcmVzdWx0cyAub3ZlcmZsb3cgLnBob3Rve2JvcmRlci1yYWRpdXM6NTAlO21hcmdpbi10b3A6LjM3NWVtO3dpZHRoOjEwMCU7aGVpZ2h0OjQwcHg7LW8tb2JqZWN0LWZpdDpjb3ZlcjtvYmplY3QtZml0OmNvdmVyfSNwcGxfcmVzdWx0cyAub3ZlcmZsb3cgLnJvbGVze3BhZGRpbmc6MDttYXJnaW46MDtsaXN0LXN0eWxlOm5vbmV9I3BwbF9yZXN1bHRzIC5vdmVyZmxvdyAucm9sZXMgbGl7bWFyZ2luLWJvdHRvbTouNjE4cmVtfSNwcGxfcmVzdWx0cyAub3ZlcmZsb3cgLnJvbGVzIGxpOmxhc3QtY2hpbGR7bWFyZ2luLWJvdHRvbTowfSNwcGxfcmVzdWx0cyAub3ZlcmZsb3cgLnJvbGVzIC5vcmdhbml6YXRpb24tdW5pdCwjcHBsX3Jlc3VsdHMgLm92ZXJmbG93IC5yb2xlcyAudGl0bGV7ZGlzcGxheTpibG9ja30jcHBsX3Jlc3VsdHMgLm92ZXJmbG93IC5yb2xlcyAub3JnYW5pemF0aW9uLW5hbWV7ZGlzcGxheTpub25lfSNwcGxfcmVzdWx0cyAuZm57Zm9udC1zaXplOjEuMTI4ZW07Zm9udC13ZWlnaHQ6NzAwfSNwcGxfcmVzdWx0cyAuZ2l2ZW4tbmFtZXttYXJnaW4tbGVmdDoxZW07Zm9udC1zaXplOjFyZW07dGV4dC10cmFuc2Zvcm06dXBwZXJjYXNlO2NvbG9yOiM1YjViNWF9W2RhdGEtdWlkPWtmYXJyZWxsMl0gLmdpdmVuLW5hbWV7ZGlzcGxheTpub25lfSJdfQ== */
\ No newline at end of file
--- a/www/failCount.php
+++ b/www/failCount.php
+<?php
+
+// We only allow for post method
+if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+    http_response_code(405);
+    die();
+}
+
+// Gets the data
+date_default_timezone_set('America/Chicago');
+$date = date('Y-m-d H:i:s');
+
+// Gets the IP
+if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+    $ip = $_SERVER['HTTP_CLIENT_IP'];
+} elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+    $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+} else {
+    $ip = $_SERVER['REMOTE_ADDR'];
+}
+
+// Validates and gets the error message
+$valid_errors = array('Failed To Load', 'Recaptcha');
+if (isset($_POST['error']) && !empty($_POST['error']) && in_array($_POST['error'], $valid_errors)) {
+    $error = $_POST['error'];
+} else {
+    // If we do not have a valid error message we will die
+    http_response_code(400);
+    die();
+}
+
+// Writes to file
+file_put_contents(
+    "../data/error_log.csv",
+    $date . "," . $ip . "," . $error . "\n",
+    FILE_APPEND | LOCK_EX
+);
+
+
+// Sends back message if everything went ok
+header('Content-Type: application/json; charset=utf-8');
+http_response_code(200);
+echo json_encode(array('message' => "written"));
--- a/www/index.php
+++ b/www/index.php
 <?php
-
+$cacheVersion = date('Ymd') . 'v';
 $search_engine_id = '015236299699564929946:nk1siew10ie';

 $config_file = __DIR__ . '/../config.sample.php';
@@ -26,35 +26,46 @@ function loadDefaultSections($page)
    $page->affiliation = '';
 }

-$localScriptUrl = './js/search.min.js?v=20190116';
-
-if (UNL_Search::$mode === 'debug') {
-    $pageTemplate = 'Local';
-    $localScriptUrl = './js/search.js';
-}
-
 $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.3
 if ($isEmbed && $_GET['embed'] === '1') {
    $pageTemplate = 'Fixed';
    $page = Templates::factory($pageTemplate, Templates::VERSION_4_1);
    $templatePath = 'templates/4.1/';
-    $page->addStyleSheet('css/search.css?v=20180901');
+    $page->addStyleSheet('css/search.css?v=' . $cacheVersion);
+
+    $localScriptUrl = './js/search.min.js?v=' . $cacheVersion;
+
+    if (UNL_Search::$mode === 'debug') {
+        $pageTemplate = 'Local';
+        $localScriptUrl = './js/search.js';
+    }

 } else {
-    $pageTemplate = 'App';
-    $page = Templates::factory($pageTemplate, Templates::VERSION_5);
+    $pageTemplate = 'AppLocal';
+    $page = Templates::factory($pageTemplate, Templates::VERSION_5_3);
    $templatePath = 'templates/5.0/';

+    $localScriptUrl = './js/search-tabs.min.js?v=' . $cacheVersion;
+
+    if (UNL_Search::$mode === 'debug') {
+        $pageTemplate = 'Local';
+        $localScriptUrl = './js/search-tabs.js';
+    }
+
    if (!$isEmbed) {
-        if (file_exists(__DIR__ . '/wdn/templates_5.0')) {
+        if (file_exists(__DIR__ . '/wdn/templates_5.3')) {
            $page->setLocalIncludePath(__DIR__);
        }

+        if (isset($siteNotice) && $siteNotice->display) {
+            $page->displayDCFNoticeMessage($siteNotice->title, $siteNotice->message, $siteNotice->type, $siteNotice->noticePath, $siteNotice->containerID);
+        }
+
        $page->doctitle = '<title>Search | University of Nebraska&ndash;Lincoln</title>';
        $page->head .= '<link rel="home" href="./" />';

@@ -65,7 +76,7 @@ if ($isEmbed && $_GET['embed'] === '1') {
        $page->addStyleDeclaration("#dcf-mobile-toggle-search, #dcf-search {display: none!important}");
    }

-    $page->addStyleSheet('css/search-5.0.css?v=20180901');
+    $page->addStyleSheet('css/search-5.0.css?v=' . $cacheVersion);
 }

 $localResults = '';
@@ -121,7 +132,7 @@ if (isset($_GET['u']) && $scanned = UNL_Search::getScannedPage($_GET['u'])) {
    }

    $localResults = renderTemplate($templatePath . 'google-results.tpl.php', array(
-        'title' => $page->titlegraphic,
+        'title' => $page->titlegraphic, // leave for backwards compatibility for 4.1
        'id' => 'local_results',
    ));
 } elseif (!$isEmbed) {
@@ -140,7 +151,8 @@ if (!$isEmbed) {
 if ($isEmbed || !empty($_GET['q'])) {
    $maincontent .= renderTemplate($templatePath . 'search-results.tpl.php', array(
        'isEmbed' => $isEmbed,
-        'local_results' => $localResults
+        'local_results' => $localResults,
+        'localTitle' => $page->titlegraphic
    ));
 }

@@ -148,7 +160,8 @@ $endScript = renderTemplate($templatePath . 'end-scripts.tpl.php', array(
    'localScriptUrl' => $localScriptUrl,
    'googleLoaderUrl' => 'https://cse.google.com/cse.js?cx=' . $search_engine_id,
    'initialQuery' => $initialQuery,
-    'localContext' => $context
+    'localContext' => $context,
+    'cacheVersion' => $cacheVersion
 ));

 if ($isEmbed) {
@@ -171,5 +184,6 @@ if (UNL_Search::$mode === 'debug') {

 echo renderTemplate($template, array(
    'head' => $page->head,
-    'maincontent' => $maincontent
+    'maincontent' => $maincontent,
+    'cacheVersion' => $cacheVersion
 ));
--- a/www/js/.gitignore
+++ b/www/js/.gitignore
-/*.map
-/search.min.js
 /embed
--- a/www/js/embed-src/jquery.js
+++ b/www/js/embed-src/jquery.js
--- a/www/js/search-tabs.js
+++ b/www/js/search-tabs.js
No results found