[FIXED HUDSON-5447] Use user selected icon size on People page.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@27099 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/resources/hudson/model/View/People/index.jelly

@@ -23,9 +23,10 @@ THE SOFTWARE.
 -->
 
 <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">
-	<l:layout title="People - ${it.parent.viewName}">
-		<st:include page="sidepanel.jelly" it="${it.parent}" />
-		<l:main-panel>
+  <l:layout title="People - ${it.parent.viewName}">
+    <st:include page="sidepanel.jelly" it="${it.parent}" />
+    <t:setIconSize/>
+    <l:main-panel>
       <table class="sortable pane bigtable" id="people">
         <tr>
           <th />
@@ -35,13 +36,15 @@ THE SOFTWARE.
         </tr>
         <j:forEach var="p" items="${it.users}">
           <tr>
-            <td><a href="${rootURL}/${p.user.url}/"><img src="${imagesURL}/32x32/user.gif" alt=""/></a></td>
+            <td><a href="${rootURL}/${p.user.url}/"><img src="${imagesURL}/${iconSize}/user.gif"
+                 alt=""/></a></td>
             <td><a href="${rootURL}/${p.user.url}/">${p.user}</a></td>
             <td data="${p.timeSortKey}">${p.lastChangeTimeString}</td>
             <td><a href="${rootURL}/${p.project.url}">${p.project.name}</a></td>
           </tr>
         </j:forEach>
       </table>
+      <t:iconSize/>
     </l:main-panel>
-	</l:layout>
+  </l:layout>
 </j:jelly>

core/src/main/resources/lib/hudson/iconSize.jelly

+<!--
+The MIT License
+
+Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<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>
+        <d:invokeBody />
+      </td>
+    </tr>
+  </table>
+</j:jelly>

core/src/main/resources/lib/hudson/projectView.jelly

@@ -77,7 +77,7 @@ THE SOFTWARE.
           <t:projectViewRow />
         </j:forEach>
       </table>
-      <t:rssBar-with-iconSize/>
+      <t:iconSize><t:rssBar/></t:iconSize>
     </j:if>
   </div>
 </j:jelly>

core/src/main/resources/lib/hudson/rssBar-with-iconSize.jelly

 <!--
 The MIT License
 
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22,30 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
-<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
+<!-- Deprecated since 1.345: use <t:iconSize><t:rssBar/></t:iconSize> -->
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
+  <t:iconSize><t:rssBar/></t:iconSize>
+</j:jelly>