From: <tic...@us...> - 2007-09-18 20:33:07
|
Revision: 847 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=847&view=rev Author: ticheler Date: 2007-09-18 13:33:10 -0700 (Tue, 18 Sep 2007) Log Message: ----------- Localized strings where they were still static other small improvements Modified Paths: -------------- trunk/web/geonetwork/xsl/header.xsl trunk/web/geonetwork/xsl/main-page.xsl trunk/web/geonetwork/xsl/metadata-iso19115.xsl trunk/web/geonetwork/xsl/metadata-iso19139.xsl trunk/web/geonetwork/xsl/search-results-xhtml.xsl trunk/web/geonetwork/xsl/search-results.xsl trunk/web/geonetwork/xsl/searchform_advanced.xsl trunk/web/geonetwork/xsl/searchform_simple_template.xsl Modified: trunk/web/geonetwork/xsl/header.xsl =================================================================== --- trunk/web/geonetwork/xsl/header.xsl 2007-09-18 20:31:01 UTC (rev 846) +++ trunk/web/geonetwork/xsl/header.xsl 2007-09-18 20:33:10 UTC (rev 847) @@ -8,16 +8,20 @@ <!-- title --> <title><xsl:value-of select="/root/gui/strings/title"/></title> - <link href="{/root/gui/url}/favicon.ico" rel="SHORTCUT ICON" /> + <link href="{/root/gui/url}/favicon.ico" rel="shortcut icon" type="image/x-icon" /> + <link href="{/root/gui/url}/favicon.ico" rel="icon" type="image/x-icon" /> <!-- stylesheet --> <link rel="stylesheet" type="text/css" href="{/root/gui/url}/geonetwork.css"/> <!-- Recent updates newsfeed --> <link href="{/root/gui/locService}/rss.latest" rel="alternate" type="application/rss+xml" title="GeoNetwork opensource | {/root/gui/strings/recentAdditions}" /> - <link href="{/root/gui/locService}/portal.opensearch" rel="search" type="application/opensearchdescription+xml"> - <xsl:attribute name="title">GeoNetwork|<xsl:value-of select="//site/organization"/>|<xsl:value-of select="//site/name"/></xsl:attribute> - </link> + <link href="{/root/gui/locService}/portal.opensearch" rel="search" type="application/opensearchdescription+xml"> + + <xsl:attribute name="title">GeoNetwork|<xsl:value-of select="//site/organization"/>|<xsl:value-of select="//site/name"/></xsl:attribute> + + </link> + <!-- meta tags --> <xsl:copy-of select="/root/gui/strings/header_meta/meta"/> Modified: trunk/web/geonetwork/xsl/main-page.xsl =================================================================== --- trunk/web/geonetwork/xsl/main-page.xsl 2007-09-18 20:31:01 UTC (rev 846) +++ trunk/web/geonetwork/xsl/main-page.xsl 2007-09-18 20:33:10 UTC (rev 847) @@ -222,7 +222,7 @@ <table class="geosearchfields" width="100%"> <tr> <td> - <xsl:call-template name="latestUpdates"/> + <xsl:call-template name="categories"/> </td> </tr> </table> @@ -233,7 +233,7 @@ <table class="geosearchfields" width="100%"> <tr> <td> - <xsl:call-template name="categories"/> + <xsl:call-template name="latestUpdates"/> </td> </tr> </table> @@ -258,7 +258,7 @@ <tr width="100%"> <td width="100%"> - <h1 id="loadingMD" align="center" style="display: none;" width="100%">...Searching for Metadata...</h1> + <h1 id="loadingMD" align="center" style="display: none;" width="100%"><xsl:value-of select="/root/gui/strings/searching"/></h1> <!-- This DIV contains a first-time message that will be removed when the first search will be run --> <div id="resultList"> Modified: trunk/web/geonetwork/xsl/metadata-iso19115.xsl =================================================================== --- trunk/web/geonetwork/xsl/metadata-iso19115.xsl 2007-09-18 20:31:01 UTC (rev 846) +++ trunk/web/geonetwork/xsl/metadata-iso19115.xsl 2007-09-18 20:33:10 UTC (rev 847) @@ -996,11 +996,7 @@ <xsl:with-param name="schema" select="$schema"/> <xsl:with-param name="title" select="/root/gui/strings/interactiveMap"/> <xsl:with-param name="text"> - <!-- ETj - <a href="javascript:popInterMap('{/root/gui/url}/intermap/srv/{/root/gui/language}/map.addServicesExt?url={linkage}&type=2')" title="{/root/strings/interactiveMap}"> - --> <a href="javascript:runIM_selectService('{linkage}',2,{//geonet:info/id})" title="{/root/strings/interactiveMap}"> - <xsl:choose> <xsl:when test="string(orDesc)!=''"> <xsl:value-of select="orDesc"/> @@ -1740,7 +1736,6 @@ </xsl:when> <xsl:when test="starts-with(./protocol,'OGC:WMS-') and contains(./protocol,'-get-capabilities') and ./orName"> <link type="wms"> - <!-- ETj <xsl:value-of select="concat('javascript:popInterMap("',/root/gui/url,'/intermap/srv/',/root/gui/language,'/map.addServicesExt?url=',linkage,'&type=2")')"/> --> <xsl:value-of select="concat('javascript:runIM_selectService("',linkage,'",2,',$id,');')"/> </link> </xsl:when> Modified: trunk/web/geonetwork/xsl/metadata-iso19139.xsl =================================================================== --- trunk/web/geonetwork/xsl/metadata-iso19139.xsl 2007-09-18 20:31:01 UTC (rev 846) +++ trunk/web/geonetwork/xsl/metadata-iso19139.xsl 2007-09-18 20:33:10 UTC (rev 847) @@ -1541,9 +1541,6 @@ <xsl:with-param name="schema" select="$schema"/> <xsl:with-param name="title" select="/root/gui/strings/interactiveMap"/> <xsl:with-param name="text"> - <!-- ETj - <a href="javascript:popInterMap('{/root/gui/url}/intermap/srv/{/root/gui/language}/map.addServicesExt?url={gmd:linkage/gmd:URL}&type=2')" title="{/root/strings/interactiveMap}"> - --> <a href="javascript:runIM_selectService('{gmd:linkage/gmd:URL}',2,{//geonet:info/id})" title="{/root/strings/interactiveMap}"> <xsl:choose> <xsl:when test="string(gmd:description/gco:CharacterString)!=''"> @@ -1856,7 +1853,6 @@ </xsl:when> <xsl:when test="starts-with($protocol,'OGC:WMS-') and contains($protocol,'-get-capabilities') and $name"> <link type="wms"> -<!-- <xsl:value-of select="concat('javascript:popInterMap("',/root/gui/url,'/intermap/srv/',/root/gui/language,'/map.addServicesExt?url=',$linkage,'&type=2")')"/>--> <xsl:value-of select="concat('javascript:runIM_selectService("' , $linkage , '", 2,',$id,')' )"/> </link> </xsl:when> Modified: trunk/web/geonetwork/xsl/search-results-xhtml.xsl =================================================================== --- trunk/web/geonetwork/xsl/search-results-xhtml.xsl 2007-09-18 20:31:01 UTC (rev 846) +++ trunk/web/geonetwork/xsl/search-results-xhtml.xsl 2007-09-18 20:33:10 UTC (rev 847) @@ -265,13 +265,13 @@ </table> </td> <td class="padded" align="center" valign="center" width="200"> - <xsl:call-template name="score"> +<!-- <xsl:call-template name="score"> <xsl:with-param name="score" select="$metadata/geonet:info/score * 100"/> <xsl:with-param name="class" select="5"/> <xsl:with-param name="currentClass" select="0"/> </xsl:call-template> - <br/> + <br/> --> <xsl:call-template name="thumbnail"> <xsl:with-param name="metadata" select="$metadata"/> </xsl:call-template> Modified: trunk/web/geonetwork/xsl/search-results.xsl =================================================================== --- trunk/web/geonetwork/xsl/search-results.xsl 2007-09-18 20:31:01 UTC (rev 846) +++ trunk/web/geonetwork/xsl/search-results.xsl 2007-09-18 20:33:10 UTC (rev 847) @@ -207,13 +207,13 @@ </table> </td> <td class="padded" align="center" valign="center" width="200"> - <xsl:call-template name="score"> +<!-- <xsl:call-template name="score"> <xsl:with-param name="score" select="$metadata/geonet:info/score * 100"/> <xsl:with-param name="class" select="5"/> <xsl:with-param name="currentClass" select="0"/> </xsl:call-template> - <br/> + <br/> --> <xsl:call-template name="thumbnail"> <xsl:with-param name="metadata" select="$metadata"/> </xsl:call-template> Modified: trunk/web/geonetwork/xsl/searchform_advanced.xsl =================================================================== --- trunk/web/geonetwork/xsl/searchform_advanced.xsl 2007-09-18 20:31:01 UTC (rev 846) +++ trunk/web/geonetwork/xsl/searchform_advanced.xsl 2007-09-18 20:33:10 UTC (rev 847) @@ -6,6 +6,7 @@ <xsl:variable name="lang" select="/root/gui/language"/> <xsl:template match="/"> + <form name="advsearch" id="advsearch" onsubmit="javascript:runAdvancedSearch();"> <table class="advsearchfields"> <xsl:comment>ADVANCED SEARCH</xsl:comment> <tr class="advsearchfields"> @@ -14,27 +15,21 @@ <img width="13px" height="233px" src="/geonetwork/images/arrow-down.gif"/> </td> <td style="margin-left:5px;"> - <form name="advwhat" id="advwhat"> - <xsl:call-template name="adv_what"></xsl:call-template> - </form> + <xsl:call-template name="adv_what"></xsl:call-template> </td> <xsl:comment>ADV SEARCH: WHERE?</xsl:comment> <td width="16px" height="236px" style="padding-right: 3px; padding-top:5px;"> <img width="13px" height="233px" src="/geonetwork/images/arrow-down.gif"/> </td> <td> - <form name="advwhere" id="advwhere"> - <xsl:call-template name="adv_where"></xsl:call-template> - </form> + <xsl:call-template name="adv_where"></xsl:call-template> </td> <xsl:comment>ADV SEARCH: WHEN?</xsl:comment> <td width="16px" height="236px" style="padding-right: 3px; padding-top:5px;"> <img width="13px" height="233px" src="/geonetwork/images/arrow-down.gif"/> </td> <td> - <form name="advwhen" id="advwhen"> - <xsl:call-template name="adv_when"></xsl:call-template> - </form> + <xsl:call-template name="adv_when"></xsl:call-template> </td> </tr> @@ -58,13 +53,13 @@ </tr> <tr> <td colspan="6" align="right"> -<!-- <a onClick="alert('TODO');" style="padding-right:10px; padding-left:10px;">Help</a> --> - <a onClick="showSimpleSearch()" style="cursor:pointer; padding-right:10px; padding-left:10px;">Hide advanced options</a> + <a onClick="resetAdvancedSearch();" style="cursor:pointer; padding-right:10px; padding-left:10px;" title="{/root/gui/strings/resetSearch}" alt="{/root/gui/strings/resetSearch}"><xsl:value-of select="/root/gui/strings/reset"/></a> + <a onClick="showSimpleSearch();" style="cursor:pointer; padding-right:10px; padding-left:10px;"><xsl:value-of select="/root/gui/strings/hideAdvancedOptions"/></a> </td> </tr> </table> - + </form> </xsl:template> <!-- ============================================================ @@ -72,7 +67,7 @@ ======================================= ===================== --> <xsl:template name="adv_what"> - <h1>What?</h1> + <h1><xsl:value-of select="/root/gui/strings/what"/></h1> <table heigth="100% "> <tr> <th class="padded"> @@ -119,34 +114,34 @@ </tr> <tr > <td colspan="2" style="padding-top:30px; white-space: nowrap;"> - <fieldset style="margin: 10px 5px 10px;"> - <legend>Search accuracy</legend> - Precise <input type="radio" id="precision_exact" name="similarity" value="1" > + <fieldset style="margin: 10px 5px 10px;" title="{/root/gui/strings/fuzzySearch}"> + <legend><xsl:value-of select="/root/gui/strings/fuzzy"/></legend> + <xsl:value-of select="/root/gui/strings/fuzzyPrecise"/> <input type="radio" id="similarity" name="similarity" value="1" > <xsl:if test="/root/gui/searchDefaults/similarity='1'"> <xsl:attribute name="checked"/> </xsl:if> </input> - <input type="radio" id="precision_fuzzy" name="similarity" value=".8"> + <input type="radio" id="similarity" name="similarity" value=".8"> <xsl:if test="/root/gui/searchDefaults/similarity='.8'"> <xsl:attribute name="checked"/> </xsl:if> </input> - <input type="radio" id="precision_loose" name="similarity" value=".6" > + <input type="radio" id="similarity" name="similarity" value=".6" > <xsl:if test="/root/gui/searchDefaults/similarity='.6'"> <xsl:attribute name="checked"/> </xsl:if> </input> - <input type="radio" id="precision_fuzzy" name="similarity" value=".4" > + <input type="radio" id="similarity" name="similarity" value=".4" > <xsl:if test="/root/gui/searchDefaults/similarity='.4'"> <xsl:attribute name="checked"/> </xsl:if> </input> - <input type="radio" id="precision_fuzzy" name="similarity" value=".2" > + <input type="radio" id="similarity" name="similarity" value=".2" > <xsl:if test="/root/gui/searchDefaults/similarity='.2'"> <xsl:attribute name="checked"/> </xsl:if> - </input>Imprecise + </input><xsl:value-of select="/root/gui/strings/fuzzyImprecise"/> </fieldset> </td> </tr> @@ -164,7 +159,7 @@ <xsl:template name="adv_where"> - <h1>Where?</h1> + <h1><xsl:value-of select="/root/gui/strings/where"/></h1> <xsl:comment>MINIMAP</xsl:comment> @@ -175,13 +170,13 @@ <table id="minimap_root" width="340px"> <tr> <td colspan="4" align="center" style="padding: 3px;"> - lat (min) <input type="text" class="content" id="northBL" name="northBL" size="5" + <xsl:value-of select="/root/gui/strings/latMin"/> <input type="text" class="content" id="northBL" name="northBL" size="5" value="{/root/gui/searchDefaults/northBL}" onChange="javascript:AoIrefresh();"/> </td> </tr> <tr height="102px" style="position:relative;"> <td width="52px" style="padding-top: 25px; align: center;"> - <small>long (min)</small> + <small><xsl:value-of select="/root/gui/strings/longMin"/></small> <br /> <input type="text" class="content" id="westBL" name="westBL" size="5" value="{/root/gui/searchDefaults/westBL}" onChange="javascript:AoIrefresh();"/> @@ -217,7 +212,7 @@ </div> </td> <td width="52px" style="padding-top: 25px; align: center;"> - <small>lon (max)</small> + <small><xsl:value-of select="/root/gui/strings/longMax"/></small> <br /> <input type="text" class="content" id="eastBL" name="eastBL" size="5" value="{/root/gui/searchDefaults/eastBL}" onChange="javascript:AoIrefresh();"/> @@ -226,7 +221,7 @@ <tr> <td /> <td colspan="2" align="center" style="padding: 3px;"> - <small>lat (max)</small> <input type="text" class="content" id="southBL" name="southBL" size="5" + <small><xsl:value-of select="/root/gui/strings/latMax"/></small> <input type="text" class="content" id="southBL" name="southBL" size="5" value="{/root/gui/searchDefaults/southBL}" onChange="javascript:AoIrefresh();"/> </td> <td> @@ -238,7 +233,7 @@ </tr> <tr> <th class="padded" colspan="2" nowrap="nowrap"> - <!--<xsl:value-of select="/root/gui/strings/region"/> --> Spatial search type + <xsl:value-of select="/root/gui/strings/type"/> </th> <td class="padded" align="right"> <select class="content" name="relation" id="relation"> @@ -293,7 +288,7 @@ <xsl:template name="adv_when"> - <h1>When?</h1> + <h1><xsl:value-of select="/root/gui/strings/when"/></h1> <table border="0" cellpadding="0" cellspacing="0"> @@ -303,7 +298,7 @@ <xsl:if test="string(/root/gui/searchDefaults/datefrom)='' and string(/root/gui/searchDefaults/dateto)=''"> <xsl:attribute name="checked" /> </xsl:if> - Anytime + <xsl:value-of select="/root/gui/strings/anytime"/> </input> </td> </tr> @@ -314,28 +309,28 @@ <xsl:if test="string(/root/gui/searchDefaults/datefrom)!='' and string(/root/gui/searchDefaults/dateto)!=''"> <xsl:attribute name="checked" /> </xsl:if> - From + <xsl:value-of select="/root/gui/strings/from"/> <input style="width: 90px;" readonly="1" id="datefrom" value="{/root/gui/searchDefaults/datefrom}" name="datefrom" class="inpBnds" type="text" - onchange="document.getElementById('radfrom1').checked=true;"/> + onchange="$('radfrom1').checked=true;$('radfrom1').disabled='';"/> <img title="FROM date selector" style="cursor: pointer; margin-bottom: 6px; margin-right:10px;" id="from_trigger_c" src="/geonetwork/scripts/calendar/img.gif" alt="select FROM date" align="middle" hspace="1"/> - To + <xsl:value-of select="/root/gui/strings/to"/> <input style="width: 90px;" readonly="1" id="dateto" value="{/root/gui/searchDefaults/dateto}" name="dateto" class="inpBnds" type="text" - onchange="document.getElementById('radfrom1').checked=true;" /> + onchange="$('radfrom1').checked=true;$('radfrom1').disabled='';" /> <img title="TO date selector" style="cursor: pointer; margin-bottom: 6px;" id="to_trigger_c" src="/geonetwork/scripts/calendar/img.gif" alt="select TO date" align="middle" hspace="1"/> </input> <!-- <div onclick="JavaScript:$('datefrom').value ='';$('dateto').value ='';" style="cursor: pointer;"><xsl:value-of select="/root/gui/strings/clear"/></div> --> <img title="{/root/gui/strings/clear}" style="cursor: pointer; margin-bottom: 6px;" id="clearDates" src="/geonetwork/images/clear_left.png" alt="{/root/gui/strings/clear}" align="middle" - hspace="1" onclick="JavaScript:$('datefrom').value ='';$('dateto').value ='';$('radfrom0').checked=true;"/> + hspace="1" onclick="JavaScript:$('datefrom').value ='';$('dateto').value ='';$('radfrom0').checked=true;$('radfrom1').disabled='disabled';"/> </td> </tr> </table> <fieldset style="margin: 10px 5px 10px;"> - <legend>Restrict to</legend> + <legend><xsl:value-of select="/root/gui/strings/restrictTo"/></legend> <table style="margin-left:10px;"> Modified: trunk/web/geonetwork/xsl/searchform_simple_template.xsl =================================================================== --- trunk/web/geonetwork/xsl/searchform_simple_template.xsl 2007-09-18 20:31:01 UTC (rev 846) +++ trunk/web/geonetwork/xsl/searchform_simple_template.xsl 2007-09-18 20:33:10 UTC (rev 847) @@ -5,6 +5,7 @@ <xsl:template name="geofields"> + <form name="defsearch" id="defsearch" onsubmit="javascript:runSimpleSearch();"> <table class="geosearchfields" width="211px"> <tr> <td rowspan="6" style="vertical-align: bottom;"> @@ -43,7 +44,7 @@ <td class="im_mmtool" id="im_mmtool_zoomout" onClick="javascript:im_mm_setTool('zoomout');"><img src="/intermap/images/zoomout.png" title="Zoom out"/></td> <td class="im_mmtool" id="im_mmtool_pan" onClick="javascript:im_mm_setTool('pan');"><img src="/intermap/images/im_pan16x16.png" title="Pan"/></td> <!-- <td class="im_mmtool" id="im_mmtool_zoomsel" onClick="javascript:im_mm_zoomToAoi()"><img src="/intermap/images/zoomsel.png" title="Zoom to selected layer extent"/></td> --> - <td class="im_mmtool" id="im_mmtool_aoi" onClick="javascript:im_mm_setTool('aoi')"><img src="/intermap/images/im_aoi16x16.png" title="Select an Area Of Interest"/></td> + <td class="im_mmtool" id="im_mmtool_aoi" onClick="javascript:im_mm_setTool('aoi')"><img src="/intermap/images/im_aoi16x16.png" title="Select an Area Of Interest"/></td> </tr> <tr height="102px" style="position:relative;"> <td id="im_mm_mapContainer" style="position:relative;width:202px;height:102px;" colspan="6" > @@ -58,17 +59,17 @@ </tr> <tr> <td align="right" colspan="7"> - <div id="openIMBtn" class="IMBtn" title="View Map" style="cursor:wait;">Open Map Viewer</div> + <div id="openIMBtn" class="IMBtn" title="View Map" style="cursor:wait;"><xsl:value-of select="/root/gui/strings/mapViewerOpen"/></div> </td> </tr> <tr> <td align="right" colspan="7" > - <div id="loadIMBtn" class="IMBtn" style="display:none; cursor:default;">Loading Map Viewer...</div> + <div id="loadIMBtn" class="IMBtn" style="display:none; cursor:default;"><xsl:value-of select="/root/gui/strings/mapViewerLoading"/></div> </td> </tr> <tr> <td align="right" colspan="7"> - <div id="closeIMBtn" class="IMBtn" title="Close Map Viewer" style="display:none" onclick="closeIntermap();">Close Map Viewer</div> + <div id="closeIMBtn" class="IMBtn" title="Close Map Viewer" style="display:none" onclick="closeIntermap();"><xsl:value-of select="/root/gui/strings/mapViewerClose"/></div> </td> </tr> </table> @@ -115,41 +116,12 @@ </select> </td> </tr> - - - <!-- other search options --> - - <!-- hits per page --> -<!-- <tr> - <td class="padded"> - <xsl:value-of select="/root/gui/strings/hitsPerPage"/> - </td> - <td class="padded" align="right"> - <select class="content" name="hitsPerPage" onchange="profileSelected()"> - <xsl:for-each select="/root/gui/strings/hitsPerPageChoice"> - <option> - <xsl:if - test="string(@value)=string(/root/gui/searchDefaults/hitsPerPage)"> - <xsl:attribute name="selected"/> - </xsl:if> - <xsl:attribute name="value"> - <xsl:value-of select="@value"/> - </xsl:attribute> - <xsl:value-of select="."/> - </option> - </xsl:for-each> - </select> - </td> - </tr> ---> <tr> <td colspan="2" style="align: center; padding-top: 7px;"> <table class="advsearchfields" width="211px" border="0" cellspacing="0" cellpadding="0"> <tr > <td style="background: url(/geonetwork/images/arrow-bg.gif) repeat-x;" height="29px" width="30%"> - </td> -<!-- <td width="36px" style="background: url(/geonetwork/images/arrow-right.gif) no-repeat;" > --> <td style="padding:0px; margin:0px;" width="36px"> <img width="36px" style="padding:0px; margin:0px;" src="/geonetwork/images/arrow-right.gif"/> </td> @@ -168,9 +140,7 @@ </tr> <script language="JavaScript" type="text/javascript"> - //Event.observe('searchBtn', 'click', runSimpleSearch); Event.observe('any', 'keypress', gn_anyKeyObserver); - // Event.observe('openIMBtn', 'click', function(){openIntermap()} ); // issued only when IM is loaded Event.observe('closeIMBtn', 'click', closeIntermap ); </script> @@ -178,14 +148,15 @@ <td colspan="3"> <table width="100%"> <tr> - <td style="padding-left:10px;padding-top:5px;" align="right"><a onClick="showAdvancedSearch()" style="cursor:pointer;">Advanced</a></td> + <td style="padding-left:10px;padding-top:5px;" align="right"> + <a onClick="resetSimpleSearch();" style="cursor:pointer; padding-right:10px; padding-left:10px;" title="{/root/gui/strings/resetSearch}" alt="{/root/gui/strings/resetSearch}"><xsl:value-of select="/root/gui/strings/reset"/></a> + <a onClick="showAdvancedSearch()" style="cursor:pointer;"><xsl:value-of select="/root/gui/strings/extended"/></a></td> </tr> </table> </td> </tr> </table> + </form> </xsl:template> - - </xsl:stylesheet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |