From 25eb8f2941dae6cbe744340f0222768030a50256 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 8 Feb 2016 09:57:39 +0000
Subject: [PATCH] - BugFixes for Foundry (12h time format used hour instead of
 minute) - Added auditing trail of the *current* version to traversal adapter

git-svn-id: https://svn.libreccm.org/ccm/trunk@3845 8810af33-2d31-482b-a856-94f89814c4df
---
 .../WEB-INF/resources/cms-item-adapters.xml   |  3 ++
 .../foundry/foundry/lib/template-parser.xsl   |  4 +--
 .../foundry/lib/template-tags/navigation.xsl  | 31 ++++++++++++++++---
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/ccm-cms/src/WEB-INF/resources/cms-item-adapters.xml b/ccm-cms/src/WEB-INF/resources/cms-item-adapters.xml
index fa4eb1d6e..3430989ae 100755
--- a/ccm-cms/src/WEB-INF/resources/cms-item-adapters.xml
+++ b/ccm-cms/src/WEB-INF/resources/cms-item-adapters.xml
@@ -59,6 +59,9 @@
             <xrd:attributes rule="exclude">
             </xrd:attributes>
             <xrd:associations rule="include">
+                <xrd:property name="/object/auditing"/>
+                <xrd:property name="/object/auditing/creationUser"/>
+                <xrd:property name="/object/auditing/lastModifiedUser"/>
                 <xrd:property name="/object/masterVersion"/>
                 <xrd:property name="/object/masterVersion/auditing"/>
                 <xrd:property name="/object/masterVersion/auditing/creationUser"/>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl
index 47d0e758a..74840aa71 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl
@@ -854,7 +854,7 @@
                 <xsl:variable name="minute">
                     <xsl:choose>
                         <xsl:when test="string-length($minute-value) &lt; 2">
-                            <xsl:value-of select="concat('0', $hour-value)"/>
+                            <xsl:value-of select="concat('0', $minute-value)"/>
                         </xsl:when>
                         <xsl:otherwise>
                             <xsl:value-of select="$minute-value"/>
@@ -881,4 +881,4 @@
         </xsl:choose>
     </xsl:template>
     
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
index 621ff6d51..8224fadbd 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
@@ -173,9 +173,20 @@
         <xsl:variable name="navigation-id" 
                       select="foundry:get-attribute-value(current(), 'navigation-id', 'categoryMenu')"/>
         <xsl:apply-templates>
-            <xsl:with-param name="href" 
+            <!--<xsl:with-param name="href" 
                             select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@url"
-                            tunnel="yes"/>
+                            tunnel="yes"/>-->
+            <xsl:with-param name="href"
+                            tunnel="yes">
+                <xsl:choose>
+                    <xsl:when test="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@url">
+                        <xsl:value-of select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@url"/>
+                    </xsl:when>
+                    <xsl:when test="$data-tree//nav:categoryPath/nav:category/@url">
+                        <xsl:value-of select="$data-tree//nav:categoryPath/nav:category/@url"/>
+                    </xsl:when>
+                </xsl:choose>
+            </xsl:with-param>
             <xsl:with-param name="navigation-id" select="$navigation-id" tunnel="yes"/>
             <xsl:with-param name="title" tunnel="yes">
                 <xsl:choose>
@@ -183,9 +194,16 @@
                         <xsl:choose>
                             <xsl:when test="./@use-static-title = 'false'">
                                 <xsl:value-of select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title"/>
-                            </xsl:when>
+                            </xsl:when>                            
                             <xsl:otherwise>
-                                <xsl:value-of select="foundry:get-static-text('navigation', $data-tree//nav:categoryMenu[@id=$navigation-id]/@navigation-id, false())"/>
+                                <xsl:choose>
+                                    <xsl:when test="$data-tree//nav:categoryMenu[@id=$navigation-id]/@navigation-id">
+                                        <xsl:value-of select="foundry:get-static-text('navigation', $data-tree//nav:categoryMenu[@id=$navigation-id]/@navigation-id, false())"/>
+                                    </xsl:when>
+                                    <xsl:when test="$data-tree//nav:categoryPath/@navigation-id">
+                                        <xsl:value-of select="foundry:get-static-text('navigation', $data-tree//nav:categoryPath[@id=$navigation-id]/@navigation-id, false())"/>
+                                    </xsl:when>
+                                </xsl:choose>
                             </xsl:otherwise>
                         </xsl:choose>
                     </xsl:when>
@@ -212,6 +230,9 @@
             <xsl:when test="string-length($data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title) &gt; 0">
                 <xsl:value-of select="foundry:shying($data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title)"/>
             </xsl:when>
+            <xsl:when test="string-length($data-tree//nav:categoryPath/nav:category/@title) &gt; 0">
+                <xsl:value-of select="foundry:shying($data-tree/nav:categoryPath/nav:category/@title)"/>
+            </xsl:when>
             <xsl:otherwise>
                 <xsl:value-of select="''"/>
             </xsl:otherwise>
@@ -577,4 +598,4 @@
         </li>
     </xsl:template>
     
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>