From fa4953681d1376974627db45f1f0b3a244ded042 Mon Sep 17 00:00:00 2001
From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 14 Nov 2021 11:27:01 +0100
Subject: [PATCH] baculum: Tweak fileset and runscript headers

---
 gui/baculum/protected/Web/Portlets/DirectiveFileSet.tpl     | 3 +--
 gui/baculum/protected/Web/Portlets/DirectiveRunscript.tpl   | 1 -
 gui/baculum/protected/Web/Portlets/JobRunscriptRenderer.php | 2 +-
 gui/baculum/protected/Web/Portlets/NewRunscriptMenu.tpl     | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveFileSet.tpl b/gui/baculum/protected/Web/Portlets/DirectiveFileSet.tpl
index 3756c9d81..b1c696313 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveFileSet.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveFileSet.tpl
@@ -3,7 +3,7 @@
 <com:TActiveRepeater ID="RepeaterFileSetIncludes" OnItemDataBound="createFileSetIncludes">
 	<prop:ItemTemplate>
 		<div class="w3-card-4 w3-padding w3-margin-bottom directive incexc">
-			<h2><%#$this->SourceTemplateControl->getDirectiveName()%> #<%#$this->ItemIndex + 1%></h2>
+			<h3><%#$this->SourceTemplateControl->getDirectiveName()%> #<%#$this->ItemIndex + 1%></h3>
 			<button type="button" onmousedown="openElementOnCursor(event, '<%=$this->FileSetFileOptMenu->ClientID%>_new_fileset', 0, 20);" class="w3-button w3-green w3-margin-bottom"><i class="fa fa-plus"></i> &nbsp;<%[ Add ]%></button>
 			<com:Application.Web.Portlets.NewFileSetFileOptMenu ID="FileSetFileOptMenu" FileSetBrowserId="<%=$this->SourceTemplateControl->FSBrowser->ClientID%>" />
 		<com:TActiveRepeater
@@ -12,7 +12,6 @@
 		>
 			<prop:HeaderTemplate>
 				<div class="w3-border w3-padding w3-margin-bottom directive">
-					<h2><%[ Options ]%></h2>
 			</prop:HeaderTemplate>
 			<prop:FooterTemplate>
 				</div>
diff --git a/gui/baculum/protected/Web/Portlets/DirectiveRunscript.tpl b/gui/baculum/protected/Web/Portlets/DirectiveRunscript.tpl
index 845699108..b0d4e64b5 100644
--- a/gui/baculum/protected/Web/Portlets/DirectiveRunscript.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveRunscript.tpl
@@ -3,7 +3,6 @@
 <com:TActiveRepeater ID="RepeaterRunscriptOptions" ItemRenderer="Application.Web.Portlets.JobRunscriptRenderer">
 	<prop:HeaderTemplate>
 		<div class="w3-card-4 w3-padding w3-margin-bottom directive runscript">
-			<h2>Runscript</h2>
 	</prop:HeaderTemplate>
 	<prop:FooterTemplate>
 		</div>
diff --git a/gui/baculum/protected/Web/Portlets/JobRunscriptRenderer.php b/gui/baculum/protected/Web/Portlets/JobRunscriptRenderer.php
index 79df1be77..d9716035d 100644
--- a/gui/baculum/protected/Web/Portlets/JobRunscriptRenderer.php
+++ b/gui/baculum/protected/Web/Portlets/JobRunscriptRenderer.php
@@ -56,7 +56,7 @@ class JobRunscriptRenderer extends DirectiveRenderer {
 
 	public function render($writer) {
 		if (self::$render_index % self::DIRECTIVE_COUNT === 0) {
-			$writer->write('<h3 class="w3-left runscript_options">Runscript #' . ((self::$render_index / self::DIRECTIVE_COUNT) + 1) . '</h3><hr />');
+			$writer->write('<h3 class="w3-left runscript_options">Runscript #' . ((self::$render_index / self::DIRECTIVE_COUNT) + 1) . '</h3>');
 		}
 		self::$render_index++;
 
diff --git a/gui/baculum/protected/Web/Portlets/NewRunscriptMenu.tpl b/gui/baculum/protected/Web/Portlets/NewRunscriptMenu.tpl
index 3df83e5e5..35ca28053 100644
--- a/gui/baculum/protected/Web/Portlets/NewRunscriptMenu.tpl
+++ b/gui/baculum/protected/Web/Portlets/NewRunscriptMenu.tpl
@@ -4,7 +4,7 @@
 		<li><com:TActiveLinkButton
 			ID="RunscriptItem"
 			OnCommand="Parent.SourceTemplateControl.newRunscriptDirective"
-			ClientSide.OnComplete="var el = $('#<%=$this->RunscriptItem->ClientID%>').parents('div').find('h3.runscript_options'); BaculaConfig.scroll_to_element(el[el.length-1]);"
+			ClientSide.OnComplete="var el = $('#<%=$this->RunscriptItem->ClientID%>').parents('div').find('h3.runscript_options'); BaculaConfig.scroll_to_element(el[el.length-1], -40);"
 			Attributes.onclick="$(this).closest('div.config_new_runscript').hide();"
 			>
 			<i class='fa fa-plus'></i> &nbsp;<%[ Add Runscript block ]%>
-- 
2.47.3