*** ./site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm.orig	2012-06-28 08:33:02.000000000 +0900
--- ./site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm	2012-06-29 08:10:27.000000000 +0900
***************
*** 502,515 ****
  								        #end
  								    #end
  									#foreach($r in $roles)
  										#if($r.Id == $uRole)
  										<option value ="$r.Id" selected>
! 											$r.Id
  										</option>
  										#else
  											#if(!($r.isProviderOnly() || ($hasRestrictedRole == "true")))
  											<option value ="$r.Id">
! 												$r.Id 
  											</option>
  											#end
  										#end
--- 503,518 ----
  								        #end
  								    #end
  									#foreach($r in $roles)
+ 										#set($RoleId = $r.Id)
+ 										#set($RoleId = $RoleId.replaceAll(" ",""))
  										#if($r.Id == $uRole)
  										<option value ="$r.Id" selected>
! 											$tlang.getString("sitegen.role.$RoleId")
  										</option>
  										#else
  											#if(!($r.isProviderOnly() || ($hasRestrictedRole == "true")))
  											<option value ="$r.Id">
! 												$tlang.getString("sitegen.role.$RoleId")
  											</option>
  											#end
  										#end
***************
*** 559,582 ****
  		<h4>$tlang.getString("sitegen.siteinfolist.roledes")</h4>
  			<dl>
  				#foreach ($role in $roles)
! 					##		#set ($description = false)
  					<dt>
! 						$role.Id
  					</dt>
  					<dd class="instruction indnt3">
! 							#set($description = "")
! 							#if ($role.Description)
! 								#set($description = $role.Description)
! 							#else
! 								## search for internationalized description in bundle
!                                 #set($propertiesKey = "sitegen.roledescription.")
!                                 #set($RoleId = $role.Id)
! 								#set($RoleId = $RoleId.replaceAll(" ",""))
! 								#set($roleDesc="${propertiesKey}${RoleId}")
!                                 #set($description = $tlang.getString($roleDesc,""))
! 							#end
! 							$validator.escapeHtml($!description)
! 
  					</dd>
  				#end
  			</dl>	
--- 562,574 ----
  		<h4>$tlang.getString("sitegen.siteinfolist.roledes")</h4>
  			<dl>
  				#foreach ($role in $roles)
! 					#set($RoleId = $role.Id)
! 					#set($RoleId = $RoleId.replaceAll(" ",""))
  					<dt>
! 						$tlang.getString("sitegen.role.$RoleId")
  					</dt>
  					<dd class="instruction indnt3">
! 						$tlang.getString("sitegen.roledescription.$RoleId")
  					</dd>
  				#end
  			</dl>