From: <fxp...@us...> - 2010-11-24 14:07:47
|
Revision: 6866 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=6866&view=rev Author: fxprunayre Date: 2010-11-24 14:07:40 +0000 (Wed, 24 Nov 2010) Log Message: ----------- Use same style for all labels in editor/viewer. Add missing translations in geoviewer toolbar. Remove xsl:message. Modified Paths: -------------- trunk/web/src/main/webapp/loc/ar/xml/strings.xml trunk/web/src/main/webapp/loc/cn/xml/strings.xml trunk/web/src/main/webapp/loc/de/xml/strings.xml trunk/web/src/main/webapp/loc/en/xml/strings.xml trunk/web/src/main/webapp/loc/es/xml/strings.xml trunk/web/src/main/webapp/loc/fr/xml/strings.xml trunk/web/src/main/webapp/loc/nl/xml/strings.xml trunk/web/src/main/webapp/loc/pt/xml/strings.xml trunk/web/src/main/webapp/loc/ru/xml/strings.xml trunk/web/src/main/webapp/scripts/geo/extentMap.js trunk/web/src/main/webapp/xsl/metadata-iso19139-utils.xsl trunk/web/src/main/webapp/xsl/metadata.xsl Modified: trunk/web/src/main/webapp/loc/ar/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/ar/xml/strings.xml 2010-11-24 14:03:20 UTC (rev 6865) +++ trunk/web/src/main/webapp/loc/ar/xml/strings.xml 2010-11-24 14:07:40 UTC (rev 6866) @@ -15,7 +15,11 @@ <!-- new strings - SP 2.5 --> <showRemoteHTML>Show HTML from remote server</showRemoteHTML> <!-- end new strings --> - + + <drawRectangle js="true">Draw rectangle</drawRectangle> + <drawPolygon js="true">Draw polygon</drawPolygon> + <drawCircle js="true">Draw circle</drawCircle> + <clear js="true">Clear</clear> <geopublisher>GeoPublisher</geopublisher> <geoPublisherWindowTitle js="true">Geo-publication: </geoPublisherWindowTitle> <geopublisherHelp>Publish or unpublish dataset as WMS or WFS in remote geoserver.</geopublisherHelp> Modified: trunk/web/src/main/webapp/loc/cn/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/cn/xml/strings.xml 2010-11-24 14:03:20 UTC (rev 6865) +++ trunk/web/src/main/webapp/loc/cn/xml/strings.xml 2010-11-24 14:07:40 UTC (rev 6866) @@ -15,7 +15,11 @@ <!-- new strings - SP 2.5 --> <showRemoteHTML>Show HTML from remote server</showRemoteHTML> <!-- end new strings --> - + + <drawRectangle js="true">Draw rectangle</drawRectangle> + <drawPolygon js="true">Draw polygon</drawPolygon> + <drawCircle js="true">Draw circle</drawCircle> + <clear js="true">Clear</clear> <geopublisher>GeoPublisher</geopublisher> <geoPublisherWindowTitle js="true">Geo-publication: </geoPublisherWindowTitle> <geopublisherHelp>Publish or unpublish dataset as WMS or WFS in remote geoserver.</geopublisherHelp> Modified: trunk/web/src/main/webapp/loc/de/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/de/xml/strings.xml 2010-11-24 14:03:20 UTC (rev 6865) +++ trunk/web/src/main/webapp/loc/de/xml/strings.xml 2010-11-24 14:07:40 UTC (rev 6866) @@ -15,7 +15,11 @@ <!-- new strings - SP 2.5 --> <showRemoteHTML>Show HTML from remote server</showRemoteHTML> <!-- end new strings --> - + + <drawRectangle js="true">Draw rectangle</drawRectangle> + <drawPolygon js="true">Draw polygon</drawPolygon> + <drawCircle js="true">Draw circle</drawCircle> + <clear js="true">Clear</clear> <geopublisher>GeoPublisher</geopublisher> <geoPublisherWindowTitle js="true">Geo-publication: </geoPublisherWindowTitle> <geopublisherHelp>Publish or unpublish dataset as WMS or WFS in remote geoserver.</geopublisherHelp> Modified: trunk/web/src/main/webapp/loc/en/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/en/xml/strings.xml 2010-11-24 14:03:20 UTC (rev 6865) +++ trunk/web/src/main/webapp/loc/en/xml/strings.xml 2010-11-24 14:07:40 UTC (rev 6866) @@ -15,7 +15,12 @@ <!-- new strings - SP 2.5 --> <showRemoteHTML>Show HTML from remote server</showRemoteHTML> <!-- end new strings --> - <geopublisher>GeoPublisher</geopublisher> + + <drawRectangle js="true">Draw rectangle</drawRectangle> + <drawPolygon js="true">Draw polygon</drawPolygon> + <drawCircle js="true">Draw circle</drawCircle> + <clear js="true">Clear</clear> + <geopublisher>GeoPublisher</geopublisher> <geoPublisherWindowTitle js="true">Geo-publication: </geoPublisherWindowTitle> <geopublisherHelp>Publish or unpublish dataset as WMS or WFS in remote geoserver.</geopublisherHelp> <publish js="true">Publish</publish> Modified: trunk/web/src/main/webapp/loc/es/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/es/xml/strings.xml 2010-11-24 14:03:20 UTC (rev 6865) +++ trunk/web/src/main/webapp/loc/es/xml/strings.xml 2010-11-24 14:07:40 UTC (rev 6866) @@ -15,7 +15,11 @@ <!-- new strings - SP 2.5 --> <showRemoteHTML>Show HTML from remote server</showRemoteHTML> <!-- end new strings --> - + + <drawRectangle js="true">Draw rectangle</drawRectangle> + <drawPolygon js="true">Draw polygon</drawPolygon> + <drawCircle js="true">Draw circle</drawCircle> + <clear js="true">Clear</clear> <geopublisher>GeoPublisher</geopublisher> <geoPublisherWindowTitle js="true">Geo-publication: </geoPublisherWindowTitle> <geopublisherHelp>Publish or unpublish dataset as WMS or WFS in remote geoserver.</geopublisherHelp> Modified: trunk/web/src/main/webapp/loc/fr/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/fr/xml/strings.xml 2010-11-24 14:03:20 UTC (rev 6865) +++ trunk/web/src/main/webapp/loc/fr/xml/strings.xml 2010-11-24 14:07:40 UTC (rev 6866) @@ -15,7 +15,11 @@ <!-- new strings - SP 2.5 --> <showRemoteHTML>Show HTML from remote server</showRemoteHTML> <!-- end new strings --> - + + <drawRectangle js="true">Dessiner une emprise</drawRectangle> + <drawPolygon js="true">Dessiner un polygone</drawPolygon> + <drawCircle js="true">Dessiner un cercle</drawCircle> + <clear js="true">Effacer</clear> <geopublisher>GéoPublication</geopublisher> <geoPublisherWindowTitle js="true">Géo-publication : </geoPublisherWindowTitle> <geopublisherHelp>Publier/dépublier la données dans GeoServer (WMS,WFS).</geopublisherHelp> Modified: trunk/web/src/main/webapp/loc/nl/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/nl/xml/strings.xml 2010-11-24 14:03:20 UTC (rev 6865) +++ trunk/web/src/main/webapp/loc/nl/xml/strings.xml 2010-11-24 14:07:40 UTC (rev 6866) @@ -15,7 +15,11 @@ <!-- new strings - SP 2.5 --> <showRemoteHTML>Show HTML from remote server</showRemoteHTML> <!-- end new strings --> - + + <drawRectangle js="true">Draw rectangle</drawRectangle> + <drawPolygon js="true">Draw polygon</drawPolygon> + <drawCircle js="true">Draw circle</drawCircle> + <clear js="true">Clear</clear> <geopublisher>GeoPublisher</geopublisher> <geoPublisherWindowTitle js="true">Geo-publication: </geoPublisherWindowTitle> <geopublisherHelp>Publish or unpublish dataset as WMS or WFS in remote geoserver.</geopublisherHelp> Modified: trunk/web/src/main/webapp/loc/pt/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/pt/xml/strings.xml 2010-11-24 14:03:20 UTC (rev 6865) +++ trunk/web/src/main/webapp/loc/pt/xml/strings.xml 2010-11-24 14:07:40 UTC (rev 6866) @@ -15,7 +15,11 @@ <!-- new strings - SP 2.5 --> <showRemoteHTML>Show HTML from remote server</showRemoteHTML> <!-- end new strings --> - + + <drawRectangle js="true">Draw rectangle</drawRectangle> + <drawPolygon js="true">Draw polygon</drawPolygon> + <drawCircle js="true">Draw circle</drawCircle> + <clear js="true">Clear</clear> <geopublisher>GeoPublisher</geopublisher> <geoPublisherWindowTitle js="true">Geo-publication: </geoPublisherWindowTitle> <geopublisherHelp>Publish or unpublish dataset as WMS or WFS in remote geoserver.</geopublisherHelp> Modified: trunk/web/src/main/webapp/loc/ru/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/ru/xml/strings.xml 2010-11-24 14:03:20 UTC (rev 6865) +++ trunk/web/src/main/webapp/loc/ru/xml/strings.xml 2010-11-24 14:07:40 UTC (rev 6866) @@ -15,7 +15,10 @@ <!-- new strings - SP 2.5 --> <showRemoteHTML>Просмотр HTML с удаленного сервера</showRemoteHTML> <!-- end new strings --> - + <drawRectangle js="true">Draw rectangle</drawRectangle> + <drawPolygon js="true">Draw polygon</drawPolygon> + <drawCircle js="true">Draw circle</drawCircle> + <clear js="true">Clear</clear> <geopublisher>GeoPublisher</geopublisher> <geoPublisherWindowTitle js="true">Geo-публикация: </geoPublisherWindowTitle> <geopublisherHelp>Публиковать или отменить публикацию данных как WMS или WFS на удаленном GeoServer.</geopublisherHelp> Modified: trunk/web/src/main/webapp/scripts/geo/extentMap.js =================================================================== --- trunk/web/src/main/webapp/scripts/geo/extentMap.js 2010-11-24 14:03:20 UTC (rev 6865) +++ trunk/web/src/main/webapp/scripts/geo/extentMap.js 2010-11-24 14:07:40 UTC (rev 6866) @@ -171,7 +171,7 @@ tbarItems.push(new GeoExt.Action({ map: map, control: control, - text: "draw rectangle",// TODO i18n + text: translate('drawRectangle'), pressed: false, allowDepress: true, toggleGroup: "tool", @@ -198,7 +198,7 @@ tbarItems.push(new GeoExt.Action({ map: map, control: control, - text: "Draw polygon", // TODO i18n + text: translate('drawPolygon'), pressed: false, allowDepress: true, toggleGroup: "tool", @@ -222,7 +222,7 @@ tbarItems.push(new GeoExt.Action({ map: map, control: control, - text: "Draw circle", // TODO i18n + text: translate('drawCircle'), pressed: false, allowDepress: true, toggleGroup: "tool", @@ -280,7 +280,7 @@ // Clear button tbarItems.push({ - text: "Clear",// TODO i18n + text: translate('clear'), iconCls: "clearPolygon", handler: function() { // Destroy geometry Modified: trunk/web/src/main/webapp/xsl/metadata-iso19139-utils.xsl =================================================================== --- trunk/web/src/main/webapp/xsl/metadata-iso19139-utils.xsl 2010-11-24 14:03:20 UTC (rev 6865) +++ trunk/web/src/main/webapp/xsl/metadata-iso19139-utils.xsl 2010-11-24 14:07:40 UTC (rev 6866) @@ -407,9 +407,6 @@ <!-- Search for URLs related to an OGC protocol in distribution section --> <xsl:variable name="urlFilter">OGC:WMS</xsl:variable> <xsl:variable name="distributionInfoUrl" select="$metadata/gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource[contains(gmd:protocol/gco:CharacterString, $urlFilter)]/gmd:linkage/gmd:URL"/> - <xsl:message> - <xsl:value-of select="$distributionInfoUrl"></xsl:value-of> - </xsl:message> <xsl:value-of select="$distributionInfoUrl"/> <!-- FIXME ? Here we assume that only one URL is related to an OGC protocol which could not be the case in all situation. This service URL is used to initialize the LinkedServiceMetadataPanel to search for layers. It should be the case in most Modified: trunk/web/src/main/webapp/xsl/metadata.xsl =================================================================== --- trunk/web/src/main/webapp/xsl/metadata.xsl 2010-11-24 14:03:20 UTC (rev 6865) +++ trunk/web/src/main/webapp/xsl/metadata.xsl 2010-11-24 14:07:40 UTC (rev 6866) @@ -820,16 +820,16 @@ <xsl:choose> <xsl:when test="contains($title,'CHOICE_ELEMENT')"> - <a class="{$class}" title="{$conthelp}">Choice</a> + <span class="{$class}" title="{$conthelp}">Choice</span> </xsl:when> <xsl:when test="contains($title,'GROUP_ELEMENT')"> - <a class="{$class}" title="{$conthelp}">Group</a> + <span class="{$class}" title="{$conthelp}">Group</span> </xsl:when> <xsl:when test="contains($title,'SEQUENCE_ELEMENT')"> - <a class="{$class}" title="{$conthelp}">Sequence</a> + <span class="{$class}" title="{$conthelp}">Sequence</span> </xsl:when> <xsl:otherwise> - <a class="{$class}" title="{$nohelp}"><xsl:value-of select="$title"/></a> + <span class="{$class}" title="{$nohelp}"><xsl:value-of select="$title"/></span> </xsl:otherwise> </xsl:choose> </xsl:template> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |