From 6d72b58b02639148eccb9d75973f5f882731a884 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Tue, 7 Jan 2020 16:01:27 -0500
Subject: [PATCH 1/7] pure whitespace changes

---
 .../scripts/ScriptApproval/index.jelly        | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
index 6a9ed46b9..ce0cc251b 100644
--- a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
@@ -87,8 +87,11 @@ THE SOFTWARE.
                         /*
                            Create a list like:
                             <p id="pcp-${pcp.hash}">
-                                <button class="approve" onclick="approveClasspathEntry('${pcp.hash}')">Approve</button> /
-                                <button class="deny"    onclick="denyClasspathEntry('${pcp.hash}')">Deny</button> 
+                                <button class="approve" onclick="approveClasspathEntry('${pcp.hash}')"
+                                >Approve</button>
+                                /
+                                <button class="deny"    onclick="denyClasspathEntry('${pcp.hash}')"
+                                >Deny</button>
                                 ${pcp.hash} (${pcp.path})
                             </p>
                          */
@@ -126,7 +129,8 @@ THE SOFTWARE.
                         /*
                            Create a list like:
                             <p id="acp-${acp.hash}">
-                                <button class="delete" onclick="denyApprovedClasspathEntry('${pcp.hash}')">Delete</button> 
+                                <button class="delete" onclick="denyApprovedClasspathEntry('${pcp.hash}')"
+                                >Delete</button>
                                 ${acp.hash} (${acp.path})
                             </p>
                          */
@@ -191,7 +195,12 @@ THE SOFTWARE.
                     <j:forEach var="ps" items="${it.pendingScripts}">
                         <div id="ps-${ps.hash}" class="pending-script">
                             <p class="ps-context">
-                                <button class="approve" onclick="approveScript('${ps.hash}')">Approve</button> / <button class="deny" onclick="denyScript('${ps.hash}')">Deny</button> ${ps.language.displayName} script
+                                <button class="approve" onclick="approveScript('${ps.hash}')"
+                                >Approve</button>
+                                /
+                                <button class="deny" onclick="denyScript('${ps.hash}')"
+                                >Deny</button>
+                                ${ps.language.displayName} script
                                 <st:include it="${ps.context}" page="index.jelly"/>:
                             </p>
                             <f:textarea readonly="readonly" codemirror-mode="${ps.language.codeMirrorMode}" codemirror-config='"readOnly": true' rows="10" cols="80" value="${ps.script}"/>
@@ -214,11 +223,17 @@ THE SOFTWARE.
                     <j:forEach var="s" items="${it.pendingSignatures}">
                         <div id="s-${s.hash}">
                             <p>
-                                <button onclick="approveSignature('${s.signature}', '${s.hash}')">Approve</button> /
+                                <button onclick="approveSignature('${s.signature}', '${s.hash}')"
+                                >Approve</button>
+                                /
                                 <j:if test="${!s.signature.startsWith('field')}">
-                                    <button onclick="aclApproveSignature('${s.signature}', '${s.hash}')">Approve assuming permission check</button> /
+                                    <button onclick="aclApproveSignature('${s.signature}', '${s.hash}')"
+                                    >Approve assuming permission check</button>
+                                    /
                                 </j:if>
-                                <button onclick="denySignature('${s.signature}', '${s.hash}')">Deny</button> signature
+                                <button onclick="denySignature('${s.signature}', '${s.hash}')"
+                                >Deny</button>
+                                signature
                                 <st:include it="${s.context}" page="index.jelly"/>:
                                 <code>${s.signature}</code>
                                 <j:if test="${s.dangerous}">

From 3f2c4b71295b85673a294a6886aee1a314cfa87f Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Tue, 7 Jan 2020 16:02:06 -0500
Subject: [PATCH 2/7] Rename approvedClasspathEntries-list

---
 .../scripts/ScriptApproval/index.jelly               | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
index ce0cc251b..ea56cf27b 100644
--- a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
@@ -120,12 +120,12 @@ THE SOFTWARE.
                 function renderApprovedClasspathEntries(approvedClasspathEntries) {
                     if (approvedClasspathEntries.length == 0) {
                         $('approvedClasspathEntries-none').show();
-                        $('approvedClasspathEntries').childElements().each(function(e){e.remove()});
-                        $('approvedClasspathEntries').hide();
+                        $('approvedClasspathEntries-list').childElements().each(function(e){e.remove()});
+                        $('approvedClasspathEntries-list').hide();
                         $('approvedClasspathEntries-clear').hide();
                     } else {
                         $('approvedClasspathEntries-none').hide();
-                        $('approvedClasspathEntries').childElements().each(function(e){e.remove()});
+                        $('approvedClasspathEntries-list').childElements().each(function(e){e.remove()});
                         /*
                            Create a list like:
                             <p id="acp-${acp.hash}">
@@ -146,9 +146,9 @@ THE SOFTWARE.
                             block.insert(deleteButton);
                             block.insert("&lt;code title='" + e.hash + "'>" + e.path + "&lt;/code>");
                             
-                            $('approvedClasspathEntries').insert(block);
+                            $('approvedClasspathEntries-list').insert(block);
                         });
-                        $('approvedClasspathEntries').show();
+                        $('approvedClasspathEntries-list').show();
                         $('approvedClasspathEntries-clear').show();
                     }
                 }
@@ -278,7 +278,7 @@ THE SOFTWARE.
             <p id="approvedClasspathEntries-none">
                 No approved classpath entries.
             </p>
-            <div id="approvedClasspathEntries">
+            <div id="approvedClasspathEntries-list">
             </div>
             <p id="approvedClasspathEntries-clear">
                 You can also remove all previous classpath entry approvals:

From e6ade29837b8c612d6aba3454f3ae3cb1919ccfe Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Tue, 7 Jan 2020 16:04:23 -0500
Subject: [PATCH 3/7] Add p tags

---
 .../scripts/ScriptApproval/index.jelly        | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
index ea56cf27b..079fabf6b 100644
--- a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
@@ -203,7 +203,13 @@ THE SOFTWARE.
                                 ${ps.language.displayName} script
                                 <st:include it="${ps.context}" page="index.jelly"/>:
                             </p>
-                            <f:textarea readonly="readonly" codemirror-mode="${ps.language.codeMirrorMode}" codemirror-config='"readOnly": true' rows="10" cols="80" value="${ps.script}"/>
+                            <p>
+                                <f:textarea readonly="readonly"
+                                            codemirror-mode="${ps.language.codeMirrorMode}"
+                                            codemirror-config='"readOnly": true'
+                                            rows="10" cols="80"
+                                            value="${ps.script}"/>
+                            </p>
                         </div>
                     </j:forEach>
                 </j:otherwise>
@@ -236,10 +242,12 @@ THE SOFTWARE.
                                 signature
                                 <st:include it="${s.context}" page="index.jelly"/>:
                                 <code>${s.signature}</code>
-                                <j:if test="${s.dangerous}">
-                                    <st:nbsp/><strong><font color="red">Approving this signature may introduce a security vulnerability! You are advised to deny it.</font></strong>
-                                </j:if>
                             </p>
+                            <j:if test="${s.dangerous}">
+                                <p>
+                                    <st:nbsp/><strong><font color="red">Approving this signature may introduce a security vulnerability! You are advised to deny it.</font></strong>
+                                </p>
+                            </j:if>
                         </div>
                     </j:forEach>
                 </j:otherwise>
@@ -255,9 +263,11 @@ THE SOFTWARE.
             <j:set var="dangerousApprovedSignatures" value="${it.dangerousApprovedSignatures}"/>
             <j:if test="${!empty(dangerousApprovedSignatures)}">
                 <p>Signatures already approved which <strong><font color="red">may have introduced a security vulnerability</font></strong> (recommend clearing):</p>
-                <textarea readonly="readonly" id="dangerousApprovedSignatures" rows="10" cols="80">
-                    <j:forEach var="line" items="${dangerousApprovedSignatures}">${line}<st:out value="&#10;"/></j:forEach>
-                </textarea>
+                <p>
+                    <textarea readonly="readonly" id="dangerousApprovedSignatures" rows="10" cols="80">
+                        <j:forEach var="line" items="${dangerousApprovedSignatures}">${line}<st:out value="&#10;"/></j:forEach>
+                    </textarea>
+                </p>
             </j:if>
             <p>
                 You can also remove all previous signature approvals:

From 6e21bc7f7e37975ec7949f4b72b21afa10f1ed08 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Tue, 7 Jan 2020 16:05:12 -0500
Subject: [PATCH 4/7] Use h4 tags for sections

---
 .../scripts/ScriptApproval/index.jelly        | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
index 079fabf6b..99f76f7d1 100644
--- a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
@@ -122,6 +122,7 @@ THE SOFTWARE.
                         $('approvedClasspathEntries-none').show();
                         $('approvedClasspathEntries-list').childElements().each(function(e){e.remove()});
                         $('approvedClasspathEntries-list').hide();
+                        $('approved-classpath-entries-clear').hide();
                         $('approvedClasspathEntries-clear').hide();
                     } else {
                         $('approvedClasspathEntries-none').hide();
@@ -149,6 +150,7 @@ THE SOFTWARE.
                             $('approvedClasspathEntries-list').insert(block);
                         });
                         $('approvedClasspathEntries-list').show();
+                        $('approved-classpath-entries-clear').show();
                         $('approvedClasspathEntries-clear').show();
                     }
                 }
@@ -214,8 +216,10 @@ THE SOFTWARE.
                     </j:forEach>
                 </j:otherwise>
             </j:choose>
-            <p id="approvedScripts-clear">
+            <h4 id="approved-scripts-clear">
                 You can also remove all previous script approvals:
+            </h4>
+            <p id="approvedScripts-clear">
                 <button onclick="if (confirm('Really delete all approvals? Any existing scripts will need to be requeued and reapproved.')) {mgr.clearApprovedScripts()}">Clear Approvals</button>
             </p>
             <hr/>
@@ -252,30 +256,36 @@ THE SOFTWARE.
                     </j:forEach>
                 </j:otherwise>
             </j:choose>
-            <p>Signatures already approved:</p>
+            <h4 id="approved-signatures">Signatures already approved:</h4>
             <textarea readonly="readonly" id="approvedSignatures" rows="10" cols="80">
                 <j:forEach var="line" items="${it.approvedSignatures}">${line}<st:out value="&#10;"/></j:forEach>
             </textarea>
-            <p>Signatures already approved assuming permission check:</p>
+            <h4 id="approved-acl-signatures">Signatures already approved assuming permission check:</h4>
             <textarea readonly="readonly" id="aclApprovedSignatures" rows="10" cols="80">
                 <j:forEach var="line" items="${it.aclApprovedSignatures}">${line}<st:out value="&#10;"/></j:forEach>
             </textarea>
             <j:set var="dangerousApprovedSignatures" value="${it.dangerousApprovedSignatures}"/>
             <j:if test="${!empty(dangerousApprovedSignatures)}">
-                <p>Signatures already approved which <strong><font color="red">may have introduced a security vulnerability</font></strong> (recommend clearing):</p>
+                <h4 id="dangerous-approved-signatures">Signatures already approved which <strong><font color="red">may have introduced a security vulnerability</font></strong> (recommend clearing):</h4>
                 <p>
                     <textarea readonly="readonly" id="dangerousApprovedSignatures" rows="10" cols="80">
                         <j:forEach var="line" items="${dangerousApprovedSignatures}">${line}<st:out value="&#10;"/></j:forEach>
                     </textarea>
                 </p>
             </j:if>
-            <p>
+            <h4 id="clear-approved-signatures">
                 You can also remove all previous signature approvals:
-                <button onclick="if (confirm('Really delete all approvals? Any existing scripts will need to be rerun and signatures reapproved.')) {clearApprovedSignatures()}">Clear Approvals</button>
+            </h4>
+            <p>
+                <button onclick="if (confirm('Really delete all approvals? Any existing scripts will need to be rerun and signatures reapproved.')) {clearApprovedSignatures()}"
+                >Clear Approvals</button>
             </p>
             <j:if test="${!empty(dangerousApprovedSignatures)}">
-                Or you can just remove the dangerous ones:
-                <button onclick="clearDangerousApprovedSignatures()">Clear only dangerous Approvals</button>
+                <h4 id="clear-dangerous-approved-signatures">Or you can just remove the dangerous ones:</h4>
+                <p>
+                    <button onclick="clearDangerousApprovedSignatures()"
+                    >Clear only dangerous Approvals</button>
+                </p>
             </j:if>
             <hr/>
             <p id="pendingClasspathEntries-none">
@@ -284,15 +294,18 @@ THE SOFTWARE.
             <div id="pendingClasspathEntries">
                 Classpath entries pending approval. (Beware of remote URLs, workspace files, or anything else that might change without your notice.)
             </div>
-            <p>Classpath entries already approved:</p>
+            <h4 id="approved-classpath-entries">Classpath entries already approved:</h4>
             <p id="approvedClasspathEntries-none">
                 No approved classpath entries.
             </p>
             <div id="approvedClasspathEntries-list">
             </div>
-            <p id="approvedClasspathEntries-clear">
+            <h4 id="approved-classpath-entries-clear">
                 You can also remove all previous classpath entry approvals:
-                <button onclick="if (confirm('Really delete all approvals? Any existing scripts using a classpath will need to be rerun and entries reapproved.')) {clearApprovedClasspathEntries()}">Clear Classpath Entries</button>
+            </h4>
+            <p id="approvedClasspathEntries-clear">
+                <button onclick="if (confirm('Really delete all approvals? Any existing scripts using a classpath will need to be rerun and entries reapproved.')) {clearApprovedClasspathEntries()}"
+                >Clear Classpath Entries</button>
             </p>
         </l:main-panel>
     </l:layout>

From d5d5bc2621058825a92ff84c3098795ea1150294 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Tue, 7 Jan 2020 16:06:31 -0500
Subject: [PATCH 5/7] Add h3 tags for sections

---
 .../scriptsecurity/scripts/ScriptApproval/index.jelly        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
index 99f76f7d1..f382cf5fa 100644
--- a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
@@ -187,6 +187,9 @@ THE SOFTWARE.
                     });
                 });
             </script>
+            <h3 id="script-approvals">
+                Script approvals
+            </h3>
             <j:choose>
                 <j:when test="${it.pendingScripts.isEmpty()}">
                     <p>
@@ -223,6 +226,7 @@ THE SOFTWARE.
                 <button onclick="if (confirm('Really delete all approvals? Any existing scripts will need to be requeued and reapproved.')) {mgr.clearApprovedScripts()}">Clear Approvals</button>
             </p>
             <hr/>
+            <h3 id="signature-approvals">Signature Approvals</h3>
             <j:choose>
                 <j:when test="${it.pendingSignatures.isEmpty()}">
                     <p>
@@ -288,6 +292,7 @@ THE SOFTWARE.
                 </p>
             </j:if>
             <hr/>
+            <h3 id="classpath-approvals">Classpath Approvals</h3>
             <p id="pendingClasspathEntries-none">
                 No pending classpath entry approvals.
             </p>

From 6aa96537fdd589e76180df1b9a867708fff0006b Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Tue, 7 Jan 2020 16:06:38 -0500
Subject: [PATCH 6/7] Add h2 heading

---
 .../plugins/scriptsecurity/scripts/ScriptApproval/index.jelly  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
index f382cf5fa..b8013047a 100644
--- a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
@@ -187,6 +187,9 @@ THE SOFTWARE.
                     });
                 });
             </script>
+            <h2>
+                In-process Script Approval
+            </h2>
             <h3 id="script-approvals">
                 Script approvals
             </h3>

From 8bb3e7d2e6af1307d506678d73fbe7fdd28a9a33 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Tue, 7 Jan 2020 16:13:02 -0500
Subject: [PATCH 7/7] Add none value

---
 .../scripts/ScriptApproval/index.jelly        | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
index b8013047a..c02b8335f 100644
--- a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/index.jelly
@@ -264,13 +264,35 @@ THE SOFTWARE.
                 </j:otherwise>
             </j:choose>
             <h4 id="approved-signatures">Signatures already approved:</h4>
-            <textarea readonly="readonly" id="approvedSignatures" rows="10" cols="80">
-                <j:forEach var="line" items="${it.approvedSignatures}">${line}<st:out value="&#10;"/></j:forEach>
-            </textarea>
+            <j:choose>
+                <j:when test="${it.approvedSignatures.isEmpty()}">
+                    <p>
+                        None
+                    </p>
+                </j:when>
+                <j:otherwise>
+                    <p>
+                        <textarea readonly="readonly" id="approvedSignatures" rows="10" cols="80">
+                            <j:forEach var="line" items="${it.approvedSignatures}">${line}<st:out value="&#10;"/></j:forEach>
+                        </textarea>
+                    </p>
+                </j:otherwise>
+            </j:choose>
             <h4 id="approved-acl-signatures">Signatures already approved assuming permission check:</h4>
-            <textarea readonly="readonly" id="aclApprovedSignatures" rows="10" cols="80">
-                <j:forEach var="line" items="${it.aclApprovedSignatures}">${line}<st:out value="&#10;"/></j:forEach>
-            </textarea>
+            <j:choose>
+                <j:when test="${it.aclApprovedSignatures.isEmpty()}">
+                    <p>
+                        None
+                    </p>
+                </j:when>
+                <j:otherwise>
+                    <p>
+                        <textarea readonly="readonly" id="aclApprovedSignatures" rows="10" cols="80">
+                            <j:forEach var="line" items="${it.aclApprovedSignatures}">${line}<st:out value="&#10;"/></j:forEach>
+                        </textarea>
+                    </p>
+                </j:otherwise>
+            </j:choose>
             <j:set var="dangerousApprovedSignatures" value="${it.dangerousApprovedSignatures}"/>
             <j:if test="${!empty(dangerousApprovedSignatures)}">
                 <h4 id="dangerous-approved-signatures">Signatures already approved which <strong><font color="red">may have introduced a security vulnerability</font></strong> (recommend clearing):</h4>