Author: dward
Date: 2007-12-14 22:07:44 +0100 (Fri, 14 Dec 2007)
New Revision: 6380
Modified:
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/space.vm
Log:
- CURRIKI-1159
- Fix macros to show desired breadcrumbs
Modified:
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
===================================================================
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
2007-12-14 14:48:08 UTC (rev 6379)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
2007-12-14 21:07:44 UTC (rev 6380)
@@ -136,6 +136,13 @@
#elseif($currikiDoc.getObject("XWiki.ArticleClass"))
#set($currikiTitle = $!currikiDoc.display("title", "view",
$currikiDoc.getObject("XWiki.ArticleClass")))
#end
+ #elseif($currikiDoc.fullName == "MyCurriki.WebHome" && "$!request.user" != "")
+ #set($whofor = $request.user)
+ #if(!$whofor.startsWith("XWiki.")) ## {
+ #set($whofor = "XWiki.$whofor")
+ #end ## }
+ #set($userDoc = $xwiki.getDocument($whofor))
+ #set($currikiTitle = "$!userDoc.display('first_name', 'view')
$!userDoc.display('last_name', 'view')")
#elseif($currikiDoc.space == "XWiki" &&
$currikiDoc.getObject("XWiki.XWikiUsers"))
#findUserPrefix($currikiDoc.name)
#set($currikiTitle = "${userPrefix} Curriki")
@@ -704,9 +711,13 @@
## Macro for verifying if an entry in the nav panel is active
#macro(checkActive $docname $result)
#if($doc.fullName == $docname)
+#if($doc.space == "MyCurriki" && "$!request.user" != "")
+#set($result = false)
+#else
#set($result = true)
#end
#end
+#end
##
## Displays a navigation category, with sub-elements
#macro(navigationCategory $text $link $expanded $items)
Modified:
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/space.vm
===================================================================
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/space.vm
2007-12-14 14:48:08 UTC (rev 6379)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/space.vm
2007-12-14 21:07:44 UTC (rev 6380)
@@ -46,7 +46,11 @@
#set($bcDoc = $xwiki.getDocument($request.editArticle))
#end
#findCurrikiTitle($bcDoc)
- <a href="$bcDoc.getURL("view", "bc=${previousBc}")">$currikiTitle</a>
+ #set($userArg = "")
+ #if($bcDoc.space=="MyCurriki" && "$!request.user" != "")
+ #set($userArg="&user=$request.user")
+ #end
+ <a href="$bcDoc.getURL("view",
"bc=${previousBc}${userArg}")">$currikiTitle</a>
#set($previousBc = "${previousBc};${bcItem}")
#end
#end
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
