LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Foundry: Several global links like the "Change password" link or the "Logout" link were not shown due to two overlapping templates in Foundry. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@3872 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2016-02-18 09:49:57 +00:00
parent cbe9617ad8
commit 087df71ce5
3 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ccm-core/web/themes/foundry/foundry/lib/template-tags/admin/cms.xsl
View File

@ -31,37 +31,44 @@
version="2.0">
<xsl:template match="show-cms-global-navigation">
<div class="cms-global-navigation">
<xsl:choose>
<!--<div class="cms-global-navigation">-->
<!--<xsl:choose>
<xsl:when test="*">
<xsl:apply-templates/>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="$data-tree/cms:globalNavigation"/>
</xsl:otherwise>
</xsl:choose>
</div>
</xsl:choose>-->
<!--<pre>
show-cms-global-navigation
<xsl:value-of select="count(./show-change-password-link)"/>
</pre>-->
<xsl:if test="$data-tree/cms:globalNavigation or $data-tree/ui:userBanner">
<xsl:apply-templates />
</xsl:if>
<!--</div>-->
</xsl:template>
<xsl:template match="show-cms-global-navigation/show-contentcenter-link">
<xsl:apply-templates select="$data-tree/cms:globalNavigation/cms:contentCenter"/>
<xsl:template match="show-cms-global-navigation//show-contentcenter-link">
<xsl:apply-templates select="$data-tree/cms:globalNavigation/cms:contentCenter"/>
</xsl:template>
<xsl:template match="show-cms-global-navigation/show-admincenter-link">
<xsl:template match="show-cms-global-navigation//show-admincenter-link">
<xsl:apply-templates select="$data-tree/cms:globalNavigation/cms:adminCenter"/>
</xsl:template>
<xsl:template match="show-cms-global-navigation/show-workspace-link">
<xsl:template match="show-cms-global-navigation//show-workspace-link">
<xsl:apply-templates select="$data-tree/cms:globalNavigation/cms:workspace"/>
</xsl:template>
<xsl:template match="show-cms-global-navigation/show-change-password-link">
<xsl:choose>
<xsl:template match="show-cms-global-navigation//show-change-password-link">
<xsl:choose>
<xsl:when test="$data-tree/cms:globalNavigation">
<xsl:apply-templates select="$data-tree/cms:globalNavigation/cms:changePassword"/>
<xsl:apply-templates select="$data-tree/cms:globalNavigation/cms:changePassword"/>
</xsl:when>
<xsl:when test="$data-tree/ui:userBanner">
<span class="cms-global-navigation-change-password">
<span class="cms-global-navigation-change-password">
<a href="{$data-tree/ui:userBanner/@changePasswordURL}">
<xsl:apply-templates select="$data-tree/ui:userBanner/@changePasswordLabel"/>
</a>
@ -70,8 +77,8 @@
</xsl:choose>
</xsl:template>
<xsl:template match="show-cms-global-navigation/show-logout-link">
<xsl:choose>
<xsl:template match="show-cms-global-navigation//show-logout-link">
<xsl:choose>
<xsl:when test="$data-tree/cms:globalNavigation">
<xsl:apply-templates select="$data-tree/cms:globalNavigation/cms:signOut"/>
</xsl:when>
@ -132,8 +139,8 @@
</xsl:template>
<xsl:template name="cms:globalNavigationEntry">
<a href="{@href}">
<xsl:value-of select="@title"/>
<a href="{./@href}">
<xsl:value-of select="./@title"/>
</a>
</xsl:template>
@ -557,4 +564,4 @@
<xsl:apply-templates/>
</li>
</xsl:template>
</xsl:stylesheet>
</xsl:stylesheet>

6
ccm-core/web/themes/foundry/foundry/lib/template-tags/user-banner.xsl
View File

@ -88,7 +88,7 @@
</p>
</foundry:doc-desc>
</foundry:doc>
<xsl:template match="show-change-password-link">
<xsl:template match="user-banner-show-change-password-link">
<a href="{$data-tree/ui:userBanner/@changePasswordURL}">
<xsl:value-of select="if (./@label)
then foundry:get-static-text('user-banner', ./@label)
@ -109,7 +109,7 @@
</p>
</foundry:doc-desc>
</foundry:doc>
<xsl:template match="show-login-link">
<xsl:template match="user-banner-show-login-link">
<a href="{$data-tree/ui:userBanner/@loginExcursionURL}">
<xsl:value-of select="if (./@label)
then foundry:get-static-text('user-banner', ./@label)
@ -130,7 +130,7 @@
</p>
</foundry:doc-desc>
</foundry:doc>
<xsl:template match="show-logout-link">
<xsl:template match="user-banner-show-logout-link">
<a href="{$data-tree/ui:userBanner/@logoutURL}">
<xsl:value-of select="if (./@label)
then foundry:get-static-text('user-banner', ./@label)

14
ccm-core/web/themes/foundry/foundry/templates/admin-layout.xml
View File

@ -30,8 +30,10 @@
</cms-greeting>
</div>
<show-cms-global-navigation>
<show-change-password-link/>
<show-logout-link/>
<div class="cms-global-navigation">
<show-change-password-link></show-change-password-link>
<show-logout-link/>
</div>
</show-cms-global-navigation>
</div>
@ -62,7 +64,9 @@
<div id="content-view-menu">
<show-cms-content-view-menu/>
<show-cms-global-navigation>
<div class="cms-global-navigation">
<show-preview-link/>
</div>
</show-cms-global-navigation>
</div>
</div>
@ -77,14 +81,18 @@
<div class="min-width">
<show-system-information/>
<show-cms-global-navigation>
<div class="cms-global-navigation">
<show-contentcenter-link/>
<show-workspace-link/>
<show-admincenter-link/>
</div>
</show-cms-global-navigation>
<show-cms-global-navigation>
<div class="cms-global-navigation">
<use-help-link/>
</div>
</show-cms-global-navigation>
</div>
</div>
</body>
</page-layout>
</page-layout>