Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinston Prakash2012-10-19 14:53:50 -0400
committerWinston Prakash2012-10-19 14:53:50 -0400
commit4380064fcd4da5285ada13f9be3a63691672f435 (patch)
tree5eb2b78e514a3eaf387e4fda9c5f9bbcaef1a41d
parent1d011f0683248e5de2d5501289c7d17a218edf1b (diff)
downloadorg.eclipse.hudson.core-4380064fcd4da5285ada13f9be3a63691672f435.tar.gz
org.eclipse.hudson.core-4380064fcd4da5285ada13f9be3a63691672f435.tar.xz
org.eclipse.hudson.core-4380064fcd4da5285ada13f9be3a63691672f435.zip
Fix: 392423 - Icon paths do not add the prefix when resolved so missing icons
-rw-r--r--hudson-core/src/main/resources/hudson/logging/LogRecorder/index.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/logging/LogRecorderManager/all.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/model/Computer/configure.jelly4
-rw-r--r--hudson-core/src/main/resources/hudson/model/ComputerSet/configure.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/model/ComputerSet/index.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/model/ComputerSet/new.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/model/Hudson/configure.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/model/Hudson/manage.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/model/Hudson/newView.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/model/Job/configure.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/model/MyViewsProperty/newView.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/model/User/configure.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/model/View/configure.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/model/View/index.jelly1
-rw-r--r--hudson-core/src/main/resources/hudson/model/View/newJob.jelly2
-rw-r--r--hudson-core/src/main/resources/org/eclipse/hudson/security/HudsonSecurityManager/index.jelly2
-rw-r--r--hudson-war/pom.xml4
-rw-r--r--hudson-war/src/main/webapp/images/48x48/job.pngbin0 -> 4624 bytes
18 files changed, 20 insertions, 17 deletions
diff --git a/hudson-core/src/main/resources/hudson/logging/LogRecorder/index.jelly b/hudson-core/src/main/resources/hudson/logging/LogRecorder/index.jelly
index 398b3c5e..65aa86c2 100644
--- a/hudson-core/src/main/resources/hudson/logging/LogRecorder/index.jelly
+++ b/hudson-core/src/main/resources/hudson/logging/LogRecorder/index.jelly
@@ -23,7 +23,7 @@
<l:layout title="Log" permission="${app.ADMINISTER}">
<st:include page="sidepanel.jelly" />
<l:main-panel>
- <h1><img src="${rootURL}/images/48x48/clipboard.png" alt=""/>${it.displayName}</h1>
+ <h1><img src="${imagesURL}/48x48/clipboard.png" alt=""/>${it.displayName}</h1>
<j:forEach var="log" items="${it.logRecords}">
<pre>${h.printLogRecord(log)}</pre>
</j:forEach>
diff --git a/hudson-core/src/main/resources/hudson/logging/LogRecorderManager/all.jelly b/hudson-core/src/main/resources/hudson/logging/LogRecorderManager/all.jelly
index b467410c..56c2ec6f 100644
--- a/hudson-core/src/main/resources/hudson/logging/LogRecorderManager/all.jelly
+++ b/hudson-core/src/main/resources/hudson/logging/LogRecorderManager/all.jelly
@@ -23,7 +23,7 @@
<l:layout title="Log">
<st:include page="sidepanel.jelly" />
<l:main-panel>
- <h1><img src="${rootURL}/images/48x48/clipboard.png" alt=""/>${%Hudson Log}</h1>
+ <h1><img src="${imagesURL}/48x48/clipboard.png" alt=""/>${%Hudson Log}</h1>
<j:forEach var="log" items="${h.logRecords}">
<pre>${h.printLogRecord(log)}</pre>
</j:forEach>
diff --git a/hudson-core/src/main/resources/hudson/model/Computer/configure.jelly b/hudson-core/src/main/resources/hudson/model/Computer/configure.jelly
index ac3ea40e..a33e49c7 100644
--- a/hudson-core/src/main/resources/hudson/model/Computer/configure.jelly
+++ b/hudson-core/src/main/resources/hudson/model/Computer/configure.jelly
@@ -25,8 +25,8 @@
<st:include page="sidepanel.jelly"/>
<l:main-panel>
<h1>
- <img width="48" height="48" src="/images/48x48/setting.png" alt="" style="margin-right:10px"/>
- Node Configurations
+ <img width="48" height="48" src="${imagesURL}/48x48/setting.png" alt="" style="margin-right:10px"/>
+ ${%Node Configurations}
</h1>
<f:form method="post" action="configSubmit" name="config">
<j:set var="instance" value="${it.node}" />
diff --git a/hudson-core/src/main/resources/hudson/model/ComputerSet/configure.jelly b/hudson-core/src/main/resources/hudson/model/ComputerSet/configure.jelly
index 4ce1251b..cda2f7e6 100644
--- a/hudson-core/src/main/resources/hudson/model/ComputerSet/configure.jelly
+++ b/hudson-core/src/main/resources/hudson/model/ComputerSet/configure.jelly
@@ -25,7 +25,7 @@
<l:main-panel>
<h1>
- <img width="48" height="48" src="/images/48x48/setting.png" alt="" style="margin-right:10px"/>
+ <img width="48" height="48" src="${imagesURL}/48x48/setting.png" alt="" style="margin-right:10px"/>
${%Node Configurations}
</h1>
diff --git a/hudson-core/src/main/resources/hudson/model/ComputerSet/index.jelly b/hudson-core/src/main/resources/hudson/model/ComputerSet/index.jelly
index f07e588d..fb4d4b81 100644
--- a/hudson-core/src/main/resources/hudson/model/ComputerSet/index.jelly
+++ b/hudson-core/src/main/resources/hudson/model/ComputerSet/index.jelly
@@ -31,7 +31,7 @@
</l:header>
<l:main-panel>
<h1>
- <img width="48" height="48" src="/images/48x48/network.png" alt="" style="margin-right:10px"/>
+ <img width="48" height="48" src="${imagesURL}/48x48/network.png" alt="" style="margin-right:10px"/>
${%Nodes Status}
</h1>
<j:set var="monitors" value="${it._monitors}"/>
diff --git a/hudson-core/src/main/resources/hudson/model/ComputerSet/new.jelly b/hudson-core/src/main/resources/hudson/model/ComputerSet/new.jelly
index 92383b07..dfe6b94b 100644
--- a/hudson-core/src/main/resources/hudson/model/ComputerSet/new.jelly
+++ b/hudson-core/src/main/resources/hudson/model/ComputerSet/new.jelly
@@ -28,7 +28,7 @@
<st:include page="sidepanel.jelly" />
<l:main-panel>
<h1>
- <img width="48" height="48" src="/images/48x48/computer.png" alt="" style="margin: 2px;"/>
+ <img width="48" height="48" src="${imagesURL}/48x48/computer.png" alt="" style="margin: 2px;"/>
${%New Node}
</h1>
<j:invokeStatic var="slaves" className="hudson.slaves.NodeDescriptor" method="allInstantiable" />
diff --git a/hudson-core/src/main/resources/hudson/model/Hudson/configure.jelly b/hudson-core/src/main/resources/hudson/model/Hudson/configure.jelly
index 1eb84d03..a0a92480 100644
--- a/hudson-core/src/main/resources/hudson/model/Hudson/configure.jelly
+++ b/hudson-core/src/main/resources/hudson/model/Hudson/configure.jelly
@@ -29,7 +29,7 @@
<j:set var="descriptor" value="${instance.descriptor}" />
<h1>
- <img width="48" height="48" src="/images/48x48/setting.png" alt="" style="margin-right:10px"/>
+ <img width="48" height="48" src="${imagesURL}/48x48/setting.png" alt="" style="margin-right:10px"/>
${%System Configurations}
</h1>
diff --git a/hudson-core/src/main/resources/hudson/model/Hudson/manage.jelly b/hudson-core/src/main/resources/hudson/model/Hudson/manage.jelly
index 38077116..7c8e35e3 100644
--- a/hudson-core/src/main/resources/hudson/model/Hudson/manage.jelly
+++ b/hudson-core/src/main/resources/hudson/model/Hudson/manage.jelly
@@ -37,7 +37,7 @@
<st:include page="sidepanel.jelly" />
<l:main-panel>
<h1>
- <img width="48" height="48" src="/images/48x48/setting.png" alt="" style="margin-right:10px"/>
+ <img width="48" height="48" src="${imagesURL}/48x48/setting.png" alt="" style="margin-right:10px"/>
${%Manage Hudson}
</h1>
<j:if test="${it.checkURIEncodingEnabled}">
diff --git a/hudson-core/src/main/resources/hudson/model/Hudson/newView.jelly b/hudson-core/src/main/resources/hudson/model/Hudson/newView.jelly
index 55032eaf..91672ea8 100644
--- a/hudson-core/src/main/resources/hudson/model/Hudson/newView.jelly
+++ b/hudson-core/src/main/resources/hudson/model/Hudson/newView.jelly
@@ -26,7 +26,7 @@
<l:main-panel>
<h1>
- <img width="48" height="48" src="/images/48x48/folder.png" alt="" style="margin: 2px;"/>
+ <img width="48" height="48" src="${imagesURL}/48x48/folder.png" alt="" style="margin: 2px;"/>
${%New View}
</h1>
diff --git a/hudson-core/src/main/resources/hudson/model/Job/configure.jelly b/hudson-core/src/main/resources/hudson/model/Job/configure.jelly
index 544f39c3..5df00d41 100644
--- a/hudson-core/src/main/resources/hudson/model/Job/configure.jelly
+++ b/hudson-core/src/main/resources/hudson/model/Job/configure.jelly
@@ -28,7 +28,7 @@
<j:set var="instance" value="${it}" />
<h1>
- <img width="48" height="48" src="/images/48x48/setting.png" alt="" style="margin-right:10px"/>
+ <img width="48" height="48" src="${imagesURL}/48x48/setting.png" alt="" style="margin-right:10px"/>
${%Job Configurations}
</h1>
diff --git a/hudson-core/src/main/resources/hudson/model/MyViewsProperty/newView.jelly b/hudson-core/src/main/resources/hudson/model/MyViewsProperty/newView.jelly
index 4aca7da9..26ca74e4 100644
--- a/hudson-core/src/main/resources/hudson/model/MyViewsProperty/newView.jelly
+++ b/hudson-core/src/main/resources/hudson/model/MyViewsProperty/newView.jelly
@@ -28,7 +28,7 @@
<l:main-panel>
<h1>
- <img width="48" height="48" src="/images/48x48/folder.png" alt="" style="margin: 2px;"/>
+ <img width="48" height="48" src="${imagesURL}/48x48/folder.png" alt="" style="margin: 2px;"/>
${%New My View}
</h1>
diff --git a/hudson-core/src/main/resources/hudson/model/User/configure.jelly b/hudson-core/src/main/resources/hudson/model/User/configure.jelly
index 987516b3..6f043516 100644
--- a/hudson-core/src/main/resources/hudson/model/User/configure.jelly
+++ b/hudson-core/src/main/resources/hudson/model/User/configure.jelly
@@ -25,7 +25,7 @@
<l:main-panel>
<h1>
- <img width="48" height="48" src="/images/48x48/setting.png" alt="" style="margin-right:10px"/>
+ <img width="48" height="48" src="${imagesURL}/48x48/setting.png" alt="" style="margin-right:10px"/>
${%User Configurations}
</h1>
diff --git a/hudson-core/src/main/resources/hudson/model/View/configure.jelly b/hudson-core/src/main/resources/hudson/model/View/configure.jelly
index 0f18245f..c4c8a87d 100644
--- a/hudson-core/src/main/resources/hudson/model/View/configure.jelly
+++ b/hudson-core/src/main/resources/hudson/model/View/configure.jelly
@@ -28,7 +28,7 @@
<j:set var="descriptor" value="${it.descriptor}" />
<h1>
- <img width="48" height="48" src="/images/48x48/setting.png" alt="" style="margin-right:10px"/>
+ <img width="48" height="48" src="${imagesURL}/48x48/setting.png" alt="" style="margin-right:10px"/>
${%View Configurations}
</h1>
diff --git a/hudson-core/src/main/resources/hudson/model/View/index.jelly b/hudson-core/src/main/resources/hudson/model/View/index.jelly
index 56d65f4d..9f14f230 100644
--- a/hudson-core/src/main/resources/hudson/model/View/index.jelly
+++ b/hudson-core/src/main/resources/hudson/model/View/index.jelly
@@ -29,6 +29,7 @@
<st:include page="sidepanel.jelly" />
<l:main-panel>
<h1>
+ <img width="48" height="48" src="${imagesURL}/48x48/job.png" alt="" style="margin-right:10px"/>
${%Jobs Status}
</h1>
<div id="view-message">
diff --git a/hudson-core/src/main/resources/hudson/model/View/newJob.jelly b/hudson-core/src/main/resources/hudson/model/View/newJob.jelly
index eca0ca60..2185ece9 100644
--- a/hudson-core/src/main/resources/hudson/model/View/newJob.jelly
+++ b/hudson-core/src/main/resources/hudson/model/View/newJob.jelly
@@ -26,7 +26,7 @@
<l:main-panel>
<h1>
- <img width="48" height="48" src="/images/48x48/package.png" alt="" style="margin: 2px;"/>
+ <img width="48" height="48" src="${imagesURL}/48x48/package.png" alt="" style="margin: 2px;"/>
${%New Job}
</h1>
diff --git a/hudson-core/src/main/resources/org/eclipse/hudson/security/HudsonSecurityManager/index.jelly b/hudson-core/src/main/resources/org/eclipse/hudson/security/HudsonSecurityManager/index.jelly
index 86169db5..75dcb7d5 100644
--- a/hudson-core/src/main/resources/org/eclipse/hudson/security/HudsonSecurityManager/index.jelly
+++ b/hudson-core/src/main/resources/org/eclipse/hudson/security/HudsonSecurityManager/index.jelly
@@ -22,7 +22,7 @@
<st:include page="sidepanel.jelly" />
<l:main-panel>
<h1>
- <img width="48" height="48" src="/images/48x48/secure.png" alt="" style="margin-right:10px"/>
+ <img width="48" height="48" src="${imagesURL}/48x48/secure.png" alt="" style="margin-right:10px"/>
${%Configure Security}
</h1>
<f:form method="post" name="config" action="configSubmit">
diff --git a/hudson-war/pom.xml b/hudson-war/pom.xml
index d62d668b..dc7b84ca 100644
--- a/hudson-war/pom.xml
+++ b/hudson-war/pom.xml
@@ -345,7 +345,9 @@
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.server.version}</version>
<configuration>
- <contextPath>${contextPath}</contextPath>
+ <webAppConfig>
+ <contextPath>${contextPath}</contextPath>
+ </webAppConfig>
<connectors>
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
diff --git a/hudson-war/src/main/webapp/images/48x48/job.png b/hudson-war/src/main/webapp/images/48x48/job.png
new file mode 100644
index 00000000..8cd5dfa5
--- /dev/null
+++ b/hudson-war/src/main/webapp/images/48x48/job.png
Binary files differ

Back to the top