From: <fxp...@us...> - 2011-09-26 16:19:24
|
Revision: 8222 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=8222&view=rev Author: fxprunayre Date: 2011-09-26 16:19:17 +0000 (Mon, 26 Sep 2011) Log Message: ----------- Fix conflict when JQuery is also used. Fix metadata.show calls in Widget UI. Modified Paths: -------------- trunk/web/src/main/webapp/xml/schemas/iso19139/present/metadata-iso19139-edit.xsl trunk/web/src/main/webapp/xsl/metadata/layout.xsl Modified: trunk/web/src/main/webapp/xml/schemas/iso19139/present/metadata-iso19139-edit.xsl =================================================================== --- trunk/web/src/main/webapp/xml/schemas/iso19139/present/metadata-iso19139-edit.xsl 2011-09-26 16:16:12 UTC (rev 8221) +++ trunk/web/src/main/webapp/xml/schemas/iso19139/present/metadata-iso19139-edit.xsl 2011-09-26 16:19:17 UTC (rev 8222) @@ -200,8 +200,8 @@ onclick="javascript:Ext.getCmp('editorPanel').showLinkedMetadataSelectionPanel('{$ref}', 'uuidref');" onmouseover="this.style.cursor='pointer';"/> </xsl:when> <xsl:otherwise> - <a href="metadata.show?uuid={@uuidref}"> - <xsl:call-template name="getMetadataTitle"> + <a href="#" onclick="javascript:catalogue.metadataShow('{@uuidref}');"> + <xsl:call-template name="getMetadataTitle"> <xsl:with-param name="uuid" select="@uuidref"/> </xsl:call-template> </a> @@ -244,7 +244,7 @@ <xsl:value-of select="/root/gui/strings/noOperatesOn"/> </xsl:when> <xsl:otherwise> - <select onchange="javascript:$('_{$ref}').value=this.options[this.selectedIndex].value;" class="md"> + <select onchange="javascript:Ext.getDom('_{$ref}').value=this.options[this.selectedIndex].value;" class="md"> <option></option> <xsl:for-each select="//srv:operatesOn[@uuidref!='']"> <option value="{@uuidref}"> @@ -271,10 +271,10 @@ <xsl:apply-templates mode="simpleElement" select="."> <xsl:with-param name="schema" select="$schema"/> <xsl:with-param name="text"> - <a href="metadata.show?uuid={gco:CharacterString}"> - <xsl:call-template name="getMetadataTitle"> - <xsl:with-param name="uuid" select="gco:CharacterString"/> - </xsl:call-template> + <a href="#" onclick="javascript:catalogue.metadataShow('{gco:CharacterString}');"> + <xsl:call-template name="getMetadataTitle"> + <xsl:with-param name="uuid" select="gco:CharacterString"/> + </xsl:call-template> </a> </xsl:with-param> </xsl:apply-templates> @@ -3023,7 +3023,7 @@ <xsl:if test="not($isXLinked)"> <xsl:text> </xsl:text> <select class="md" - onchange="$('_{gco:CharacterString/geonet:element/@ref}').value = this.options[this.selectedIndex].value;" + onchange="Ext.getDom('_{gco:CharacterString/geonet:element/@ref}').value = this.options[this.selectedIndex].value;" size="1"> <option name="" /> <xsl:for-each select="/root/gui/regions/record"> @@ -3088,7 +3088,7 @@ <xsl:with-param name="uuid" select="gco:CharacterString"></xsl:with-param> </xsl:call-template> </xsl:variable> - <a href="metadata.show?uuid={gco:CharacterString}"> + <a href="#" onclick="javascript:catalogue.metadataShow('{gco:CharacterString}');"> <xsl:value-of select="$metadataTitle"/> </a> </xsl:with-param> Modified: trunk/web/src/main/webapp/xsl/metadata/layout.xsl =================================================================== --- trunk/web/src/main/webapp/xsl/metadata/layout.xsl 2011-09-26 16:16:12 UTC (rev 8221) +++ trunk/web/src/main/webapp/xsl/metadata/layout.xsl 2011-09-26 16:19:17 UTC (rev 8222) @@ -1042,15 +1042,15 @@ <xsl:variable name="relatedElementRef" select="../following-sibling::node()[name()=$relatedElementName]/gco:CharacterString/geonet:element/@ref"/> <xsl:variable name="relatedElementIsEmpty" select="normalize-space($relatedElement)=''"/> - <!--<xsl:value-of select="concat('if ($("_', $relatedElementRef, '").value==="") $("_', $relatedElementRef, '").value=this.options[this.selectedIndex].title;')"/>--> + <!--<xsl:value-of select="concat('if (Ext.getDom("_', $relatedElementRef, '").value==="") Ext.getDom("_', $relatedElementRef, '").value=this.options[this.selectedIndex].title;')"/>--> <xsl:value-of - select="concat('if ($("_', $relatedElementRef, '")) $("_', $relatedElementRef, '").value=this.options[this.selectedIndex].title;')" + select="concat('if (Ext.getDom("_', $relatedElementRef, '")) Ext.getDom("_', $relatedElementRef, '").value=this.options[this.selectedIndex].title;')" /> </xsl:if> </xsl:variable> <xsl:text> </xsl:text> (<xsl:value-of select="/root/gui/strings/helperList"/> <select - onchange="$('_{$refId}').value=this.options[this.selectedIndex].value; if ($('_{$refId}').onkeyup) $('_{$refId}').onkeyup(); {$relatedElementAction}" + onchange="Ext.getDom('_{$refId}').value=this.options[this.selectedIndex].value; if (Ext.getDom('_{$refId}').onkeyup) Ext.getDom('_{$refId}').onkeyup(); {$relatedElementAction}" class="md"> <option/> <!-- This assume that helper list is already sort in alphabetical order in loc file. --> @@ -1244,7 +1244,7 @@ <fieldset class="attributes"> <legend> <span> - <div onclick="toggleFieldset(this, $('toggled{$id}'));"> + <div onclick="toggleFieldset(this, Ext.getDom('toggled{$id}'));"> <xsl:attribute name="class"> <xsl:choose> <xsl:when test="$visibleAttributes">tgDown button</xsl:when> @@ -1604,7 +1604,7 @@ <legend id="stip.{$helpLink}|{$id}"> <span> <xsl:if test="/root/gui/config/metadata-view-toggleTab"> - <div class="button tgDown" onclick="toggleFieldset(this, $('toggled{$id}'));" + <div class="button tgDown" onclick="toggleFieldset(this, Ext.getDom('toggled{$id}'));" > </div> </xsl:if> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |