Merge indication of mdui:UIInfo into main entity listing rather than …

…have an ever-growing separate section.

mdx/uk/statistics.xsl

@@ -137,7 +137,6 @@
                     <li><p><a href="#membersByScope">Members by Primary Scope</a></p></li>
                     <li><p><a href="#undeployedMembers">Members Lacking Deployment</a></p></li>
                     <li><p><a href="#shib13">Shibboleth 1.3 Remnants</a></p></li>
-                    <li><p><a href="#mdui">Entities with mdui:UIInfo support</a></p></li>
                     <li><p><a href="#exportOptIn">Export Aggregate: Entities Opted In</a></p></li>
                     <li><p><a href="#exportOptOut">Export Preview Aggregate: Entities Opted Out</a></p></li>
                     <li><p><a href="#nosaml2">Entities Without SAML 2.0 Support</a></p></li>
@@ -1078,45 +1077,6 @@
                 </xsl:call-template>
 
 
-                <!--
-                    *************************************************
-                    ***                                           ***
-                    ***   m d u i : U I I n f o   S U P P O R T   ***
-                    ***                                           ***
-                    *************************************************
-                -->
-
-                <h2><a name="mdui">Entities with mdui:UIInfo support</a></h2>
-                <xsl:variable name="uiInfoEntities" select="$entities[descendant::mdui:UIInfo]"/>
-                <xsl:variable name="uiInfoEntitiesCount" select="count($uiInfoEntities)"/>
-                <xsl:if test="$uiInfoEntitiesCount != 0">
-                    <ul>
-                        <xsl:for-each select="$uiInfoEntities">
-                            <li>
-                                <xsl:value-of select="@ID"/>
-                                <xsl:text>: </xsl:text>
-                                <xsl:if test="md:IDPSSODescriptor">
-                                    <xsl:text>[IdP] </xsl:text>
-                                </xsl:if>
-                                <xsl:if test="md:SPSSODescriptor">
-                                    <xsl:text>[SP] </xsl:text>
-                                </xsl:if>
-                                <xsl:choose>
-                                    <xsl:when test="descendant::mdui:DisplayName">
-                                        <xsl:value-of select="descendant::mdui:DisplayName"/>
-                                    </xsl:when>
-                                    <xsl:otherwise>
-                                        <xsl:text>(</xsl:text>
-                                        <xsl:value-of select="descendant::md:OrganizationDisplayName"/>
-                                        <xsl:text>)</xsl:text>
-                                    </xsl:otherwise>
-                                </xsl:choose>
-                            </li>
-                        </xsl:for-each>
-                    </ul>
-                </xsl:if>
-
-
                 <!--
                     *************************************
                     ***                               ***
@@ -1394,6 +1354,7 @@
                             <xsl:if test="md:IDPSSODescriptor"> [IdP]</xsl:if>
                             <xsl:if test="md:Extensions/wayf:HideFromWAYF"> [H]</xsl:if>
                             <xsl:if test="md:SPSSODescriptor"> [SP]</xsl:if>
+                            <xsl:if test="descendant::mdui:UIInfo"> [UIInfo]</xsl:if>
                             <xsl:apply-templates select="md:Extensions/ukfedlabel:Software" mode="short"/>
                             <xsl:text> </xsl:text>
                             <code><xsl:value-of select="@entityID"/></code>