[Mapbender-commits] r10295 - in trunk/mapbender: http/plugins resources/locale/de_DE/LC_MESSAGES
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Mon Oct 21 06:24:44 PDT 2019
Author: armin11
Date: 2019-10-21 06:24:44 -0700 (Mon, 21 Oct 2019)
New Revision: 10295
Modified:
trunk/mapbender/http/plugins/mb_iframepopup.js
trunk/mapbender/http/plugins/mb_metadata_manager_select.js
trunk/mapbender/http/plugins/mb_metadata_server.php
trunk/mapbender/http/plugins/mb_metadata_showMetadata.js
trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po
Log:
Some little fixes for the application metadata editor.
Modified: trunk/mapbender/http/plugins/mb_iframepopup.js
===================================================================
--- trunk/mapbender/http/plugins/mb_iframepopup.js 2019-10-21 11:26:55 UTC (rev 10294)
+++ trunk/mapbender/http/plugins/mb_iframepopup.js 2019-10-21 13:24:44 UTC (rev 10295)
@@ -41,8 +41,8 @@
$('<iframe src="' + this.href + '" />').dialog({
title: ($this.attr('title')) ? $this.attr('title') : 'External Site',
autoOpen: true,
- width: 800,
- height: 500,
+ width: 850,
+ height: 550,
modal: true,
resizable: true,
autoResize: true,
@@ -50,7 +50,7 @@
opacity: 0.5,
background: "black"
}
- }).width(800 - horizontalPadding).height(500 - verticalPadding);
+ }).width(850 - horizontalPadding).height(550 - verticalPadding);
});
};
Modified: trunk/mapbender/http/plugins/mb_metadata_manager_select.js
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_manager_select.js 2019-10-21 11:26:55 UTC (rev 10294)
+++ trunk/mapbender/http/plugins/mb_metadata_manager_select.js 2019-10-21 13:24:44 UTC (rev 10295)
@@ -151,9 +151,9 @@
this.initTable = function() {
//initialize table object with jquery from ajax call to serverside script with translated headers!
-
-
mainDivContainer = $("#mb_metadata_manager_select");
+ //initialize size of table
+
//get attribute from object?
mainDivContainer.empty();
tableContainer = $(document.createElement('table'));
@@ -162,9 +162,9 @@
tableContainer.attr({'id':'metadataTable'});
//add button to add new entry to metadata table
if (hierarchyLevel == 'application') {
- $("<img class='metadataEntry clickable' title='new' src='../img/add.png' onclick='initMetadata(null, null, \"application\", true);return false;'/>").appendTo($("#mb_metadata_manager_select"));
+ $("<img class='metadataEntry clickable' title='new' src='../img/gnome/newGui.png' onclick='initMetadata(null, null, \"application\", true);return false;'/>").appendTo($("#mb_metadata_manager_select"));
} else {
- $("<img class='metadataEntry clickable' title='new' src='../img/add.png' onclick='initMetadataAddon(null, null, \"metadata\", true);return false;'/>").appendTo($("#mb_metadata_manager_select"));
+ $("<img class='metadataEntry clickable' title='new' src='../img/gnome/newGui.png' onclick='initMetadataAddon(null, null, \"metadata\", true);return false;'/>").appendTo($("#mb_metadata_manager_select"));
}
mainDivContainer.append(tableContainer);
//alert("created");
Modified: trunk/mapbender/http/plugins/mb_metadata_server.php
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_server.php 2019-10-21 11:26:55 UTC (rev 10294)
+++ trunk/mapbender/http/plugins/mb_metadata_server.php 2019-10-21 13:24:44 UTC (rev 10295)
@@ -1472,6 +1472,7 @@
}
//set export2csw and searchable always initially to true
$resultObj["export2csw2"] = true;
+ $resultObj["export2csw"] = true;
$resultObj["searchable"] = true;
$ajaxResponse->setResult($resultObj);
$ajaxResponse->setSuccess(true);
@@ -2155,7 +2156,7 @@
//TODO - this function is defined for application metadata first - have to be extended to be used for other types dataset/series ...2019-10-07
$resourceType = $ajaxResponse->getParameter("resourceType");
$data = $ajaxResponse->getParameter("data");
- if ($data->export2csw2 == "on") {
+ if ($data->export2csw == "on") {
$data->export2csw = 't';
} else {
$data->export2csw = 'f';
Modified: trunk/mapbender/http/plugins/mb_metadata_showMetadata.js
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_showMetadata.js 2019-10-21 11:26:55 UTC (rev 10294)
+++ trunk/mapbender/http/plugins/mb_metadata_showMetadata.js 2019-10-21 13:24:44 UTC (rev 10295)
@@ -295,8 +295,9 @@
modal: true
});
if (resourceType !== 'metadata') {
- //update resource form to show edited data
- that.fillResourceForm(resourceId, resourceType);
+ //first this means it will be an application!
+ //that.fillResourceForm(resourceId, resourceType);
+ Mapbender.modules.mb_metadata_manager_select.initTable();
} else {
Mapbender.modules.mb_metadata_manager_select.initTable();
}
@@ -325,7 +326,8 @@
});
if (resourceType !== 'metadata') {
//update resource form to show edited data
- that.fillResourceForm(resourceId, resourceType);
+ //that.fillResourceForm(resourceId, resourceType);
+ Mapbender.modules.mb_metadata_manager_select.initTable();
} else {
Mapbender.modules.mb_metadata_manager_select.initTable();
}
@@ -456,6 +458,7 @@
return;
}
}
+//alert("showForm - save form: resourceType: "+resourceType);
var formData = $metadataForm.easyform("serialize");
if (!isNew) {
that.updateAddedMetadata(metadataId, resourceId, resourceType, formData);
Modified: trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po
===================================================================
--- trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po 2019-10-21 11:26:55 UTC (rev 10294)
+++ trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po 2019-10-21 13:24:44 UTC (rev 10295)
@@ -4356,4 +4356,18 @@
msgid "Provider"
msgstr "Anbieter"
+msgid "Application type"
+msgstr "Anwendungstyp"
+msgid "External application"
+msgstr "Externe Anwendung"
+
+msgid "Reference / Address"
+msgstr "Referenz / Adresse"
+
+msgid "Terms of Use / Constraints"
+msgstr "Nutzungsbedingungen / Zugangsbeschränkungen"
+
+
+
+
More information about the Mapbender_commits
mailing list