svn commit: r712822 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/resources/org/apache/tapestry5/corelib/components/GridColumns.tml test/java/org/apache/tapestry5/integration/IntegrationTests.java

[hlship]

Author: hlship
Date: Mon Nov 10 12:25:28 2008
New Revision: 712822

URL: http://svn.apache.org/viewvc?rev=712822&view=rev
Log:
TAP5-343: The Grid component generates non-unique HTML DOM ids for sort columns

Modified:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/GridColumns.tml
    
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/GridColumns.tml
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/GridColumns.tml?rev=712822&r1=712821&r2=712822&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/GridColumns.tml
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/GridColumns.tml
 Mon Nov 10 12:25:28 2008
@@ -7,7 +7,7 @@
                 <a t:id="sort">${columnModel.label}</a>
                 <t:if test="columnModel.sortable">
                     <a t:id="sort2">
-                        <img src="${icon}" id="${columnModel.id}:sort" 
class="t-sort-icon" alt="${iconLabel}"/>
+                        <img src="${icon}" class="t-sort-icon" 
alt="${iconLabel}"/>
                     </a>
                 </t:if>
             </t:block>

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java?rev=712822&r1=712821&r2=712822&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java
 Mon Nov 10 12:25:28 2008
@@ -658,8 +658,8 @@
 
         // The lack of a leading slash indicates that the path was optimized, 
see TAPESTRY-1502
 
-        assertAttribute("//[EMAIL PROTECTED]'title:sort']/@src", 
"assets/UNKNOWN/tapestry/corelib/components/sort-asc.png");
-        assertAttribute("//[EMAIL PROTECTED]'title:sort']/@alt", "[Asc]");
+        assertAttribute("//[EMAIL PROTECTED]'t-sort-icon']/@src", 
"assets/UNKNOWN/tapestry/corelib/components/sort-asc.png");
+        assertAttribute("//[EMAIL PROTECTED]'t-sort-icon']/@alt", "[Asc]");
 
         clickAndWait("link=1");
 
@@ -667,8 +667,8 @@
 
         clickAndWait("link=Title");
 
-        assertAttribute("//[EMAIL PROTECTED]'title:sort']/@src", 
"assets/UNKNOWN/tapestry/corelib/components/sort-desc.png");
-        assertAttribute("//[EMAIL PROTECTED]'title:sort']/@alt", "[Desc]");
+        assertAttribute("//[EMAIL PROTECTED]'t-sort-icon']/@src", 
"assets/UNKNOWN/tapestry/corelib/components/sort-desc.png");
+        assertAttribute("//[EMAIL PROTECTED]'t-sort-icon']/@alt", "[Desc]");
 
         clickAndWait("link=reset the Grid");