Foundry: Finished implementation of HTML tags. Almost all elements from the HTML5 specification (http://www.w3.org/TR/html5/) are now available.

git-svn-id: https://svn.libreccm.org/ccm/trunk@2953 8810af33-2d31-482b-a856-94f89814c4df

ccm-sci-bundle/web/themes/foundry/foundry/lib/template-parser.xsl

@@ -402,10 +402,12 @@
     <xsl:template name="foundry:process-layouttree-attributes">
         <xsl:param name="current-layout-node" select="current()"/>
         <xsl:param name="copy-attributes" select="''"/>
+        <xsl:param name="id" select="''"/>
         <xsl:param name="title" select="''"/>
         
         <xsl:call-template name="foundry:set-id-and-class">
             <xsl:with-param name="current-layout-node" select="$current-layout-node"/>
+            <xsl:with-param name="id" select="$id"/>
         </xsl:call-template>
         
         <xsl:call-template name="foundry:copy-data-attributes">
@@ -508,16 +510,19 @@
             </xsl:if>
         </xsl:variable>
     
-        <xsl:if test="$id != ''">
+        <xsl:if test="$id != '' or $current-layout-node/@id">
             <xsl:attribute name="id">
+                <xsl:choose>
+                    <xsl:when test="$id != ''">
                         <xsl:value-of select="$id"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="$current-layout-node/@id"/>
+                    </xsl:otherwise>
+                </xsl:choose>
             </xsl:attribute>
         </xsl:if>
-        <xsl:if test="$current-layout-node/@id">
+    
-            <xsl:attribute name="id">
-                <xsl:value-of select="@id"/>
-            </xsl:attribute>
-        </xsl:if>
         <xsl:if test="$current-layout-node/@class 
                       or $cond-class != '' 
                       or $type-class != ''