Neueste Version von Mandalay mit weiteren Verbesserungen im ContentCenter

git-svn-id: https://svn.libreccm.org/ccm/trunk@2344 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2013-10-10 08:22:26 +00:00
parent 3882dd75c5
commit c57bf45a5d
3 changed files with 22 additions and 4 deletions

View File

@ -50,7 +50,14 @@
</xsl:call-template> </xsl:call-template>
&nbsp; &nbsp;
<span class="cmsUserName"> <span class="cmsUserName">
<xsl:choose>
<xsl:when test="$resultTree/@name">
<xsl:value-of select="$resultTree/@name"/> <xsl:value-of select="$resultTree/@name"/>
</xsl:when>
<xsl:when test="$resultTree//ui:userBanner/@screenName">
<xsl:value-of select="concat($resultTree//ui:userBanner/@givenName, '', $resultTree//ui:userBanner/@familyName)"/>
</xsl:when>
</xsl:choose>
</span> </span>
</div> </div>
</xsl:template> </xsl:template>

View File

@ -34,6 +34,7 @@
xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
xmlns:ppp="http://www.arsdigita.com/PublicPersonalProfile/1.0" xmlns:ppp="http://www.arsdigita.com/PublicPersonalProfile/1.0"
xmlns:mandalay="http://mandalay.quasiweb.de" xmlns:mandalay="http://mandalay.quasiweb.de"
xmlns:atoz="http://xmlns.redhat.com/atoz/1.0"
exclude-result-prefixes="xsl aplaws bebop cms docs forum mandalay nav portal ppp search subsite terms ui" exclude-result-prefixes="xsl aplaws bebop cms docs forum mandalay nav portal ppp search subsite terms ui"
version="1.0"> version="1.0">
@ -651,7 +652,18 @@
</xsl:template> </xsl:template>
<xsl:template match="useLogoutLink"> <xsl:template match="useLogoutLink">
<xsl:choose>
<xsl:when test="$resultTree/cms:globalNavigation">
<xsl:apply-templates select="$resultTree/cms:globalNavigation/cms:signOut"/> <xsl:apply-templates select="$resultTree/cms:globalNavigation/cms:signOut"/>
</xsl:when>
<xsl:when test="$resultTree/ui:userBanner">
<span class="cmsGlobalNavigationSignOut">
<a href="{$resultTree/ui:userBanner/@logoutURL}">
<xsl:apply-templates select="$resultTree/ui:userBanner/@signoutLabel"/>
</a>
</span>
</xsl:when>
</xsl:choose>
</xsl:template> </xsl:template>
<xsl:template match="useHelpLink"> <xsl:template match="useHelpLink">

View File

@ -42,7 +42,6 @@
--> -->
<xsl:import href="types/ContentBundle.xsl"/> <xsl:import href="types/ContentBundle.xsl"/>
<xsl:import href="types/DecisionTree.xsl"/> <xsl:import href="types/DecisionTree.xsl"/>
<xsl:import href="types/DecisionTree.xsl"/>
<xsl:import href="types/PublicPersonalProfile.xsl"/> <xsl:import href="types/PublicPersonalProfile.xsl"/>
<xsl:import href="types/SciDepartment.xsl"/> <xsl:import href="types/SciDepartment.xsl"/>
<xsl:import href="types/SciInstitute.xsl"/> <xsl:import href="types/SciInstitute.xsl"/>