You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/07/03 16:42:26 UTC

cvs commit: cocoon-lenya/src/webapp/lenya/content/ac user-admin.js

andreas     2003/07/03 07:42:26

  Modified:    src/webapp/lenya admin.xmap
               src/webapp/lenya/content/ac user-admin.js
  Log:
  using /users/ step in flow URIs to enable menu item highlighting
  
  Revision  Changes    Path
  1.8       +8 -17     cocoon-lenya/src/webapp/lenya/admin.xmap
  
  Index: admin.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/admin.xmap,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- admin.xmap	3 Jul 2003 12:46:10 -0000	1.7
  +++ admin.xmap	3 Jul 2003 14:42:26 -0000	1.8
  @@ -43,7 +43,8 @@
       
       <map:pipeline>
         
  -      <map:match pattern="lenya.usecase.change_*/*.html">
  +      <!-- The 'users' URI step is needed to highlight the menu item. -->
  +      <map:match pattern="internal/users/lenya.usecase.change_*/*.xml">
           <map:generate src="content/ac/user-{2}.xsp" type="serverpages"/>
           <map:transform src="xslt/ac/user-{2}.xsl"/>
           <map:serialize type="xml"/>
  @@ -101,6 +102,7 @@
       </map:pipeline>
   
       <map:pipeline>
  +      
         <map:match pattern="internal/index.html">
           <map:generate src="content/admin/index.xml"/>
           <map:serialize type="xml"/>
  @@ -111,12 +113,10 @@
           <map:transform src="xslt/admin/status2html.xslt">
             <map:parameter name="contextPath" value="{request:contextPath}"/>
           </map:transform>
  -      <map:serialize type="html"/>
  -<!--
  -    <map:serialize type="xml"/>
  --->
  -   </map:match>
  -   </map:pipeline>
  +        <map:serialize type="html"/>
  +      </map:match>
  +      
  +    </map:pipeline>
   
       
       <!-- =================================================================== -->
  @@ -125,21 +125,12 @@
       
       <map:pipeline>
         
  -      <!-- sitetree -->
  -      <map:match pattern="sitetree/**.xml">
  -        <map:generate src="content/admin/sitetree.xml"/>
  -        <map:transform src="xslt/navigation/sitetree2nav.xsl">
  -          <map:parameter name="url" value="{1}"/>
  -        </map:transform>
  -      </map:match>
  -      
         <map:match pattern="cmsbody/**">
           <map:aggregate element="cmsbody">
             <map:part src="cocoon://navigation/{page-envelope:publication-id}/admin/menu/{1}.xml"/>
             <map:part src="cocoon:/internal/{1}"/>
   				</map:aggregate>
  -        <map:transform src="xslt/admin/page.xsl"/>
  -        <map:transform src="xslt/util/page2xhtml.xsl">
  +        <map:transform src="xslt/admin/page2xhtml.xsl">
             <map:parameter name="contextprefix" value="{request:contextPath}"/>
           </map:transform>
           <map:serialize type="xml"/>
  
  
  
  1.2       +3 -3      cocoon-lenya/src/webapp/lenya/content/ac/user-admin.js
  
  Index: user-admin.js
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/ac/user-admin.js,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- user-admin.js	2 Jul 2003 17:55:21 -0000	1.1
  +++ user-admin.js	3 Jul 2003 14:42:26 -0000	1.2
  @@ -32,7 +32,7 @@
   	// at the moment the loop is executed only once (no form validation)
   	
       while (true) {
  -	    sendPageAndWait("lenya.usecase.change_profile/profile.html", {
  +	    sendPageAndWait("users/lenya.usecase.change_profile/profile.xml", {
   	    	"user-id" : userId,
   	    	"fullname" : fullName,
   	    	"email" : email
  @@ -75,7 +75,7 @@
       var message = "";
       
       while (true) {
  -	    sendPageAndWait("lenya.usecase.change_password/password.html", {
  +	    sendPageAndWait("users/lenya.usecase.change_password/password.xml", {
   	    	"user-id" : userId,
   	    	"new-password" : newPassword,
   	    	"confirm-password" : confirmPassword,
  @@ -129,7 +129,7 @@
       }
       
       while (true) {
  -	    sendPageAndWait("lenya.usecase.change_groups/groups.html", {
  +	    sendPageAndWait("users/lenya.usecase.change_groups/groups.xml", {
   	    	"user-id" : userId,
   	    	"groups" : groups,
   	    	"user-groups" : userGroups
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org