[JENKINS-48390] Fix resources path

jenkinsci · Dec 5, 2017 · 40036b6 · 40036b6
1 parent 460211d
commit 40036b6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/main/resources/org/jenkinsci/plugins/diagnostics/DiagnosticsAction/ajaxReport.jelly b/src/main/resources/org/jenkinsci/plugins/diagnostics/DiagnosticsAction/ajaxReport.jelly
@@ -50,7 +50,7 @@
               <j:forEach var="session" items="${it.sessions}">
                  <tr>
                  <j:set var="image" value="${session.status.toString().toLowerCase()}.${session.status.toString()=='RUNNING'?'gif':'png'}"/>
-                   <td><a href="${rootURL}/diagnostics?sessionId=${session.id}" title="${session.status}" class="name icon"><img src="${rootURL}/plugin/diagnostic/images/32x32/${image}" class="icon32x32" /></a></td>
+                   <td><a href="${rootURL}/diagnostics?sessionId=${session.id}" title="${session.status}" class="name icon"><img src="${rootURL}/plugin/diagnostics/images/32x32/${image}" class="icon32x32" /></a></td>
                    <td>${session.description}</td>
                    <td>${session.startDate}</td>
                    <td>${session.endDate}</td>
@@ -62,7 +62,7 @@
                                title="${%Info}"
                                alt="${%Info}"
                                tooltip="${%Info}"
-                               src="${rootURL}/plugin/diagnostic/images/32x32/info.png"/>
+                               src="${rootURL}/plugin/diagnostics/images/32x32/info.png"/>
                     </a>
                     <j:choose>
                       <j:when test="${session.running}">
@@ -72,7 +72,7 @@
                                  alt="${%Cancel}"
                                  tooltip="${%Cancel}"
                                  onclick="return cancelSession(this)"
-                                 src="${rootURL}/plugin/diagnostic/images/32x32/stop.png"/>
+                                 src="${rootURL}/plugin/diagnostics/images/32x32/stop.png"/>
                         </a>
                       </j:when>
                       <j:otherwise>
@@ -81,15 +81,15 @@
                                  title="${%Delete}"
                                  alt="${%Delete}"
                                  tooltip="${%Delete}"
-                                 src="${rootURL}/plugin/diagnostic/images/32x32/delete.png"/>
+                                 src="${rootURL}/plugin/diagnostics/images/32x32/delete.png"/>
                         </a>
                         <j:if test="${session.downloadReady}">
                         <a name="download-${session.id}" href="${rootURL}/diagnostics/download?sessionId=${session.id}">
                                    <l:icon
                                    title="${%Download Diagnostics}"
                                    alt="${%Download Diagnostics}"
                                    tooltip="${%Download Diagnostics}"
-                                   src="${rootURL}/plugin/diagnostic/images/32x32/download.png"/>
+                                   src="${rootURL}/plugin/diagnostics/images/32x32/download.png"/>
                           </a>
                         </j:if>
                       </j:otherwise>
@@ -124,7 +124,7 @@
                                  title="${%Status}"
                                  alt="${%Status}"
                                  tooltip="${%Status}"
-                                 src="${rootURL}/plugin/diagnostic/images/32x32/${icon}"
+                                 src="${rootURL}/plugin/diagnostics/images/32x32/${icon}"
                                  class="icon-lg"
                                  /><span class="diag-property">${diagnostic.descriptor.displayName}:</span>
 

diff --git a/src/main/resources/org/jenkinsci/plugins/diagnostics/DiagnosticsAction/index.jelly b/src/main/resources/org/jenkinsci/plugins/diagnostics/DiagnosticsAction/index.jelly
@@ -23,15 +23,15 @@ THE SOFTWARE.
   <l:layout title="${it.actionTitleText}" norefresh="true" permission="${app.ADMINISTER}">
     <st:include it="${app}" page="sidepanel"/>
     <l:main-panel>
-      <link rel="stylesheet" href="${rootURL}/plugin/diagnostic/css/main.css" type="text/css" />
+      <link rel="stylesheet" href="${rootURL}/plugin/diagnostics/css/main.css" type="text/css" />
       <div class="diagnostic">
         <h1 class="icon-decorated">${it.displayName}</h1>
         <div class="detail" role="alert">${it.actionBlurb}</div>
         <section id="diagnostic-configuration">
           <f:form name="diagnostic-contents" method="POST" action="configure">
             <j:set var="instance" value="${it}"/>
             <f:section title="${%sessionConfiguration}">
-              <f:entry title="${%Description}" field="description" help="/plugin/diagnostic/help/help-description.html">
+              <f:entry title="${%Description}" field="description" help="/plugin/diagnostics/help/help-description.html">
                   <f:textbox/>
               </f:entry>
             </f:section>            

diff --git a/...ources/org/jenkinsci/plugins/diagnostics/diagnostics/SupportBundleDiagnostic/config.jelly b/...ources/org/jenkinsci/plugins/diagnostics/diagnostics/SupportBundleDiagnostic/config.jelly
@@ -30,7 +30,7 @@ THE SOFTWARE.
     <f:entry title="${%Period}" field="period">
         <f:number clazz="required positive-number" min="50" default="${descriptor.period}"/>
     </f:entry>
-    <f:dropdownList name="supportBundleConfig" title="Support Bundle Config" help="/plugin/diagnostic/help/help-supportBundleConfig.html">
+    <f:dropdownList name="supportBundleConfig" title="Support Bundle Config" help="/plugin/diagnostics/help/help-supportBundleConfig.html">
         <j:forEach var="item" items="${descriptor.supportBundleDescriptor}">
             <j:set var="selected" value="${item.displayName==instance.supportBundleConfig.descriptor.displayName}"/>
             <f:dropdownListBlock title="${item.displayName}" value="${loop.index}"