lenya/src/webapp/lenya/pubs/default/config/menus generic.xsp,1.9,1.10

Edith Chevrier <[email protected]> Wed, 14 May 2003 16:00:09 +0200
Newsgroups gmane.comp.cms.wyona.cvs
Message-ID <[email protected]>
Update of /usr/local/repositories/lenya/src/webapp/lenya/pubs/default/config/menus
In directory erbium:/tmp/cvs-serv25548/src/webapp/lenya/pubs/default/config/menus

Modified Files:
	generic.xsp 
Log Message:
Ant Task Publisher for default publication

Index: generic.xsp
===================================================================
RCS file: /usr/local/repositories/lenya/src/webapp/lenya/pubs/default/config/menus/generic.xsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** generic.xsp	13 May 2003 17:26:06 -0000	1.9
--- generic.xsp	14 May 2003 14:00:05 -0000	1.10
***************
*** 16,19 ****
--- 16,22 ----
        String domain_prefix_bitflux=""+xsp_lenya_context_prefix;
        String xmlSource = xsp_lenya_pub_url.replaceFirst("\\.html", ".xml");
+       if (xmlSource.startsWith("/")) {
+         xmlSource = xmlSource.substring(1);
+       } 
        String sourcesParameter = "sources=" + xmlSource;
        String urisParameter = "uris=" + xsp_lenya_pub_url;
***************
*** 29,36 ****
  <block>
  	  <item><xsp:attribute name="href">xopus2<xsp:expr>xsp_lenya_pub_url</xsp:expr></xsp:attribute>Edit&#160;with&#160;Xopus2</item>
- 	  <!--
- 	  <item><xsp:attribute name="href">?lenya.usecase=publish&amp;lenya.step=showscreen&amp;<xsp:expr>urisParameter</xsp:expr>&amp;<xsp:expr>sourcesParameter</xsp:expr>&amp;task-id=publish</xsp:attribute>Publish</item>
- 	  -->
  	  <item><xsp:attribute name="href"><xsp:expr>"/lenya/bitflux/index.html?url-xml="+bitflux_prefix+xmlSource+"&amp;url-xslt="+bitflux_prefix+"/stylesheets/xdoc.xsl&amp;url-xsd="+bitflux_prefix+"/schemas/xdoc.xsd&amp;url-css="+bitflux_prefix+"/css/xdoc.css&amp;url-post="+bitflux_prefix+"/save"+xmlSource+"&amp;url-back="+xsp_lenya_context_prefix+"/authoring"+xsp_lenya_pub_url</xsp:expr></xsp:attribute>Edit with Bitflux</item>	  
  	  <item><xsp:attribute name="href">?lenya.usecase=create&amp;lenya.step=showscreen&amp;doctype=simple</xsp:attribute>New Document</item>
  	  <item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context_prefix</xsp:expr>/logout</xsp:attribute>Logout</item>
--- 32,37 ----
  <block>
  	  <item><xsp:attribute name="href">xopus2<xsp:expr>xsp_lenya_pub_url</xsp:expr></xsp:attribute>Edit&#160;with&#160;Xopus2</item>
  	  <item><xsp:attribute name="href"><xsp:expr>"/lenya/bitflux/index.html?url-xml="+bitflux_prefix+xmlSource+"&amp;url-xslt="+bitflux_prefix+"/stylesheets/xdoc.xsl&amp;url-xsd="+bitflux_prefix+"/schemas/xdoc.xsd&amp;url-css="+bitflux_prefix+"/css/xdoc.css&amp;url-post="+bitflux_prefix+"/save"+xmlSource+"&amp;url-back="+xsp_lenya_context_prefix+"/authoring"+xsp_lenya_pub_url</xsp:expr></xsp:attribute>Edit with Bitflux</item>	  
+ 	  <item><xsp:attribute name="href">?lenya.usecase=publish&amp;lenya.step=showscreen&amp;<xsp:expr>urisParameter</xsp:expr>&amp;<xsp:expr>sourcesParameter</xsp:expr>&amp;task-id=publish</xsp:attribute>Publish</item>
  	  <item><xsp:attribute name="href">?lenya.usecase=create&amp;lenya.step=showscreen&amp;doctype=simple</xsp:attribute>New Document</item>
  	  <item><xsp:attribute name="href"><xsp:expr>xsp_lenya_context_prefix</xsp:expr>/logout</xsp:attribute>Logout</item>