[Bedework-commit] bedework r1859 - releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default

[svnadmin at bedework.org]

Author: johnsa
Date: 2008-04-24 14:57:39 -0400 (Thu, 24 Apr 2008)
New Revision: 1859

Modified:
   releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl
Log:
admin client: set submitter to actual user, display actual (not group) user in menubar

Modified: releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl	2008-04-24 18:57:22 UTC (rev 1858)
+++ releases/bedework-3.4.1.1/deployment/webadmin/webapp/resources/default/default/default.xsl	2008-04-24 18:57:39 UTC (rev 1859)
@@ -554,9 +554,9 @@
             </xsl:if>
             Logged in as:
             <span class="status">
-              <xsl:value-of select="/bedework/userInfo/user"/>
+              <xsl:value-of select="/bedework/userInfo/currentUser"/>
             </span>
-            &#160;
+            &#160;
             <xsl:if test="/bedework/userInfo/group">
               Group:
               <span class="status">
@@ -1071,7 +1071,7 @@
     <xsl:variable name="submitter">
       <xsl:choose>
         <xsl:when test="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']/values/text"/></xsl:when>
-        <xsl:otherwise><xsl:value-of select="/bedework/userInfo/user"/></xsl:otherwise>
+        <xsl:otherwise><xsl:value-of select="/bedework/userInfo/currentUser"/> for <xsl:value-of select="/bedework/userInfo/group"/> (<xsl:value-of select="/bedework/userInfo/user"/>)</xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
     <form name="eventForm" method="post" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')">