From 7e516b541dd92691ad490e1fb6efae123599cd85 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 11 Mar 2018 18:09:13 +0100
Subject: [PATCH 1/5] regen pageheader messages.po

---
 pageheader/lang/C/messages.po | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pageheader/lang/C/messages.po b/pageheader/lang/C/messages.po
index e0fdbb35..9c3f7989 100644
--- a/pageheader/lang/C/messages.po
+++ b/pageheader/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2018-03-11 18:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pageheader.php:50
+#: pageheader.php:52
 msgid "\"pageheader\" Settings"
 msgstr ""
 
-#: pageheader.php:55
-msgid "Submit"
+#: pageheader.php:54
+msgid ""
+"Message to display on every page on this server (or put a pageheader.html "
+"file in your docroot)"
 msgstr ""
 
-#: pageheader.php:68
+#: pageheader.php:58
+msgid "Save Settings"
+msgstr ""
+
+#: pageheader.php:71
 msgid "pageheader Settings saved."
 msgstr ""

From eec360c9c86f961d69e0845b980db217782c7489 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 11 Mar 2018 18:52:47 +0100
Subject: [PATCH 2/5] regen pageheader messages.po

---
 pageheader/lang/C/messages.po | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pageheader/lang/C/messages.po b/pageheader/lang/C/messages.po
index 9c3f7989..f8958d2f 100644
--- a/pageheader/lang/C/messages.po
+++ b/pageheader/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-11 18:08+0100\n"
+"POT-Creation-Date: 2018-03-11 18:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,20 +17,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pageheader.php:52
+#: pageheader.php:53
 msgid "\"pageheader\" Settings"
 msgstr ""
 
+#: pageheader.php:54
+msgid "Message"
+msgstr ""
+
 #: pageheader.php:54
 msgid ""
 "Message to display on every page on this server (or put a pageheader.html "
 "file in your docroot)"
 msgstr ""
 
-#: pageheader.php:58
+#: pageheader.php:55
 msgid "Save Settings"
 msgstr ""
 
-#: pageheader.php:71
+#: pageheader.php:69
 msgid "pageheader Settings saved."
 msgstr ""

From 5c64ee11cfec90b752766a63f687e53616efcb50 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 11 Mar 2018 18:53:21 +0100
Subject: [PATCH 3/5] moved pageheader settings to template

---
 pageheader/templates/settings.tpl | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 pageheader/templates/settings.tpl

diff --git a/pageheader/templates/settings.tpl b/pageheader/templates/settings.tpl
new file mode 100644
index 00000000..55887cb5
--- /dev/null
+++ b/pageheader/templates/settings.tpl
@@ -0,0 +1,14 @@
+<span id="settings_pageheader_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_pageheader_expanded'); openClose('settings_pageheader_inflated');">
+	<h3>{{$title}}</h3>
+</span>
+<div id="settings_pageheader_expanded" class="settings-block" style="display: none;">
+	<span class="fakelink" onclick="openClose('settings_pageheader_expanded'); openClose('settings_pageheader_inflated');">
+		<h3>{{$title}}</h3>
+	</span>
+	{{include file="field_textarea.tpl" field=$phwords}}
+
+<div class="settings-submit-wrapper" >
+	<input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="{{$submit}}" />
+</div>
+</div>
+<div class="clear"></div>

From b0e0821d072db0156db55541ab502d0caa80bff1 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 11 Mar 2018 18:54:01 +0100
Subject: [PATCH 4/5] addon should be commited as well

---
 pageheader/pageheader.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index 7b692416..eb121fb5 100644
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -48,14 +48,12 @@ function pageheader_addon_settings(&$a,&$s) {
 	if(! $words)
 		$words = '';
 
-    $s .= '<div class="settings-block">';
-    $s .= '<h3>' . L10n::t('"pageheader" Settings') . '</h3>';
-    $s .= '<div id="pageheader-wrapper">';
-    $s .= '<label id="pageheader-label" for="pageheader-words">' . L10n::t('Message to display on every page on this server (or put a pageheader.html file in your docroot)') . ' </label>';
-    $s .= '<textarea id="pageheader-words" type="text" name="pageheader-words">' . $words . '</textarea>';
-    $s .= '</div><div class="clear"></div>';
-
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+	$t = get_markup_template("settings.tpl", "addon/pageheader/");
+	$s .= replace_macros($t, [
+					'$title' => L10n::t('"pageheader" Settings'),
+					'$phwords' => ['pageheader-words', L10n::t('Message'), $words, L10n::t('Message to display on every page on this server (or put a pageheader.html file in your docroot)')],
+					'$submit' => L10n::t('Save Settings')
+	]);
 
 	return;
 

From 83425a7f269e57cf9d3959da59bfd4191e86ee91 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 11 Mar 2018 18:58:33 +0100
Subject: [PATCH 5/5] indentation

---
 pageheader/templates/settings.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pageheader/templates/settings.tpl b/pageheader/templates/settings.tpl
index 55887cb5..db1a4093 100644
--- a/pageheader/templates/settings.tpl
+++ b/pageheader/templates/settings.tpl
@@ -7,8 +7,8 @@
 	</span>
 	{{include file="field_textarea.tpl" field=$phwords}}
 
-<div class="settings-submit-wrapper" >
-	<input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="{{$submit}}" />
-</div>
+	<div class="settings-submit-wrapper" >
+		<input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="{{$submit}}" />
+	</div>
 </div>
 <div class="clear"></div>