From: <sp...@us...> - 2010-12-24 04:29:47
|
Revision: 7045 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=7045&view=rev Author: sppigot Date: 2010-12-24 04:29:40 +0000 (Fri, 24 Dec 2010) Log Message: ----------- Combine schema lists for templates and sample data functions 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/geonetwork.js trunk/web/src/main/webapp/xsl/admin.xsl Modified: trunk/web/src/main/webapp/loc/ar/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/ar/xml/strings.xml 2010-12-23 22:40:22 UTC (rev 7044) +++ trunk/web/src/main/webapp/loc/ar/xml/strings.xml 2010-12-24 04:29:40 UTC (rev 7045) @@ -13,6 +13,9 @@ <useStopwords>مؤشر يستخدم stopwords وسين لهذه اللغات :</useStopwords> <rebuildIndexMessage>إذا قمت بتغيير هذه القيم ، من المستحسن إعادة إنشاء الفهرس وسين.</rebuildIndexMessage> <!-- new strings - 2.7 --> + <metadata-templates-samples-add>Add Templates and Samples</metadata-templates-samples-add> + <metadata-schema-select>Select a schema to add templates or sample data from</metadata-schema-select> + <templatesSamples>Manage Templates and Sample Data</templatesSamples> <simpleSearch>Simple Search</simpleSearch> <advancedSearch>Advanced Search</advancedSearch> <remoteSearch>Remote Search</remoteSearch> @@ -583,9 +586,7 @@ <metadata-samples-add-success>Added sample metadata</metadata-samples-add-success> <metadata-template-order>Sort Templates</metadata-template-order> <metadata-template-order-desc>Sort your templates</metadata-template-order-desc> - <metadata-template-add-default>Add templates</metadata-template-add-default> - <metadata-template-add-default-desc>Add default templates</metadata-template-add-default-desc> - <metadata-template-select>Select the templates to add</metadata-template-select> + <metadata-template-add-default>Add templates</metadata-template-add-default> <metadata>بيانات أساسية</metadata> <metadataAdded>بيانات أساسية Metadata أضيفت برقم مميز:</metadataAdded> <metadataDeleted>بيانات أساسية Metadata حذفت برقم مميز:</metadataDeleted> Modified: trunk/web/src/main/webapp/loc/cn/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/cn/xml/strings.xml 2010-12-23 22:40:22 UTC (rev 7044) +++ trunk/web/src/main/webapp/loc/cn/xml/strings.xml 2010-12-24 04:29:40 UTC (rev 7045) @@ -14,6 +14,9 @@ <useStopwords>Lucene的索引使用这些语言的stopwords:</useStopwords> <rebuildIndexMessage>如果你改变这些值,建议您重建Lucene索引。</rebuildIndexMessage> <!-- new strings - 2.7 --> + <metadata-templates-samples-add>Add Templates and Samples</metadata-templates-samples-add> + <metadata-schema-select>Select a schema to add templates or sample data from</metadata-schema-select> + <templatesSamples>Manage Templates and Sample Data</templatesSamples> <simpleSearch>Simple Search</simpleSearch> <advancedSearch>Advanced Search</advancedSearch> <remoteSearch>Remote Search</remoteSearch> @@ -580,9 +583,7 @@ <metadata-samples-add-success>Added sample metadata</metadata-samples-add-success> <metadata-template-order>Sort Templates</metadata-template-order> <metadata-template-order-desc>Sort your templates</metadata-template-order-desc> - <metadata-template-add-default>Add templates</metadata-template-add-default> - <metadata-template-add-default-desc>Add default templates</metadata-template-add-default-desc> - <metadata-template-select>Select the templates to add</metadata-template-select> + <metadata-template-add-default>Add templates</metadata-template-add-default> <metadata>元数据</metadata> <metadataAdded>元数据已添加,其ID为:</metadataAdded> <metadataDeleted>元数据已删除,其ID为:</metadataDeleted> Modified: trunk/web/src/main/webapp/loc/de/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/de/xml/strings.xml 2010-12-23 22:40:22 UTC (rev 7044) +++ trunk/web/src/main/webapp/loc/de/xml/strings.xml 2010-12-24 04:29:40 UTC (rev 7045) @@ -11,6 +11,9 @@ <pt>Рortuguês</pt> <!-- Do not translate! --> <!-- new strings - 2.7 --> + <metadata-templates-samples-add>Add Templates and Samples</metadata-templates-samples-add> + <metadata-schema-select>Select a schema to add templates or sample data from</metadata-schema-select> + <templatesSamples>Manage Templates and Sample Data</templatesSamples> <simpleSearch>Simple Search</simpleSearch> <advancedSearch>Advanced Search</advancedSearch> <remoteSearch>Remote Search</remoteSearch> @@ -578,9 +581,7 @@ <metadata-samples-add-success>Added sample metadata</metadata-samples-add-success> <metadata-template-order>Sort Templates</metadata-template-order> <metadata-template-order-desc>Sort your templates</metadata-template-order-desc> - <metadata-template-add-default>Add templates</metadata-template-add-default> - <metadata-template-add-default-desc>Add default templates</metadata-template-add-default-desc> - <metadata-template-select>Select the templates to add</metadata-template-select> + <metadata-template-add-default>Add templates</metadata-template-add-default> <metadata>Metadaten</metadata> <metadataAdded>Metadaten mit folgender ID hinzugefügt:</metadataAdded> <metadataDeleted>Metadatamit folgender ID gelöscht:</metadataDeleted> Modified: trunk/web/src/main/webapp/loc/en/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/en/xml/strings.xml 2010-12-23 22:40:22 UTC (rev 7044) +++ trunk/web/src/main/webapp/loc/en/xml/strings.xml 2010-12-24 04:29:40 UTC (rev 7045) @@ -13,6 +13,9 @@ <useStopwords>The Lucene index uses stopwords for these languages:</useStopwords> <rebuildIndexMessage>If you change these values, it is recommended you rebuild the Lucene index.</rebuildIndexMessage> <!-- new strings - 2.7 --> + <metadata-templates-samples-add>Add Templates and Samples</metadata-templates-samples-add> + <metadata-schema-select>Select a schema to add templates or sample data from</metadata-schema-select> + <templatesSamples>Manage Templates and Sample Data</templatesSamples> <simpleSearch>Simple Search</simpleSearch> <advancedSearch>Advanced Search</advancedSearch> <remoteSearch>Remote Search</remoteSearch> @@ -575,10 +578,8 @@ <metadata-samples-add-failed>Add sample metadata failed</metadata-samples-add-failed> <metadata-samples-add-success>Added sample metadata</metadata-samples-add-success> <metadata-template-order>Sort Templates</metadata-template-order> - <metadata-template-order-desc>Sort your templates</metadata-template-order-desc> - <metadata-template-add-default>Add templates</metadata-template-add-default> - <metadata-template-add-default-desc>Add default templates</metadata-template-add-default-desc> - <metadata-template-select>Select the templates to add</metadata-template-select> + <metadata-template-order-desc>Sort your templates</metadata-template-order-desc> + <metadata-template-add-default>Add templates</metadata-template-add-default> <metadata>Metadata</metadata> <metadataAdded>Metadata added with ID:</metadataAdded> <metadataDeleted>Metadata deleted with ID:</metadataDeleted> Modified: trunk/web/src/main/webapp/loc/es/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/es/xml/strings.xml 2010-12-23 22:40:22 UTC (rev 7044) +++ trunk/web/src/main/webapp/loc/es/xml/strings.xml 2010-12-24 04:29:40 UTC (rev 7045) @@ -11,6 +11,9 @@ <pt>Рortuguês</pt> <!-- Do not translate! --> <!-- new strings - 2.7 --> + <metadata-templates-samples-add>Add Templates and Samples</metadata-templates-samples-add> + <metadata-schema-select>Select a schema to add templates or sample data from</metadata-schema-select> + <templatesSamples>Manage Templates and Sample Data</templatesSamples> <simpleSearch>Simple Search</simpleSearch> <advancedSearch>Advanced Search</advancedSearch> <remoteSearch>Remote Search</remoteSearch> @@ -580,9 +583,7 @@ <metadata-samples-add-success>Añadidos los metadatos de ejemplo</metadata-samples-add-success> <metadata-template-order>Ordenar plantillas</metadata-template-order> <metadata-template-order-desc>Ordenar sus plantillas</metadata-template-order-desc> - <metadata-template-add-default>Añadir plantillas</metadata-template-add-default> - <metadata-template-add-default-desc>Añadir plantillas por defecto</metadata-template-add-default-desc> - <metadata-template-select>Seleccione las plantillas a añadir</metadata-template-select> + <metadata-template-add-default>Añadir plantillas</metadata-template-add-default> <metadata>Metadatos</metadata> <metadataAdded>Metadato añadido con ID:</metadataAdded> <metadataDeleted>Metadato borrado con ID:</metadataDeleted> Modified: trunk/web/src/main/webapp/loc/fr/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/fr/xml/strings.xml 2010-12-23 22:40:22 UTC (rev 7044) +++ trunk/web/src/main/webapp/loc/fr/xml/strings.xml 2010-12-24 04:29:40 UTC (rev 7045) @@ -11,6 +11,9 @@ <pt>Рortuguês</pt> <!-- Do not translate! --> <!-- new strings - 2.7 --> + <metadata-templates-samples-add>Add Templates and Samples</metadata-templates-samples-add> + <metadata-schema-select>Select a schema to add templates or sample data from</metadata-schema-select> + <templatesSamples>Manage Templates and Sample Data</templatesSamples> <simpleSearch>Recherche simple</simpleSearch> <advancedSearch>avancée</advancedSearch> <remoteSearch>distribuée</remoteSearch> @@ -580,9 +583,7 @@ <metadata-samples-add-success>Exemples ajoutés</metadata-samples-add-success> <metadata-template-order>Ordonner les modèles</metadata-template-order> <metadata-template-order-desc>Ordonner les modèles de saisie</metadata-template-order-desc> - <metadata-template-add-default>Ajouter les modèles</metadata-template-add-default> - <metadata-template-add-default-desc>Ajouter les modèles par défaut</metadata-template-add-default-desc> - <metadata-template-select>Sélectionner les modèles à ajouter</metadata-template-select> + <metadata-template-add-default>Ajouter les modèles</metadata-template-add-default> <metadata>Métadonnées</metadata> <metadataAdded>Métadonnées ajouter avec l'ID:</metadataAdded> <metadataDeleted>Métadonnées supprimer avec l'ID:</metadataDeleted> Modified: trunk/web/src/main/webapp/loc/nl/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/nl/xml/strings.xml 2010-12-23 22:40:22 UTC (rev 7044) +++ trunk/web/src/main/webapp/loc/nl/xml/strings.xml 2010-12-24 04:29:40 UTC (rev 7045) @@ -11,6 +11,9 @@ <pt>Рortuguês</pt> <!-- Do not translate! --> <!-- new strings - 2.7 --> + <metadata-templates-samples-add>Add Templates and Samples</metadata-templates-samples-add> + <metadata-schema-select>Select a schema to add templates or sample data from</metadata-schema-select> + <templatesSamples>Manage Templates and Sample Data</templatesSamples> <simpleSearch>Simple Search</simpleSearch> <advancedSearch>Advanced Search</advancedSearch> <remoteSearch>Remote Search</remoteSearch> @@ -590,9 +593,7 @@ <metadata-samples-add-success>Laden voorbeeld metadata is gelukt</metadata-samples-add-success> <metadata-template-order>Templates sorteren</metadata-template-order> <metadata-template-order-desc>Sorteer uw templates</metadata-template-order-desc> - <metadata-template-add-default>Add templates</metadata-template-add-default> - <metadata-template-add-default-desc>Add default templates</metadata-template-add-default-desc> - <metadata-template-select>Select the templates to add</metadata-template-select> + <metadata-template-add-default>Add templates</metadata-template-add-default> <metadata>Metadata</metadata> <metadataAdded>Metadata met ID: is opgenomen in de database</metadataAdded> <metadataDeleted>Metadata met ID: is niet meer aanwezig</metadataDeleted> Modified: trunk/web/src/main/webapp/loc/pt/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/pt/xml/strings.xml 2010-12-23 22:40:22 UTC (rev 7044) +++ trunk/web/src/main/webapp/loc/pt/xml/strings.xml 2010-12-24 04:29:40 UTC (rev 7045) @@ -14,6 +14,9 @@ <useStopwords>O índice Lucene usa stopwords para essas linguagens:</useStopwords> <rebuildIndexMessage>Se você alterar esses valores, é recomendável que reconstruir o índice Lucene.</rebuildIndexMessage> <!-- new strings - 2.7 --> + <metadata-templates-samples-add>Add Templates and Samples</metadata-templates-samples-add> + <metadata-schema-select>Select a schema to add templates or sample data from</metadata-schema-select> + <templatesSamples>Manage Templates and Sample Data</templatesSamples> <simpleSearch>Simple Search</simpleSearch> <advancedSearch>Advanced Search</advancedSearch> <remoteSearch>Remote Search</remoteSearch> @@ -580,9 +583,7 @@ <metadata-samples-add-success>Added sample metadata</metadata-samples-add-success> <metadata-template-order>Sort Templates</metadata-template-order> <metadata-template-order-desc>Sort your templates</metadata-template-order-desc> - <metadata-template-add-default>Add templates</metadata-template-add-default> - <metadata-template-add-default-desc>Add default templates</metadata-template-add-default-desc> - <metadata-template-select>Select the templates to add</metadata-template-select> + <metadata-template-add-default>Add templates</metadata-template-add-default> <metadata>Metadados</metadata> <metadataAdded>Metadados com o ID seguinte foram adicionados:</metadataAdded> <metadataDeleted>Metadados com o ID seguinte foram apagados:</metadataDeleted> Modified: trunk/web/src/main/webapp/loc/ru/xml/strings.xml =================================================================== --- trunk/web/src/main/webapp/loc/ru/xml/strings.xml 2010-12-23 22:40:22 UTC (rev 7044) +++ trunk/web/src/main/webapp/loc/ru/xml/strings.xml 2010-12-24 04:29:40 UTC (rev 7045) @@ -11,6 +11,9 @@ <pt>Рortuguês</pt> <!-- Do not translate! --> <!-- new strings - 2.7 --> + <metadata-templates-samples-add>Add Templates and Samples</metadata-templates-samples-add> + <metadata-schema-select>Select a schema to add templates or sample data from</metadata-schema-select> + <templatesSamples>Manage Templates and Sample Data</templatesSamples> <simpleSearch>Simple Search</simpleSearch> <advancedSearch>Advanced Search</advancedSearch> <remoteSearch>Remote Search</remoteSearch> @@ -585,9 +588,7 @@ <metadata-samples-add-success>Образец метаданных добавлен</metadata-samples-add-success> <metadata-template-order>Сортировать шаблоны</metadata-template-order> <metadata-template-order-desc>Сортировать Ваши шаблоны</metadata-template-order-desc> - <metadata-template-add-default>Добавить шаблоны</metadata-template-add-default> - <metadata-template-add-default-desc>Добавить шаблоны по умолчанию</metadata-template-add-default-desc> - <metadata-template-select>Выбрать шаблоны для добавления</metadata-template-select> + <metadata-template-add-default>Добавить шаблоны</metadata-template-add-default> <metadata>Метаданные</metadata> <metadataAdded>Идентификатор добавленных метаданных:</metadataAdded> <metadataDeleted>Идентификатор удаленных метаданных:</metadataDeleted> Modified: trunk/web/src/main/webapp/scripts/geonetwork.js =================================================================== --- trunk/web/src/main/webapp/scripts/geonetwork.js 2010-12-23 22:40:22 UTC (rev 7044) +++ trunk/web/src/main/webapp/scripts/geonetwork.js 2010-12-24 04:29:40 UTC (rev 7045) @@ -583,7 +583,7 @@ function addTemplate(msgSelectSomething) { var url = "metadata.templates.add.default?schema="; - var selectedSchemas = $('metadata.templates.select'); + var selectedSchemas = $('metadata.schemas.select'); var params = ""; for (i = 0;i < selectedSchemas.length;i++) { if (selectedSchemas.options[i].selected) { @@ -599,8 +599,8 @@ url = url + params; } - var wait = 'waitTpl'; - var btn = 'tplBtn'; + var wait = 'waitLoadingTemplatesSamples'; + var btn = 'addTemplatesSamplesButtons'; $(wait).style.display = 'block'; $(btn).style.display = 'none'; @@ -623,7 +623,7 @@ else alert(translate('error')); - var selectedSchemas = $('metadata.templates.select'); + var selectedSchemas = $('metadata.schemas.select'); for (i = 0;i < selectedSchemas.length;i++) { selectedSchemas.options[i].selected = false } @@ -638,7 +638,7 @@ function addSampleData(msgSelectSomething, msgFailedAddSampleMetadata, msgSuccessAddSampleMetadata) { var url = "metadata.samples.add?file_type=mef&uuidAction=overwrite&schema="; - var selectedSchemas = $('metadata.sampledata.select'); + var selectedSchemas = $('metadata.schemas.select'); var params = ""; for (i = 0;i < selectedSchemas.length;i++) { @@ -655,8 +655,8 @@ url = url + params; } - var wait = 'waitSamples'; - var btn = 'tplSamples'; + var wait = 'waitLoadingTemplatesSamples'; + var btn = 'addTemplatesSamplesButtons'; $(wait).style.display = 'block'; $(btn).style.display = 'none'; @@ -680,7 +680,7 @@ else alert(translate('error')+": "+error); - var selectedSchemas = $('metadata.sampledata.select'); + var selectedSchemas = $('metadata.schemas.select'); for (i = 0;i < selectedSchemas.length;i++) { selectedSchemas.options[i].selected = false } Modified: trunk/web/src/main/webapp/xsl/admin.xsl =================================================================== --- trunk/web/src/main/webapp/xsl/admin.xsl 2010-12-23 22:40:22 UTC (rev 7044) +++ trunk/web/src/main/webapp/xsl/admin.xsl 2010-12-24 04:29:40 UTC (rev 7045) @@ -78,7 +78,6 @@ <xsl:with-param name="title" select="/root/gui/strings/mymetadata"/> <xsl:with-param name="desc" select="/root/gui/strings/mymetadata"/> </xsl:call-template> - <xsl:call-template name="addrow"> <xsl:with-param name="service" select="'metadata.batchimport.form'"/> @@ -134,8 +133,8 @@ </xsl:if> - <!-- Template administration --> - <xsl:variable name="mdTemplate"> + <!-- Template and sample metadata administration --> + <xsl:variable name="mdTemplateSamples"> <xsl:call-template name="addrow"> <xsl:with-param name="service" select="'metadata.templates.list'"/> @@ -145,30 +144,36 @@ select="/root/gui/strings/metadata-template-order-desc"/> </xsl:call-template> - <xsl:if test="/root/gui/services/service/@name='metadata.templates.add.default'"> + <xsl:if test="/root/gui/services/service/@name='metadata.templates.add.default' and /root/gui/services/service/@name='metadata.samples.add'"> <tr> - <td class="padded"><xsl:value-of select="/root/gui/strings/metadata-template-add-default"/></td> + <td class="padded"><xsl:value-of select="/root/gui/strings/metadata-templates-samples-add"/></td> <td class="padded"> <table> <tr> - <td align="center" width="20%"> - <xsl:value-of select="/root/gui/strings/metadata-template-add-default-desc"/> : + <td align="left" width="10%"> + <xsl:value-of select="/root/gui/strings/select"/> </td> - <td align="center" width="60%"> - <select class="content" id="metadata.templates.select" size="8" multiple="true"> - <xsl:for-each select="/root/gui/schemalist/name"> - <xsl:sort select="."/> - <option value="{string(.)}"> - <xsl:value-of select="string(.)"/> - </option> - </xsl:for-each> - </select> + <td align="left" width="30%"> + <select class="content" id="metadata.schemas.select" size="8" multiple="true"> + <xsl:for-each select="/root/gui/schemalist/name"> + <xsl:sort select="."/> + <option value="{string(.)}"> + <xsl:value-of select="string(.)"/> + </option> + </xsl:for-each> + </select> </td> - <td align="center" width="20%"> - <button class="content" onclick="addTemplate('{/root/gui/strings/metadata-template-select}');" id="tplBtn"> - <xsl:value-of select="/root/gui/strings/metadata-template-add-default"/> - </button> - <img src="{/root/gui/url}/images/loading.gif" id="waitTpl" style="display:none;"/> + <td align="left" width="60%"> + <div id="addTemplatesSamplesButtons"> + <button class="content" onclick="addTemplate('{/root/gui/strings/metadata-schema-select}');" id="tplBtn"> + <xsl:value-of select="/root/gui/strings/metadata-template-add-default"/> + </button> +   + <button class="content" onclick="addSampleData('{/root/gui/strings/metadata-schema-select}', '{/root/gui/strings/metadata-samples-add-failed}', '{/root/gui/strings/metadata-samples-add-success}');" id="tplSamples"> + <xsl:value-of select="/root/gui/strings/metadata-samples-add"/> + </button> + </div> + <img src="{/root/gui/url}/images/loading.gif" id="waitLoadingTemplatesSamples" style="display:none;"/> </td> </tr> </table> @@ -177,11 +182,11 @@ </xsl:if> </xsl:variable> - <xsl:if test="normalize-space($mdTemplate)"> + <xsl:if test="normalize-space($mdTemplateSamples)"> <tr> - <td colspan="2"><b><xsl:value-of select="/root/gui/strings/template"/></b></td> + <td colspan="2"><b><xsl:value-of select="/root/gui/strings/templatesSamples"/></b></td> </tr> - <xsl:copy-of select="$mdTemplate"/> + <xsl:copy-of select="$mdTemplateSamples"/> <tr><td class="spacer"/></tr> </xsl:if> @@ -315,35 +320,6 @@ <td class="padded"><xsl:value-of select="/root/gui/strings/cswTestDesc"/></td> </tr> - <!-- Sample metadata --> - <xsl:if test="/root/gui/services/service/@name='metadata.samples.add'"> - <tr><td colspan="2" class="spacer"/></tr> - <tr> - <td class="padded"><xsl:value-of select="/root/gui/strings/metadata-samples"/></td> - <td class="padded"> - <table> - <tr> - <td width="60%" align="center"> - <select class="content" id="metadata.sampledata.select" size="8" multiple="true"> - <xsl:for-each select="/root/gui/schemalist/name"> - <xsl:sort select="."/> - <option value="{string(.)}"> - <xsl:value-of select="string(.)"/> - </option> - </xsl:for-each> - </select> - </td> - <td width="40%" align="center"> - <button class="content" onclick="addSampleData('{/root/gui/strings/metadata-sampledata-select}', '{/root/gui/strings/metadata-samples-add-failed}', '{/root/gui/strings/metadata-samples-add-success}');" id="tplSamples"> - <xsl:value-of select="/root/gui/strings/metadata-samples-add"/> - </button> - <img src="{/root/gui/url}/images/loading.gif" id="waitSamples" style="display:none;"/> - </td> - </tr> - </table> - </td> - </tr> - </xsl:if> </table> <p/> </xsl:with-param> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |