From efbb3fcc84055c854cd12dbe683304a03e88d14c Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Sat, 18 Nov 2006 14:54:30 +0000
Subject: [PATCH] fixed #159.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@1155 71c3de6d-444a-0410-be80-ed276b4c234a
---
 .../resources/hudson/model/User/builds.jelly  |  8 +++--
 .../resources/lib/hudson/projectView.jelly    | 35 ++-----------------
 .../lib/hudson/rssBar-with-iconSize.jelly     | 27 ++++++++++++++
 .../resources/lib/hudson/setIconSize.jelly    | 12 +++++++
 4 files changed, 46 insertions(+), 36 deletions(-)
 create mode 100644 core/src/main/resources/lib/hudson/rssBar-with-iconSize.jelly
 create mode 100644 core/src/main/resources/lib/hudson/setIconSize.jelly

diff --git a/core/src/main/resources/hudson/model/User/builds.jelly b/core/src/main/resources/hudson/model/User/builds.jelly
index 9c01fc70c6..aa03aaa197 100644
--- a/core/src/main/resources/hudson/model/User/builds.jelly
+++ b/core/src/main/resources/hudson/model/User/builds.jelly
@@ -7,6 +7,8 @@
         Builds for ${it}
       </h1>
 
+      <t:setIconSize/>
+
       <table class="pane sortable" id="projectStatus">
         <tr>
           <th><st:nbsp/></th>
@@ -19,7 +21,7 @@
           <tr>
             <td data="${b.iconColor.ordinal()}">
               <a href="${rootURL}/${b.url}">
-                <img width="32" height="32" src="${rootURL}/images/32x32/${b.buildStatusUrl}" />
+                <img src="${rootURL}/images/${iconSize}/${b.buildStatusUrl}" />
               </a>
             </td>
             <td>
@@ -35,13 +37,13 @@
             </td>
             <td>
               <a href="${rootURL}/${b.url}console">
-                <img src="${rootURL}/images/24x24/terminal.gif" title="Console output" border="0" />
+                <img src="${rootURL}/images/${subIconSize}/terminal.gif" title="Console output" border="0" />
               </a>
             </td>
           </tr>
         </j:forEach>
       </table>
-      <t:rssBar />
+      <t:rssBar-with-iconSize/>
     </l:main-panel>
   </l:layout>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/projectView.jelly b/core/src/main/resources/lib/hudson/projectView.jelly
index 4d46934e2e..cb5ed90c6c 100644
--- a/core/src/main/resources/lib/hudson/projectView.jelly
+++ b/core/src/main/resources/lib/hudson/projectView.jelly
@@ -3,14 +3,7 @@
   <%@ attribute name="showViewTabs" required="true" type="java.lang.Boolean" %>
 -->
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <j:set var="iconSize" value="${h.getCookie(request,'iconSize','32x32')}" />
-  <!--
-    balls look smaller than their actual size,
-    so we try not to make the secondary icons look bigger than the icon.
-    we want the user's eyes to go to balls, not the clock.
-  -->
-  <j:set var="subIconSize" value="${h.ifThenElse(iconSize=='32x32','24x24',iconSize)}"/>
-
+  <t:setIconSize/>
   <div class="dashboard">
     <j:if test="${!empty(jobs)}">
       <!-- view tab bar -->
@@ -102,31 +95,7 @@
           </tr>
         </j:forEach>
       </x:element>
-      <table style="width:100%">
-        <tr>
-          <d:taglib uri="local">
-            <d:tag name="iconSizeLink">
-              <st:nbsp/>
-              <j:choose>
-                <j:when test="${sz==iconSize}">
-                  ${title}
-                </j:when>
-                <j:otherwise>
-                  <a href="${rootURL}/iconSize?${sz}">${title}</a>
-                </j:otherwise>
-              </j:choose>
-            </d:tag>
-          </d:taglib>
-
-          <td xmlns:local="local">Icon:
-            <local:iconSizeLink title="S" sz="16x16" />
-            <local:iconSizeLink title="M" sz="24x24" />
-            <local:iconSizeLink title="L" sz="32x32" />
-          </td><td>
-            <t:rssBar />
-          </td>
-        </tr>
-      </table>
+      <t:rssBar-with-iconSize/>
     </j:if>
   </div>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/rssBar-with-iconSize.jelly b/core/src/main/resources/lib/hudson/rssBar-with-iconSize.jelly
new file mode 100644
index 0000000000..cfab54df80
--- /dev/null
+++ b/core/src/main/resources/lib/hudson/rssBar-with-iconSize.jelly
@@ -0,0 +1,27 @@
+<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <table style="width:100%">
+    <tr>
+      <d:taglib uri="local">
+        <d:tag name="iconSizeLink">
+          <st:nbsp/>
+          <j:choose>
+            <j:when test="${sz==iconSize}">
+              ${title}
+            </j:when>
+            <j:otherwise>
+              <a href="${rootURL}/iconSize?${sz}">${title}</a>
+            </j:otherwise>
+          </j:choose>
+        </d:tag>
+      </d:taglib>
+
+      <td xmlns:local="local">Icon:
+        <local:iconSizeLink title="S" sz="16x16" />
+        <local:iconSizeLink title="M" sz="24x24" />
+        <local:iconSizeLink title="L" sz="32x32" />
+      </td><td>
+        <t:rssBar />
+      </td>
+    </tr>
+  </table>
+</j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/setIconSize.jelly b/core/src/main/resources/lib/hudson/setIconSize.jelly
new file mode 100644
index 0000000000..b77ed848bb
--- /dev/null
+++ b/core/src/main/resources/lib/hudson/setIconSize.jelly
@@ -0,0 +1,12 @@
+<!--
+  read icon size from a cookie and set it up
+-->
+<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <j:set scope="parent" var="iconSize" value="${h.getCookie(request,'iconSize','32x32')}" />
+  <!--
+    balls look smaller than their actual size,
+    so we try not to make the secondary icons look bigger than the icon.
+    we want the user's eyes to go to balls, not the clock.
+  -->
+  <j:set scope="parent" var="subIconSize" value="${h.ifThenElse(iconSize=='32x32','24x24',iconSize)}"/>
+</j:jelly>
\ No newline at end of file
-- 
GitLab