[Mapbender-commits] r9957 - in trunk/mapbender: http/css http/php http/plugins resources/locale/de_DE/LC_MESSAGES
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Sep 7 04:03:19 PDT 2018
Author: armin11
Date: 2018-09-07 04:03:19 -0700 (Fri, 07 Sep 2018)
New Revision: 9957
Modified:
trunk/mapbender/http/css/digitize_new.css
trunk/mapbender/http/css/kmltree.css
trunk/mapbender/http/php/mb_metadata_uploadLayerPreview.php
trunk/mapbender/http/plugins/kmlTree.php
trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po
Log:
Enhancement from karlo - thanx ;-)
Modified: trunk/mapbender/http/css/digitize_new.css
===================================================================
--- trunk/mapbender/http/css/digitize_new.css 2018-09-06 07:29:54 UTC (rev 9956)
+++ trunk/mapbender/http/css/digitize_new.css 2018-09-07 11:03:19 UTC (rev 9957)
@@ -10,6 +10,7 @@
background-repeat: no-repeat;
background-position: center;
cursor: pointer;
+ margin-right: 3px;
}
.digitize-pencil {
@@ -18,6 +19,7 @@
.digitize-copy {
background-image: url('../img/gnome/edit-copy.png');
+ background-size: 22px;
}
.digitize-paste {
@@ -72,6 +74,10 @@
background-image: url('../img/tree_new/palette.png');
}
+.digitize-label {
+ background-image: url('../img/tree_new/labelling.png');
+}
+
.digitize-attributes {
background-image: url('../img/osgeo_graphics/geosilk/application_view_columns.png');
}
@@ -78,6 +84,7 @@
.digitize-export {
background-image: url('../img/gnome/document-save.png');
+ background-size: 20px;
}
.digitize-export-edit-dialog {
@@ -157,12 +164,13 @@
}
.digitize-close {
- background-image: url('../img/tree_new/error.png');
+ background-image: url('../img/tree_new/error1.png');
}
.digitize-contextmenu {
line-height: 28px;
z-index: 4;
+ margin-top: 25px;
}
.digitize-menu-arrow {
@@ -173,6 +181,7 @@
.ui-menu-item {
cursor: pointer;
+ border: 1px solid transparent;
}
.digitize-hidden {
Modified: trunk/mapbender/http/css/kmltree.css
===================================================================
--- trunk/mapbender/http/css/kmltree.css 2018-09-06 07:29:54 UTC (rev 9956)
+++ trunk/mapbender/http/css/kmltree.css 2018-09-07 11:03:19 UTC (rev 9957)
@@ -158,7 +158,8 @@
a.icon {
background-repeat: no-repeat;
background-position: center left;
- padding-left: 24px !important;
+ padding-left: 21px !important;
+ margin-left: 5px;
}
a.icon-wmc {
@@ -171,6 +172,7 @@
a.icon-remote {
background-image: url('../img/up-ilink.png');
+ background-size: 22px;
}
a.icon-new {
@@ -236,3 +238,26 @@
cursor:pointer;
}
+
+/*dialog_override*/
+#kml-from-wmc {overflow:auto;}
+#kml-from-wmc div table.display {border-collapse:unset;}
+#kml-from-wmc div.dataTables_length, #kml-from-wmc div.dataTables_filter, #kml-from-wmc div.dataTables_info, #kml-from-wmc div.dataTables_paginate {
+ font-size: 12px;
+ margin: 5px 0px 5px 0px;
+ line-height: 26px;
+ padding: 0 5px 0 5px;
+ box-sizing: border-box;
+}
+#kml-from-wmc div.dataTables_length {border-right:none;width:50%;}
+#kml-from-wmc div.dataTables_filter{border-left:none;width:50%;}
+#kml-from-wmc div table.display thead th {
+ padding: 3px 18px 3px 10px;
+ border: 1px solid #d3d3d3;
+ font-weight: normal;
+ font-size: 12px;
+ cursor: pointer;
+}
+#kml-from-upload input, #kml-from-url input.kmlurl, #kml-new input{margin:5px 0px 10px 0px;}
+#kml-from-url, #kml-new, #kml-from-upload {font-size:12px;line-height:20px;}
+#kml-from-url input.kmlurl {margin-left: 2px;}
Modified: trunk/mapbender/http/php/mb_metadata_uploadLayerPreview.php
===================================================================
--- trunk/mapbender/http/php/mb_metadata_uploadLayerPreview.php 2018-09-06 07:29:54 UTC (rev 9956)
+++ trunk/mapbender/http/php/mb_metadata_uploadLayerPreview.php 2018-09-07 11:03:19 UTC (rev 9957)
@@ -140,11 +140,11 @@
}
} else if ($_POST["upload_action"] === "delete") {
unlink($new_image);
- echo "<img class=\"defaultPreview\" src=\""."../geoportal/preview/keinevorschau.jpg\">";
+ echo "<img class=\"defaultPreview\" src=\"../geoportal/preview/keinevorschau.jpg\">";
} else if ($_POST["upload_action"] === "getImage") {
if(!file_exists($new_image)) {
- echo "<img class=\"defaultPreview\" src=\""."../geoportal/preview/keinevorschau.jpg\">";
+ echo "<img class=\"defaultPreview\" src=\"../geoportal/preview/keinevorschau.jpg\">";
} else {
- echo "<img src=\""."../geoportal/preview/".$new_name."\">";
+ echo "<img src=\"../geoportal/preview/" . $new_name . "?nocache=" . time() . "\">";
}
}
Modified: trunk/mapbender/http/plugins/kmlTree.php
===================================================================
--- trunk/mapbender/http/plugins/kmlTree.php 2018-09-06 07:29:54 UTC (rev 9956)
+++ trunk/mapbender/http/plugins/kmlTree.php 2018-09-07 11:03:19 UTC (rev 9957)
@@ -76,9 +76,9 @@
var $KMLfolder = $('<li class="open kml"><ul></ul></li>');
$kmlTree.append($KMLfolder);
- $addButton = $('<button class="add" name="addkml" value="addkml"></button>');
+ $addButton = $('<button title="<?php echo _mb('add geodata');?> "class="add" name="addkml" value="addkml"></button>');
- var selectButton = $('<img id="toggle-select-features" src="../img/osgeo_graphics/geosilk/cursor.png"></img>');
+ var selectButton = $('<img title="<?php echo _mb('select features');?> "id="toggle-select-features" src="../img/osgeo_graphics/geosilk/cursor.png"></img>');
$addButton.click(function() {
if ($('#mySpatialData').dialog('isOpen') === true) {
@@ -98,7 +98,7 @@
$('#mySpatialData').remove();
}
});
- var dlgcontent = '<div id="kml-load-tabs">' + '<ul><li><a class="icon icon-wmc" href="#kml-from-wmc"><?php echo _mb("Stored data");?></a></li>' + '<li><a class="icon icon-local" href="#kml-from-upload"><?php echo _mb("Upload");?></a></li>' + '<li><a class="icon icon-remote" href="#kml-from-url"><?php echo _mb("External source");?></a></li>' + '<li><a class="icon icon-new" href="#kml-new"><?php echo _mb("New");?></a></li></ul>' + '<div id="kml-from-wmc"><?php echo _mb("WMC");?></div>' + '<div id="kml-from-upload">' + '<iframe name="kml-upload-target" style="width: 0; height: 0; border: 0px;"></iframe>' + '<form action="../php/uploadKml.php" method="post" enctype="multipart/form-data" target="kml-upload-target">' + '<input type="file" name="kml"></input>' + '<input type="submit" class="upload" value="Upload"></input><br>' + '<?php echo _mb("You can upload local KML, GPX and geoJSON files here. The filename should have the typical file extension (.kml, .gpx or .geojson) and
the size is limited to 250kb of data.");?>' + '</div>' + '</form>' + '<div id="kml-from-url">URL: <input class="kmlurl" /><button class="add" name="add" value="add"></button><br>' + '<?php echo _mb("You can give an url to a datafile which is located somewhere in the www. Only KML, geoJSON and GPX files are supported. The files will be validated before they are loaded into the mapviewer.");?>' + '</div>' + '<div id="kml-new">' + '<label><?php echo _mb("Title");?>: <input type="text" name="kml-new-title"></input></label>' + '<button class="add-kml"></button>' + '</div>' + '</div>';
+ var dlgcontent = '<div id="kml-load-tabs">' + '<ul><li><a class="icon icon-wmc" href="#kml-from-wmc"><?php echo _mb("Stored data");?></a></li>' + '<li><a class="icon icon-local" href="#kml-from-upload"><?php echo _mb("Upload");?></a></li>' + '<li><a class="icon icon-remote" href="#kml-from-url"><?php echo _mb("External source");?></a></li>' + '<li><a class="icon icon-new" href="#kml-new"><?php echo _mb("New");?></a></li></ul>' + '<div id="kml-from-wmc"><?php echo _mb("WMC");?></div>' + '<div id="kml-from-upload">' + '<iframe name="kml-upload-target" style="width: 0; height: 0; border: 0px;"></iframe>' + '<form action="../php/uploadKml.php" method="post" enctype="multipart/form-data" target="kml-upload-target">' + '<input type="file" name="kml"></input>' + '<input type="submit" class="upload" value="Upload"></input><br>' + '<?php echo _mb("You can upload local KML, GPX and geoJSON files here. The filename should have the typical file extension (.kml, .gpx or .geojson) and
the size is limited to 250kb of data.");?>' + '</div>' + '</form>' + '<div id="kml-from-url">URL: <input class="kmlurl" /><button class="add" name="add" value="add"></button><br>' + '<?php echo _mb("You can give an url to a datafile which is located somewhere in the www. Only KML, geoJSON and GPX files are supported. The files will be validated before they are loaded into the mapviewer.");?>' + '</div>' + '<div id="kml-new">' + '<label><?php echo _mb("Title");?>: <input type="text" name="kml-new-title"></input></label>' + '<button class="add-kml"></button><br>' + '<?php echo _mb("Define a self speaking name for your new dataset collection.");?>' + '</div>' + '</div>';
$('#kml-load-tabs').remove();
$(dlg).append(dlgcontent);
$.ajax({
Modified: trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po
===================================================================
--- trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po 2018-09-06 07:29:54 UTC (rev 9956)
+++ trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po 2018-09-07 11:03:19 UTC (rev 9957)
@@ -4290,3 +4290,11 @@
msgid "Ckan sync module"
msgstr "Ckan Synchronisierungsmodul"
+msgid "select features"
+msgstr "Objekte selektieren"
+
+msgid "add geodata"
+msgstr "Geodaten hinzufügen"
+
+msgid "Define a self speaking name for your new dataset collection."
+msgstr "Geben Sie einen selbstsprechenden Namen für Ihre neue Datensatzsammlung ein."
More information about the Mapbender_commits
mailing list