Add sidebar to Git Repo page

Also bring the commit log back, as we have a way to limit the commits
shown now.

Author: mtughan

src/main/java/org/jenkinsci/plugins/scriptler/ScriptlerManagement.java

@@ -57,6 +57,8 @@
 import org.jenkinsci.plugins.scriptler.share.ScriptInfoCatalog;
 import org.jenkinsci.plugins.scriptler.util.ScriptHelper;
 import org.jenkinsci.plugins.scriptler.util.UIHelper;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.*;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
@@ -343,7 +345,8 @@ private void commitFileToGitRepo(final String finalFileName) {
         getGitRepo().addSingleFileToRepo(finalFileName);
     }
 
-    private GitScriptlerRepository getGitRepo() {
+    @Restricted(NoExternalUse.class)
+    public GitScriptlerRepository getGitRepo() {
         return ExtensionList.lookupSingleton(GitScriptlerRepository.class);
     }
 

src/main/java/org/jenkinsci/plugins/scriptler/git/GitScriptlerRepository.java

@@ -93,6 +93,10 @@ public boolean hasPushPermission() {
         return Jenkins.get().hasPermission(ScriptlerPermissions.CONFIGURE);
     }
 
+    public Object getScriptler() {
+        return ExtensionList.lookupSingleton(ScriptlerManagement.class);
+    }
+
     /**
      * @see org.jenkinsci.plugins.gitserver.FileBackedHttpGitRepository#checkPushPermission()
      */

src/main/resources/org/jenkinsci/plugins/scriptler/ScriptlerManagement/catalog.properties

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-title=Remote Script catalogs
+title=Remote Script Catalogs
 intro=The catalog allows you to import groovy scripts from a shared source server. \
  Just  click the save icon and the script will be imported to your local script directory. Depending on the catalog, you can share your scripts too \
  - e.g. send pull requests to <a href="https://github.com/jenkinsci/jenkins-scripts">https://github.com/jenkinsci/jenkins-scripts</a>. \

src/main/resources/org/jenkinsci/plugins/scriptler/ScriptlerManagement/sidepanel.jelly

@@ -27,22 +27,22 @@ THE SOFTWARE.
   Side panel for Scriptler.
 -->
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
   <l:header />
   <l:side-panel>
     <l:tasks>
+      <j:set var="scriptlerRoot" value="${rootURL}/${it.urlName}"/>
       <j:if test="${it.hasAtLeastOneScriptlerPermission()}">
-        <l:task icon="icon-next icon-md" href="${rootURL}/scriptler" title="${%Run / Edit Scripts}" />
+        <l:task icon="icon-next icon-md" href="${scriptlerRoot}" title="${%Run / Edit Scripts}" />
       </j:if>
       <l:hasPermission permission="${it.scriptlerConfigure}">
-        <l:task icon="icon-new-package icon-md" href="scriptSettings" title="${%Add a new Script}" />
+        <l:task icon="icon-new-package icon-md" href="${scriptlerRoot}/scriptSettings" title="${%Add a New Script}" />
         <j:if test="${!it.disableRemoteCatalog()}">
-              <l:task icon="icon-folder icon-md" href="catalog" title="${%Remote Script catalogs}" />
+              <l:task icon="icon-folder icon-md" href="${scriptlerRoot}/catalog" title="${%Remote Script Catalogs}" />
         </j:if>
-        <l:task icon="icon-setting icon-md" href="settings" title="${%Scriptler settings}" />
-        <l:task icon="symbol-git-compare-outline plugin-ionicons-api" href="${rootURL}/scriptler.git" title="${%Git repo}" />
+        <l:task icon="icon-setting icon-md" href="${scriptlerRoot}/settings" title="${%Scriptler Settings}" />
+        <l:task icon="symbol-git-compare-outline plugin-ionicons-api" href="${rootURL}/${it.gitRepo.urlName}" title="${%Git Repo}" />
       </l:hasPermission>
     </l:tasks>
-    <t:executors computers="${h.singletonList(it)}" />
   </l:side-panel>
 </j:jelly>

src/main/resources/org/jenkinsci/plugins/scriptler/git/GitScriptlerRepository/index.jelly

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:f="/lib/form">
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:f="/lib/form" xmlns:st="jelly:stapler">
     <l:layout title="">
+        <st:include page="sidepanel.jelly" it="${it.scriptler}"/>
         <l:main-panel>
             <h1>Accessing Scriptler scripts</h1>
             <p>${%blurb}</p>
@@ -12,25 +13,24 @@ ${%git_clone_command(it.httpCloneUrl)}
             <j:if test="${it.hasPushPermission()}">
                 <p>
                     ${%reset}
-                    <f:form method="POST" action="${app.rootUrl}scriptler/hardResetGit">
+                    <f:form method="POST" action="${app.rootUrl}${it.scriptler.urlName}/hardResetGit">
                         <f:submit value="${%Hard reset}"/>
                     </f:form>
                 </p>
             </j:if>
 
-            <!--
-            <f:section title="${%Log}">
+            <div style="padding-top: var(--section-padding)">
+                <h2>${%Log}</h2>
                 <j:forEach items="${it.log}" var="log">
                     <p>
-                        <strong>commit ${log.name}</strong><br/>
-                        <strong>Author:</strong> ${log.author}<br/>
-                        <strong>Committer:</strong> ${log.committer}<br/>
-                        <strong>Date:</strong> ${log.commitTime}<br/>
-                        ${log.msg}
+                        <strong>commit ${log.name()}</strong><br/>
+                        <strong>Author:</strong> ${log.author().name} &amp;lt;${log.author().emailAddress}&amp;gt;<br/>
+                        <strong>Committer:</strong> ${log.committer().name} &amp;lt;${log.committer().emailAddress}&amp;gt;<br/>
+                        <strong>Date:</strong> ${log.commitTime()}<br/>
+                        ${log.msg()}
                     </p>
                 </j:forEach>
-            </f:section>
-            -->
+            </div>
         </l:main-panel>
     </l:layout>
 </j:jelly>