From 4b3e9f7c8097238cf8d9163651d6eba0d737d395 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Mon, 4 Mar 2019 16:12:47 -0800
Subject: [PATCH 1/4] Bump version; update copyright dates

---
 CustomHeaderPlugin.inc.php       | 4 ++--
 CustomHeaderSettingsForm.inc.php | 4 ++--
 index.php                        | 4 ++--
 locale/da_DK/locale.xml          | 4 ++--
 locale/de_DE/locale.xml          | 4 ++--
 locale/en_US/locale.xml          | 4 ++--
 locale/es_ES/locale.xml          | 4 ++--
 locale/pt_PT/locale.xml          | 4 ++--
 templates/settingsForm.tpl       | 4 ++--
 version.xml                      | 8 ++++----
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/CustomHeaderPlugin.inc.php b/CustomHeaderPlugin.inc.php
index 5345ae7..c878086 100644
--- a/CustomHeaderPlugin.inc.php
+++ b/CustomHeaderPlugin.inc.php
@@ -3,8 +3,8 @@
 /**
  * @file CustomHeaderPlugin.inc.php
  *
- * Copyright (c) 2013-2018 Simon Fraser University
- * Copyright (c) 2003-2018 John Willinsky
+ * Copyright (c) 2013-2019 Simon Fraser University
+ * Copyright (c) 2003-2019 John Willinsky
  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
  *
  * @class CustomHeaderPlugin
diff --git a/CustomHeaderSettingsForm.inc.php b/CustomHeaderSettingsForm.inc.php
index 162957c..4cf4311 100644
--- a/CustomHeaderSettingsForm.inc.php
+++ b/CustomHeaderSettingsForm.inc.php
@@ -3,8 +3,8 @@
 /**
  * @file CustomHeaderSettingsForm.inc.php
  *
- * Copyright (c) 2013-2018 Simon Fraser University
- * Copyright (c) 2003-2018 John Willinsky
+ * Copyright (c) 2013-2019 Simon Fraser University
+ * Copyright (c) 2003-2019 John Willinsky
  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
  *
  * @class CustomHeaderSettingsForm
diff --git a/index.php b/index.php
index 9578aa1..01a8d60 100644
--- a/index.php
+++ b/index.php
@@ -7,8 +7,8 @@
 /**
  * @file index.php
  *
- * Copyright (c) 2013-2018 Simon Fraser University
- * Copyright (c) 2003-2018 John Willinsky
+ * Copyright (c) 2013-2019 Simon Fraser University
+ * Copyright (c) 2003-2019 John Willinsky
  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
  *
  * @ingroup plugins_generic_customHeader
diff --git a/locale/da_DK/locale.xml b/locale/da_DK/locale.xml
index ade4cfd..6138d62 100644
--- a/locale/da_DK/locale.xml
+++ b/locale/da_DK/locale.xml
@@ -4,8 +4,8 @@
 <!--
   * locale/da_DK/locale.xml
   *
-  * Copyright (c) 2013-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
+  * Copyright (c) 2013-2019 Simon Fraser University
+  * Copyright (c) 2003-2019 John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Javascript plugin localization strings
diff --git a/locale/de_DE/locale.xml b/locale/de_DE/locale.xml
index 4bb4915..b001f13 100644
--- a/locale/de_DE/locale.xml
+++ b/locale/de_DE/locale.xml
@@ -4,8 +4,8 @@
 <!--
   * locale/de_DE/locale.xml
   *
-  * Copyright (c) 2013-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
+  * Copyright (c) 2013-2019 Simon Fraser University
+  * Copyright (c) 2003-2019 John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Javascript plugin localization strings
diff --git a/locale/en_US/locale.xml b/locale/en_US/locale.xml
index 50041f7..f4d7b78 100644
--- a/locale/en_US/locale.xml
+++ b/locale/en_US/locale.xml
@@ -4,8 +4,8 @@
 <!--
   * locale/en_US/locale.xml
   *
-  * Copyright (c) 2013-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
+  * Copyright (c) 2013-2019 Simon Fraser University
+  * Copyright (c) 2003-2019 John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Javascript plugin localization strings
diff --git a/locale/es_ES/locale.xml b/locale/es_ES/locale.xml
index 0bcb340..dd7860a 100644
--- a/locale/es_ES/locale.xml
+++ b/locale/es_ES/locale.xml
@@ -4,8 +4,8 @@
 <!--
   * locale/es_ES/locale.xml
   *
-  * Copyright (c) 2013-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
+  * Copyright (c) 2013-2019 Simon Fraser University
+  * Copyright (c) 2003-2019 John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Javascript plugin localization strings
diff --git a/locale/pt_PT/locale.xml b/locale/pt_PT/locale.xml
index f6ddd6f..0f5e272 100644
--- a/locale/pt_PT/locale.xml
+++ b/locale/pt_PT/locale.xml
@@ -4,8 +4,8 @@
 <!--
   * locale/pt_PT/locale.xml
   *
-  * Copyright (c) 2014-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
+  * Copyright (c) 2014-2019 Simon Fraser University
+  * Copyright (c) 2003-2019 John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings.
diff --git a/templates/settingsForm.tpl b/templates/settingsForm.tpl
index 92e96b7..d9edf20 100644
--- a/templates/settingsForm.tpl
+++ b/templates/settingsForm.tpl
@@ -1,8 +1,8 @@
 {**
  * templates/settingsForm.tpl
  *
- * Copyright (c) 2013-2018 Simon Fraser University
- * Copyright (c) 2003-2018 John Willinsky
+ * Copyright (c) 2013-2019 Simon Fraser University
+ * Copyright (c) 2003-2019 John Willinsky
  * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
  *
  * Plugin settings
diff --git a/version.xml b/version.xml
index cb72fd4..b488f1d 100644
--- a/version.xml
+++ b/version.xml
@@ -4,8 +4,8 @@
 <!--
   * version.xml
   *
-  * Copyright (c) 2013-2018 Simon Fraser University
-  * Copyright (c) 2003-2018 John Willinsky
+  * Copyright (c) 2013-2019 Simon Fraser University
+  * Copyright (c) 2003-2019 John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Plugin version information.
@@ -13,8 +13,8 @@
 <version>
 	<application>customHeader</application>
 	<type>plugins.generic</type>
-	<release>1.0.0.0</release>
-	<date>2017-02-03</date>
+	<release>1.0.1.0</release>
+	<date>2019-03-04</date>
 	<lazy-load>1</lazy-load>
 	<class>CustomHeaderPlugin</class>
 </version>

From 6fae2f3dc0632f3ac81b10ca84b19ad8a3064038 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Mon, 4 Mar 2019 16:41:03 -0800
Subject: [PATCH 2/4] Fixed footer content label

---
 templates/settingsForm.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/settingsForm.tpl b/templates/settingsForm.tpl
index d9edf20..6aa0534 100644
--- a/templates/settingsForm.tpl
+++ b/templates/settingsForm.tpl
@@ -31,7 +31,7 @@
 	{/fbvFormArea}
 
 	{fbvFormArea id="customHeaderSettingsFormArea"}
-		{fbvFormSection for="footerContent" title="plugins.generic.customHeader.content"}
+		{fbvFormSection for="footerContent" title="plugins.generic.customHeader.footerContent"}
 			{fbvElement type="textarea" name="footerContent" id="footerContent" value=$footerContent height=$fbvStyles.height.TALL}
 		{/fbvFormSection}
 	{/fbvFormArea}

From c562e051f993b5c77cae508e45995328b4e497c3 Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Thu, 21 Mar 2019 17:56:44 -0700
Subject: [PATCH 3/4] pkp/pkp-lib#4545 Update tests for new WebDriver toolset

---
 .../functional/CustomHeaderFunctionalTest.php | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/tests/functional/CustomHeaderFunctionalTest.php b/tests/functional/CustomHeaderFunctionalTest.php
index 46d86fe..29dc959 100644
--- a/tests/functional/CustomHeaderFunctionalTest.php
+++ b/tests/functional/CustomHeaderFunctionalTest.php
@@ -15,6 +15,10 @@
 
 import('lib.pkp.tests.WebTestCase');
 
+use Facebook\WebDriver\Interactions\WebDriverActions;
+use Facebook\WebDriver\WebDriverExpectedCondition;
+use Facebook\WebDriver\WebDriverBy;
+
 class CustomHeaderFunctionalTest extends WebTestCase {
 	/**
 	 * Enable and exercise the plugin
@@ -23,19 +27,21 @@ function testCustomHeader() {
 		$this->open(self::$baseUrl);
 
 		$this->logIn('admin', 'admin');
-		$this->waitForElementPresent($selector='link=Website');
-		$this->clickAndWait($selector);
-		$this->click('link=Plugins');
+		$actions = new WebDriverActions(self::$driver);
+		$actions->moveToElement($this->waitForElementPresent('//ul[@id="navigationPrimary"]//a[contains(text(),"Settings")]'))
+			->click($this->waitForElementPresent('//ul[@id="navigationPrimary"]//a[contains(text(),"Website")]'))
+			->perform();
+		$this->click('//a[text()="Plugins"]');
 
 		// Find and enable the plugin
-		$this->waitForElementPresent($selector = '//input[starts-with(@id, \'select-cell-customheaderplugin-enabled\')]');
-		$this->assertElementNotPresent('link=Custom Header Plugin'); // Plugin should be disabled
-		$this->click($selector); // Enable plugin
+		$this->click('//input[starts-with(@id, \'select-cell-customheaderplugin-enabled\')]');
 		$this->waitForElementPresent('//div[contains(.,\'The plugin "Custom Header Plugin" has been enabled.\')]');
+		sleep(1);
 
 		// Edit the plugin settings
-		$this->waitForElementPresent($selector='//a[contains(@id,\'customheaderplugin-settings\')]');
-		$this->click($selector);
+		self::$driver->executeScript('window.scroll(0,-50);'); // FIXME: Give it an extra margin of pixels
+		$this->click('//tr[contains(@id,"customheaderplugin")]//a[contains(@class,"show_extras")]');
+		$this->click('//a[contains(@id,\'customheaderplugin-settings\')]');
 		$this->waitForElementPresent($selector='//textarea[starts-with(@id, \'headerContent-\')]');
 		$this->type($selector, '<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>');
 		$this->type('//textarea[starts-with(@id, \'footerContent-\')]', '<a class="twitter-timeline" href="https://twitter.com/pkp?ref_src=twsrc%5Etfw">Tweets by pkp</a>');
@@ -43,7 +49,7 @@ function testCustomHeader() {
 		$this->waitForElementPresent('//div[contains(.,\'Your changes have been saved.\')]');
 
 		// Check that a Twitter timeline appears on the homepage.
-		sleep(5);
+		sleep(1);
 		$this->open(self::$baseUrl);
 		$this->waitForElementPresent('//script[@src=\'https://platform.twitter.com/widgets.js\']');
 		$this->waitForElementPresent('//iframe[contains(@id,\'twitter-widget\')]');

From 57b0ea31a798a36ed5d18fc7f9dadbdd4dddf21b Mon Sep 17 00:00:00 2001
From: Alec Smecher <alec@smecher.bc.ca>
Date: Thu, 21 Mar 2019 18:03:43 -0700
Subject: [PATCH 4/4] Remove logout test from build process

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 293c4c7..e83afe1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,6 @@ install:
   # Install OJS/OMP & prep data environment
   - lib/pkp/lib/vendor/phpunit/phpunit/phpunit --configuration lib/pkp/tests/phpunit-env1.xml tests/data/10-InstallationTest.php
   - lib/pkp/lib/vendor/phpunit/phpunit/phpunit --configuration lib/pkp/tests/phpunit-env1.xml tests/data/20-CreateContextTest.php
-  - lib/pkp/lib/vendor/phpunit/phpunit/phpunit --configuration lib/pkp/tests/phpunit-env1.xml tests/data/59-LogOutTest.php
   - lib/pkp/tools/travis/dump-database.sh
 script:
   - set +xe