[Bedework-commit] webapps r736 - in releases/bedework-3.4.1.1: webadmin/war/docs webclient/war/docs

[svnadmin at bedework.org]

Author: johnsa
Date: 2008-04-24 14:58:27 -0400 (Thu, 24 Apr 2008)
New Revision: 736

Modified:
   releases/bedework-3.4.1.1/webadmin/war/docs/header.jsp
   releases/bedework-3.4.1.1/webclient/war/docs/header.jsp
Log:
web clients: 
add all categories list to public client XML
add currentUser to admin client XML

Modified: releases/bedework-3.4.1.1/webadmin/war/docs/header.jsp
===================================================================
--- releases/bedework-3.4.1.1/webadmin/war/docs/header.jsp	2008-04-22 13:50:02 UTC (rev 735)
+++ releases/bedework-3.4.1.1/webadmin/war/docs/header.jsp	2008-04-24 18:58:27 UTC (rev 736)
@@ -253,7 +253,8 @@
       <adminGroupMaintOk>false</adminGroupMaintOk>
     </logic:notEqual>
 
-    <%-- user and group --%>
+    <%-- user and group --%>
+    <bw:emitText name="calForm" property="currentUser"/>
     <bw:emitText name="calForm" property="adminUserId" tagName="user"/>
     <logic:present name="calForm" property="adminGroupName" >
       <bw:emitText name="calForm" property="adminGroupName" tagName="group"/>

Modified: releases/bedework-3.4.1.1/webclient/war/docs/header.jsp
===================================================================
--- releases/bedework-3.4.1.1/webclient/war/docs/header.jsp	2008-04-22 13:50:02 UTC (rev 735)
+++ releases/bedework-3.4.1.1/webclient/war/docs/header.jsp	2008-04-24 18:58:27 UTC (rev 736)
@@ -357,7 +357,17 @@
         </view>
       </logic:iterate>
     </logic:present>
-  </views>
+  </views>
+
+  <%-- List of categories for menuing --%>
+  <categories>
+    <logic:iterate id="category" name="calForm" property="categories">
+      <category>
+        <keyword><bean:write name="category" property="word.value"/></keyword>
+        <creator><bean:write name="category" property="creator.account"/></creator>
+      </category>
+    </logic:iterate>
+  </categories>
 
   <%-- List of filters for menuing --%>
   <filters>