From: <vol...@us...> - 2008-07-22 07:07:14
|
Revision: 1418 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1418&view=rev Author: volkermische Date: 2008-07-22 07:07:20 +0000 (Tue, 22 Jul 2008) Log Message: ----------- - added possiblility to requests document with ID (instead of UUID) from ShowMetaDocument service - changed xforms.xml export service from .services.metadata.Show to .services.metadata.GetEditableData to get the correct version number - xforms.xml uses ID instead of UUID - authentication works via GET parameters (username and password) - creating new documents from templates is possible with metadata.create.form.xforms service (you need to append username and password to URL) Modified Paths: -------------- sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/guiservices/groups/GetMine.java sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/Create.java sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/GetEditableData.java sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/Show.java sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/ShowMetaDocument.java sandbox/geonetworkui/BlueNetMEST/web/geonetwork/WEB-INF/config-export.xml sandbox/geonetworkui/BlueNetMEST/web/geonetwork/WEB-INF/config-metadata.xml sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xml/user-profiles.xml sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/conversion/export/xml_xforms-header-footer.xsl sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/conversion/export/xml_xforms.xsl sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/metadata-recentadditions.xsl Added Paths: ----------- sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/xforms_metadata-create.xsl Modified: sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/guiservices/groups/GetMine.java =================================================================== --- sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/guiservices/groups/GetMine.java 2008-07-22 03:43:33 UTC (rev 1417) +++ sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/guiservices/groups/GetMine.java 2008-07-22 07:07:20 UTC (rev 1418) @@ -24,13 +24,19 @@ package org.fao.geonet.guiservices.groups; import java.util.Set; + +import jeeves.exceptions.UserNotFoundEx; import jeeves.interfaces.Service; import jeeves.resources.dbms.Dbms; import jeeves.server.ServiceConfig; import jeeves.server.UserSession; import jeeves.server.context.ServiceContext; +import jeeves.utils.Util; + import org.fao.geonet.constants.Geonet; +import org.fao.geonet.constants.Params; import org.fao.geonet.lib.Lib; +import org.fao.geonet.services.login.Login; import org.jdom.Element; //============================================================================= @@ -50,6 +56,26 @@ public Element exec(Element params, ServiceContext context) throws Exception { + + //--- login if request included a username and a password + + String username = Util.getParam(params, Params.USERNAME, null); + String password = Util.getParam(params, Params.PASSWORD, null); + + if (username != null && password != null) + { + Element root = new Element("root"); + root.addContent(new Element(Params.USERNAME).setText(username)); + root.addContent(new Element(Params.PASSWORD).setText(password)); + + Login login = new Login(); + + Element response = login.exec(root, context); + + if (!response.getName().equals("ok")) + throw new UserNotFoundEx(username); + } + UserSession session = context.getUserSession(); if (!session.isAuthenticated()) Modified: sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/Create.java =================================================================== --- sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/Create.java 2008-07-22 03:43:33 UTC (rev 1417) +++ sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/Create.java 2008-07-22 07:07:20 UTC (rev 1418) @@ -25,6 +25,7 @@ import java.util.HashSet; import jeeves.constants.Jeeves; +import jeeves.exceptions.UserNotFoundEx; import jeeves.interfaces.Service; import jeeves.resources.dbms.Dbms; import jeeves.server.ServiceConfig; @@ -34,6 +35,7 @@ import org.fao.geonet.constants.Geonet; import org.fao.geonet.constants.Params; import org.fao.geonet.kernel.DataManager; +import org.fao.geonet.services.login.Login; import org.jdom.Element; //============================================================================= @@ -57,6 +59,25 @@ String template = Util.getParam(params, Params.ID); String groupOwner= Util.getParam(params, Params.GROUP); + + //--- login if request included a username and a password + + String username = Util.getParam(params, Params.USERNAME, null); + String password = Util.getParam(params, Params.PASSWORD, null); + + if (username != null && password != null) + { + Element root = new Element("root"); + root.addContent(new Element(Params.USERNAME).setText(username)); + root.addContent(new Element(Params.PASSWORD).setText(password)); + + Login login = new Login(); + + Element response = login.exec(root, context); + + if (!response.getName().equals("ok")) + throw new UserNotFoundEx(username); + } //--- query the data manager Modified: sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/GetEditableData.java =================================================================== --- sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/GetEditableData.java 2008-07-22 03:43:33 UTC (rev 1417) +++ sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/GetEditableData.java 2008-07-22 07:07:20 UTC (rev 1418) @@ -26,6 +26,7 @@ import java.util.*; import org.jdom.*; +import jeeves.exceptions.UserNotFoundEx; import jeeves.interfaces.*; import jeeves.resources.dbms.*; import jeeves.server.*; @@ -34,6 +35,7 @@ import org.fao.geonet.constants.*; import org.fao.geonet.kernel.*; +import org.fao.geonet.services.login.Login; import org.fao.geonet.*; //============================================================================= @@ -59,6 +61,25 @@ public Element exec(Element params, ServiceContext context) throws Exception { + //--- login if request included a username and a password + + String username = Util.getParam(params, Params.USERNAME, null); + String password = Util.getParam(params, Params.PASSWORD, null); + + if (username != null && password != null) + { + Element root = new Element("root"); + root.addContent(new Element(Params.USERNAME).setText(username)); + root.addContent(new Element(Params.PASSWORD).setText(password)); + + Login login = new Login(); + + Element response = login.exec(root, context); + + if (!response.getName().equals("ok")) + throw new UserNotFoundEx(username); + } + EditUtils.preprocessUpdate(params, context); GeonetContext gc = (GeonetContext) context.getHandlerContext(Geonet.CONTEXT_NAME); Modified: sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/Show.java =================================================================== --- sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/Show.java 2008-07-22 03:43:33 UTC (rev 1417) +++ sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/Show.java 2008-07-22 07:07:20 UTC (rev 1418) @@ -24,6 +24,7 @@ package org.fao.geonet.services.metadata; import jeeves.exceptions.MissingParameterEx; +import jeeves.exceptions.UserNotFoundEx; import jeeves.interfaces.Service; import jeeves.resources.dbms.Dbms; import jeeves.server.ServiceConfig; @@ -37,6 +38,7 @@ import org.fao.geonet.kernel.AccessManager; import org.fao.geonet.kernel.DataManager; import org.fao.geonet.lib.Lib; +import org.fao.geonet.services.login.Login; import org.jdom.Element; //============================================================================= @@ -67,6 +69,25 @@ public Element exec(Element params, ServiceContext context) throws Exception { + //--- login if request included a username and a password + + String username = Util.getParam(params, Params.USERNAME, null); + String password = Util.getParam(params, Params.PASSWORD, null); + + if (username != null && password != null) + { + Element root = new Element("root"); + root.addContent(new Element(Params.USERNAME).setText(username)); + root.addContent(new Element(Params.PASSWORD).setText(password)); + + Login login = new Login(); + + Element response = login.exec(root, context); + + if (!response.getName().equals("ok")) + throw new UserNotFoundEx(username); + } + UserSession session = context.getUserSession(); //----------------------------------------------------------------------- Modified: sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/ShowMetaDocument.java =================================================================== --- sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/ShowMetaDocument.java 2008-07-22 03:43:33 UTC (rev 1417) +++ sandbox/geonetworkui/BlueNetMEST/src/org/fao/geonet/services/metadata/ShowMetaDocument.java 2008-07-22 07:07:20 UTC (rev 1418) @@ -31,6 +31,7 @@ import jeeves.exceptions.BadParameterEx; import jeeves.exceptions.MissingParameterEx; import jeeves.exceptions.OperationAbortedEx; +import jeeves.exceptions.UserNotFoundEx; import jeeves.interfaces.Service; import jeeves.resources.dbms.Dbms; import jeeves.server.ServiceConfig; @@ -46,6 +47,7 @@ import org.fao.geonet.kernel.AccessManager; import org.fao.geonet.kernel.DataManager; import org.fao.geonet.lib.Lib; +import org.fao.geonet.services.login.Login; import org.jdom.Element; //============================================================================= @@ -74,6 +76,25 @@ public Element exec(Element params, ServiceContext context) throws Exception { + //--- login if request included a username and a password + + String username = Util.getParam(params, Params.USERNAME, null); + String password = Util.getParam(params, Params.PASSWORD, null); + + if (username != null && password != null) + { + Element root = new Element("root"); + root.addContent(new Element(Params.USERNAME).setText(username)); + root.addContent(new Element(Params.PASSWORD).setText(password)); + + Login login = new Login(); + + Element response = login.exec(root, context); + + if (!response.getName().equals("ok")) + throw new UserNotFoundEx(username); + } + UserSession session = context.getUserSession(); Element response = new Element("response"); @@ -100,8 +121,16 @@ } Element edit = params.getChild(Params.EDITING); // ignore } - catch(Exception e) { - return buildError(response, "Missing or Invalid UUID parameter"); + catch(MissingParameterEx x) { + // request does not contain UUID; use ID from request + try { + id = Util.getParam(params, Params.ID); + } + // request does not contain ID + catch(MissingParameterEx xx) { + // give up + throw new Exception("Request must contain a UUID or an ID"); + } } try { Modified: sandbox/geonetworkui/BlueNetMEST/web/geonetwork/WEB-INF/config-export.xml =================================================================== --- sandbox/geonetworkui/BlueNetMEST/web/geonetwork/WEB-INF/config-export.xml 2008-07-22 03:43:33 UTC (rev 1417) +++ sandbox/geonetworkui/BlueNetMEST/web/geonetwork/WEB-INF/config-export.xml 2008-07-22 07:07:20 UTC (rev 1418) @@ -47,7 +47,7 @@ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <service name="xforms.xml"> - <class name=".services.metadata.Show"/> + <class name=".services.metadata.GetEditableData"/> <output sheet="conversion/export/xml_xforms.xsl" contentType="text/xml; charset=UTF-8"/> Modified: sandbox/geonetworkui/BlueNetMEST/web/geonetwork/WEB-INF/config-metadata.xml =================================================================== --- sandbox/geonetworkui/BlueNetMEST/web/geonetwork/WEB-INF/config-metadata.xml 2008-07-22 03:43:33 UTC (rev 1417) +++ sandbox/geonetworkui/BlueNetMEST/web/geonetwork/WEB-INF/config-metadata.xml 2008-07-22 07:07:20 UTC (rev 1418) @@ -217,6 +217,16 @@ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <service name="metadata.create.form.xforms"> + <output sheet="xforms_metadata-create.xsl"> + <call name="groups" class=".guiservices.groups.GetMine"/> + <call name="templates" class=".guiservices.templates.Get"/> + <xml name="create" file="xml/metadata-create.xml" /> + </output> + </service> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <service name="metadata.duplicate.form"> <output sheet="metadata-duplicate.xsl"> <call name="groups" class=".guiservices.groups.GetMine"/> @@ -242,6 +252,12 @@ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <service name="metadata.create.edit.xforms"> + <class name=".services.metadata.Create"/> + </service> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <service name="metadata.admin.form"> <class name=".services.metadata.GetAdminOper"/> Modified: sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xml/user-profiles.xml =================================================================== --- sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xml/user-profiles.xml 2008-07-22 03:43:33 UTC (rev 1417) +++ sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xml/user-profiles.xml 2008-07-22 07:07:20 UTC (rev 1418) @@ -214,8 +214,10 @@ <allow service="metadata.duplicate.form"/> <allow service="metadata.create.form"/> + <allow service="metadata.create.form.xforms"/> <allow service="metadata.create"/> <allow service="metadata.create.edit"/> + <allow service="metadata.create.edit.xforms"/> <!-- Allow to edit a metadata record --> <allow service="metadata.edit"/> Modified: sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/conversion/export/xml_xforms-header-footer.xsl =================================================================== --- sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/conversion/export/xml_xforms-header-footer.xsl 2008-07-22 03:43:33 UTC (rev 1417) +++ sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/conversion/export/xml_xforms-header-footer.xsl 2008-07-22 07:07:20 UTC (rev 1418) @@ -149,7 +149,10 @@ <dummy xmlns=""/> </xf:instance> - <xf:instance id="metadata" src="{$geonetwork-location}/srv/{$language}/xml.metadocument.instance?uuid={$uuid}"/> + <!-- XXX username and password get transmitted as clear text (as + GET parameters)! Authentication should be redone in a proper way. --> + <!--<xf:instance id="metadata" src="{$geonetwork-location}/srv/{$language}/xml.metadocument.instance?uuid={$uuid}&username={$username}&password={$password}"/>--> + <xf:instance id="metadata" src="{$geonetwork-location}/srv/{$language}/xml.metadocument.instance?id={$id}&username={$username}&password={$password}"/> <!-- Template for inserting attributes in an element --> <xf:instance id="template-attributes"> @@ -217,11 +220,13 @@ <!--<![CDATA[ Geonetwork needs some additional info (id and new revision number - (version) of the document) for storing the meta data.]]>--> + (version) of the document) for storing the meta data. + XXX username and password get set by stylesheet parameters (e.g. + via GET) at the moment ]]>--> <xf:instance id="geonetwork-request-update"> <request xmlns=""> - <username>admin</username> - <password>admin</password> + <username><xsl:value-of select="$username"/></username> + <password><xsl:value-of select="$password"/></password> <id><xsl:value-of select="/root/gmd:MD_Metadata/geonet:info/id"/></id> <version><xsl:value-of select="number(/root/gmd:MD_Metadata/geonet:info/version)+1"/></version> <data/> Modified: sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/conversion/export/xml_xforms.xsl =================================================================== --- sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/conversion/export/xml_xforms.xsl 2008-07-22 03:43:33 UTC (rev 1417) +++ sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/conversion/export/xml_xforms.xsl 2008-07-22 07:07:20 UTC (rev 1418) @@ -20,7 +20,8 @@ > <!-- the uuid is set by the http request --> <xsl:param name="geonetwork-location" select="concat('http://',/root/gui/env/server/host,':',/root/gui/env/server/port,/root/gui/url)"/> -<xsl:param name="uuid"/> +<!--<xsl:param name="uuid"/>--> +<xsl:param name="id"/> <xsl:param name="schema" select="'iso19139'"/> <xsl:param name="language" select="if (/root/gui/strings/language and /root/gui/strings/language !='') then /root/gui/strings/language else 'en'"/> <xsl:param name="config" select="concat($geonetwork-location,'/xml/xforms/config-brs.xml')"/> @@ -28,6 +29,11 @@ <xsl:param name="labels" select="concat($geonetwork-location,'/xml/schemas/',$schema,'/loc/',$language,'/labels.xml')"/> <xsl:param name="codelists" select="concat($geonetwork-location,'/xml/schemas/',$schema,'/loc/',$language,'/codelists.xml')"/> +<!-- XXX username and password get transmitted as clear text (probably as +GET parameters)! Authentication should be redone in a proper way. --> +<xsl:param name="username"/> +<xsl:param name="password"/> + <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/> <xsl:include href="xml_xforms-common.xsl"/> <xsl:include href="xml_xforms-header-footer.xsl"/> Modified: sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/metadata-recentadditions.xsl =================================================================== --- sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/metadata-recentadditions.xsl 2008-07-22 03:43:33 UTC (rev 1417) +++ sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/metadata-recentadditions.xsl 2008-07-22 07:07:20 UTC (rev 1418) @@ -60,11 +60,11 @@ <a href="/orbeon/gn/{$metadata/geonet:info/uuid}/{/root/gui/env/server/host}:{/root/gui/env/server/port}/{/root/gui/env/server/host}:{/root/gui/env/server/port}">Orbeon App</a> - --> - <a href="/orbeon/xforms-sandbox/run?url=http://{/root/gui/env/server/host}:{/root/gui/env/server/port}{/root/gui/url}/srv/{/root/gui/strings/language}/xforms.xml%3fediting=y%26uuid={$metadata/geonet:info/uuid}">Custom</a> + <a href="/orbeon/xforms-sandbox/run?url=http://{/root/gui/env/server/host}:{/root/gui/env/server/port}{/root/gui/url}/srv/{/root/gui/strings/language}/xforms.xml%3f%26id={$metadata/geonet:info/id}%26username=admin%26password=admin">Custom</a> - - <a href="/orbeon/xforms-sandbox/run?url=http://{/root/gui/env/server/host}:{/root/gui/env/server/port}{/root/gui/url}/srv/{/root/gui/strings/language}/xforms.xml%3fediting=y%26uuid={$metadata/geonet:info/uuid}%26config=">Full</a> + <a href="/orbeon/xforms-sandbox/run?url=http://{/root/gui/env/server/host}:{/root/gui/env/server/port}{/root/gui/url}/srv/{/root/gui/strings/language}/xforms.xml%3f%26id={$metadata/geonet:info/id}%26username=admin%26password=admin%26config=">Full</a> - - <a href="xforms.xml?editing=y&uuid={$metadata/geonet:info/uuid}">Raw XForms output</a> + <a href="xforms.xml?id={$metadata/geonet:info/id}&username=admin&password=admin">Raw XForms output</a> </div> </xsl:for-each> </xsl:template> Added: sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/xforms_metadata-create.xsl =================================================================== --- sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/xforms_metadata-create.xsl (rev 0) +++ sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/xforms_metadata-create.xsl 2008-07-22 07:07:20 UTC (rev 1418) @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- XXX groups aren't added automatically, as we are not authenticated correctly --> +<xsl:stylesheet version="1.0" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xh="http://www.w3.org/1999/xhtml" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + + <xsl:param name="geonetwork-location" select="concat('http://',/root/gui/env/server/host,':',/root/gui/env/server/port,/root/gui/url)"/> + <xsl:param name="username"/> + <xsl:param name="password"/> +<!-- + <xsl:include href="edit.xsl"/> +--> + <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/> + + + + <xsl:template match="/"> + <xsl:variable name="lang" select="/root/gui/language"/> + + <xh:html xmlns="http://www.w3.org/1999/xhtml"> + <xh:head> + <xh:title>GeoNetwork XForms Metadata Editor</xh:title> + <xf:model xmlns:xforms="http://www.w3.org/2002/xforms"> + <xf:instance id="templates"> + <templates xmlns=""> + <item value="" label="Please select a template"/> + <xsl:for-each select="/root/gui/templates/record"> + <item label="{name}" value="{id}"/> + </xsl:for-each> + </templates> + </xf:instance> + <xf:instance id="groups"> + <groups xmlns=""> + <item value="" label="Please select a group"/> + <xsl:for-each select="/root/gui/groups/record"> + <item value="{id}"> + <xsl:attribute name="label"> + <xsl:value-of select="label/child::*[name() = $lang]"/> + </xsl:attribute> + </item> + </xsl:for-each> + </groups> + </xf:instance> + <!-- id == template, group == group --> + <xf:instance id="request"> + <request xmlns=""> + <username> + <xsl:value-of select="$username"/> + </username> + <password> + <xsl:value-of select="$password"/> + </password> + <id/> + <group/> + </request> + </xf:instance> + + <!-- for storing the link to the edit metadata page temporary --> + <xf:instance id="edit-page"> + <url xmlns=""/> + </xf:instance> + +<!-- + <xf:submission action="{$geonetwork-location}/srv/en/metadata.create.edit.xforms" method="post" id="submit-create" ref="instance('request')" replace="none" validate="false"/> +--> + <xf:submission action="{$geonetwork-location}/srv/en/metadata.create.edit.xforms" + method="post" + id="submit-create" + ref="instance('request')" + replace="instance" + validate="false"/> + + + + <xf:instance id="geonetwork-errors"> + <errors xmlns=""/> + </xf:instance> + + <xf:instance id="geonetwork-infos"> + <infos xmlns=""/> + </xf:instance> + + <!-- information messages. TODO l10n --> + <xf:instance id="geonetwork-info-messages"> + <messages xmlns=""> + <message id="created">A new metadata document was created.</message> + </messages> + </xf:instance> + + <xforms:action ev:event="xforms-submit" ev:observer="submit-create"> + <xf:delete nodeset="instance('geonetwork-errors')/*"/> + <xf:delete nodeset="instance('geonetwork-infos')/*"/> + </xforms:action> + <xf:action ev:event="xforms-submit-done" ev:observer="submit-create"> + <xf:insert context="instance('geonetwork-infos')" nodeset="//mesage[@id='created']" origin="instance('geonetwork-info-messages')"/> + <xf:setvalue ref="instance('edit-page')" value="concat('/xforms-sandbox/run?url={$geonetwork-location}/srv/en/xforms.xml%3fid=',instance('request')/id,'%26username={$username}%26password={$password}')"/> + <xf:load ref="instance('edit-page')"/> + </xf:action> + <xf:action ev:event="xforms-submit-error" ev:observer="submit-create"> + <xf:insert context="instance('geonetwork-errors')" nodeset="*" origin="event('response-body')"/> + </xf:action> + + <!-- Show error pane only if there were any errors --> + <xf:bind nodeset="instance('geonetwork-errors')" relevant="count(instance('geonetwork-errors')/*) > 0" /> + + <!-- Show info pane only if there were any information messages --> + <xf:bind nodeset="instance('geonetwork-infos')" relevant="count(instance('geonetwork-infos')/*) > 0" /> + </xf:model> + + + </xh:head> + <xh:body> + <!-- pane for error messages --> + <xf:group ref="instance('geonetwork-errors')" id="geonetwork-error-pane" class="gn-group"> + <xf:label class="group-label">Errors occured</xf:label> + <xf:output value="instance('geonetwork-errors')"/> + </xf:group> + + <!-- pane for information messages like "saving was successful" --> + <xf:group ref="instance('geonetwork-infos')" id="geonetwork-info-pane" class="gn-group"> + <xf:label class="group-label">Information</xf:label> + <xf:output value="instance('geonetwork-infos')"/> + </xf:group> + + + + <xf:select1 ref="instance('request')/id" appearance="minimal"> + <xf:label> + <xsl:value-of select="/root/gui/strings/template"/> + </xf:label> + <xf:itemset nodeset="instance('templates')/item"> + <xf:label ref="@label"/> + <xf:value ref="@value"/> + </xf:itemset> + </xf:select1> + <xf:select1 ref="instance('request')/group" appearance="minimal"> + <xf:label> + <xsl:value-of select="/root/gui/strings/group"/> + </xf:label> + <xf:itemset nodeset="instance('groups')/item"> + <xf:label ref="@label"/> + <xf:value ref="@value"/> + </xf:itemset> + </xf:select1> + + + <xf:submit submission="submit-create"> + <xf:label> + <xsl:value-of select="/root/gui/create/button"/> + </xf:label> + </xf:submit> + + <widget:xforms-instance-inspector xmlns:widget="http://orbeon.org/oxf/xml/widget"/> + + </xh:body> + </xh:html> + + </xsl:template> +</xsl:stylesheet> Property changes on: sandbox/geonetworkui/BlueNetMEST/web/geonetwork/xsl/xforms_metadata-create.xsl ___________________________________________________________________ Added: svn:mime-type + text/xsl Added: svn:keywords + Id Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |