baculum: Tweak fileset and runscript headers

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveFileSet.tpl b/gui/baculum/protected/Web/Portlets/DirectiveFileSet.tpl
index 3756c9d81f9583ae84f93f8708b45698f3ef0fa5..b1c696313af4d71fa02d95a1881aab6b46601a47 100644 (file)
--- 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 845699108bd65fd17249eee3c763f4bb2a263eb8..b0d4e64b5f3aa89e8bdea578fcae1d42f1a1c432 100644 (file)
--- 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 79df1be7754f02f59635eb828b0e58d85bd9d638..d9716035d14f7d69be1f0ba9962d071aef147aa0 100644 (file)
--- 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 3df83e5e52e3387f815a3791968f16605eb7b70c..35ca2805316bda72651e34bc7b52f078738f2bbc 100644 (file)
--- 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 ]%>