[Mapbender-commits] r9948 - in trunk/mapbender/http: css extensions/fontIconPicker-2.0.0/css plugins
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Tue Aug 21 01:07:41 PDT 2018
Author: armin11
Date: 2018-08-21 01:07:40 -0700 (Tue, 21 Aug 2018)
New Revision: 9948
Modified:
trunk/mapbender/http/css/kmltree.css
trunk/mapbender/http/extensions/fontIconPicker-2.0.0/css/jquery.fonticonpicker.min.css
trunk/mapbender/http/plugins/mb_digitize_widget.php
trunk/mapbender/http/plugins/mb_geodata_edit.js
trunk/mapbender/http/plugins/mb_metadata_edit.js
Log:
Bufix for digitizing module - selection of predefined symbol possible now. Thanx to Hesse
Modified: trunk/mapbender/http/css/kmltree.css
===================================================================
--- trunk/mapbender/http/css/kmltree.css 2018-08-15 15:43:25 UTC (rev 9947)
+++ trunk/mapbender/http/css/kmltree.css 2018-08-21 08:07:40 UTC (rev 9948)
@@ -5,6 +5,10 @@
*/
+#kmlTree .style-preview svg {
+ margin: 5px 3px -8px 3px !important;
+}
+
/* The Whole kml Tree */
ul.kmlTree {
Modified: trunk/mapbender/http/extensions/fontIconPicker-2.0.0/css/jquery.fonticonpicker.min.css
===================================================================
--- trunk/mapbender/http/extensions/fontIconPicker-2.0.0/css/jquery.fonticonpicker.min.css 2018-08-15 15:43:25 UTC (rev 9947)
+++ trunk/mapbender/http/extensions/fontIconPicker-2.0.0/css/jquery.fonticonpicker.min.css 2018-08-21 08:07:40 UTC (rev 9948)
@@ -1,2 +1,2 @@
/* fontIconPicker main CSS file {@link https://github.com/micc83/fontIconPicker} */
-.icons-selector *{margin:0;padding:0;border:0;font:inherit;vertical-align:baseline;font-family:HelveticaNeue-Light,"Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif}.icons-selector,.icons-selector *,.icons-selector :after,.icons-selector :before,.icons-selector:after,.icons-selector:before{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.icons-selector{display:inline-block;vertical-align:middle;text-align:left}.icons-selector .selector{width:100px;height:40px}.icons-selector .selector-button{width:39px;height:100%;display:block;text-align:center;cursor:pointer;float:left}.icons-selector .selector-button i{line-height:38px;text-align:center}.icons-selector .selected-icon{display:block;width:60px;height:100%;float:left;text-align:center}.icons-selector .selected-icon i{line-height:40px;font-size:18px;cursor:default}.icons-selector .selector-popup{position:absolute;z-index:10000;background-color:#fefefe;padding:5px;heig
ht:auto;width:342px;margin-top:-1px}.icons-selector .selector-category select,.icons-selector .selector-search input[type=text]{border:0;line-height:20px;padding:10px 2.5%;width:100%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;margin-bottom:5px;font-size:12px;display:block}.icons-selector .selector-category select{height:40px}.icons-selector .selector-category select option{padding:10px}.icons-selector input::-webkit-input-placeholder{text-transform:uppercase}.icons-selector input:-moz-placeholder{text-transform:uppercase}.icons-selector input::-moz-placeholder{text-transform:uppercase}.icons-selector input:-ms-input-placeholder{text-transform:uppercase}.icons-selector .selector-search{position:relative}.icons-selector .selector-search i{position:absolute;right:10px;top:7px}.icons-selector .fip-icons-container{width:100%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;padding:5px}.icons-selector .fip-icons-container .
loading{font-size:24px;margin:0 auto;padding:20px 0;text-align:center;width:100%}.icons-selector .fip-box{display:inline-block;margin:2px;width:60px;line-height:42px;text-align:center;cursor:pointer;vertical-align:top;height:40px}.icons-selector .selector-footer{line-height:12px;padding:5px 5px 0;text-align:center}.icons-selector .selector-footer,.icons-selector .selector-footer i{font-size:14px}.icons-selector .selector-arrows{float:right}.icons-selector .selector-pages{font-size:11px;float:left}.icons-selector .selector-arrows i{cursor:pointer}.icons-selector .selector-footer em{font-style:italic}.icons-selector .icons-picker-error i:before{color:#eee}@font-face{font-family:iconpicker;src:url(iconpicker.eot?90190138);src:url(iconpicker.eot?90190138#iefix) format('embedded-opentype'),url(iconpicker.woff?90190138) format('woff'),url(iconpicker.ttf?90190138) format('truetype'),url(iconpicker.svg?90190138#iconpicker) format('svg');font-weight:400;font-style:normal}.icons-selector [cla
ss*=" fip-icon-"]:before,.icons-selector [class^=fip-icon-]:before{font-family:iconpicker;font-style:normal;font-weight:400;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em}.icons-selector .fip-icon-search:before{content:'\e812';cursor:default}.icons-selector .fip-icon-cancel:before{content:'\e814';cursor:pointer}.icons-selector .fip-icon-block:before{content:'\e84e';color:#fed0d0}.icons-selector .fip-icon-down-dir:before{content:'\e800'}.icons-selector .fip-icon-up-dir:before{content:'\e813'}.icons-selector .fip-icon-left-dir:before{content:'\e801'}.icons-selector .fip-icon-right-dir:before{content:'\e802'}.icons-selector .fip-icon-spin3:before{content:'\e815'}.icons-selector .fip-icon-spin3{-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;-webkit-animation:spin 2s infinite linear;animation:spin 2s infinite linear;display:inline-bl
ock}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg);-o-transform:rotate(0deg);-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-moz-transform:rotate(359deg);-o-transform:rotate(359deg);-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-moz-transform:rotate(0deg);-o-transform:rotate(0deg);-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-moz-transform:rotate(359deg);-o-transform:rotate(359deg);-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes spin{0%{-moz-transform:rotate(0deg);-o-transform:rotate(0deg);-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-moz-transform:rotate(359deg);-o-transform:rotate(359deg);-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-ms-keyframes spin{0%{-moz-transform:rotate(0deg);-o-transform:rotate(0deg);-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-moz-transform:rotate(359deg);-o-transform:rotate(359deg);-webkit-transform:rotate(359deg);tra
nsform:rotate(359deg)}}@keyframes spin{0%{-moz-transform:rotate(0deg);-o-transform:rotate(0deg);-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-moz-transform:rotate(359deg);-o-transform:rotate(359deg);-webkit-transform:rotate(359deg);transform:rotate(359deg)}}
+.icons-selector *{margin:0;padding:0;border:0;font:inherit;vertical-align:baseline;font-family:HelveticaNeue-Light,"Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif}.icons-selector,.icons-selector *,.icons-selector :after,.icons-selector :before,.icons-selector:after,.icons-selector:before{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.icons-selector{display:inline-block;vertical-align:middle;text-align:left}.icons-selector .selector{width:100px;height:40px}.icons-selector .selector-button{width:39px;height:100%;display:block;text-align:center;cursor:pointer;float:left}.icons-selector .selector-button i{line-height:38px;text-align:center}.icons-selector .selected-icon{display:block;width:60px;height:100%;float:left;text-align:center}.icons-selector .selected-icon i{line-height:40px;font-size:35px;cursor:default}.icons-selector .selector-popup{position:absolute;z-index:10000;background-color:#fefefe;padding:5px;heig
ht:auto;width:342px;margin-top:-1px;margin-left:-140px;}.icons-selector .selector-category select,.icons-selector .selector-search input[type=text]{border:0;line-height:20px;padding:10px 2.5%;width:100%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;margin-bottom:5px;font-size:12px;display:block}.icons-selector .selector-category select{height:40px}.icons-selector .selector-category select option{padding:10px}.icons-selector input::-webkit-input-placeholder{text-transform:uppercase}.icons-selector input:-moz-placeholder{text-transform:uppercase}.icons-selector input::-moz-placeholder{text-transform:uppercase}.icons-selector input:-ms-input-placeholder{text-transform:uppercase}.icons-selector .selector-search{position:relative}.icons-selector .selector-search i{position:absolute;right:10px;top:7px}.icons-selector .fip-icons-container{width:100%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;padding:5px}.icons-selector .f
ip-icons-container .loading{font-size:24px;margin:0 auto;padding:20px 0;text-align:center;width:100%}.icons-selector .fip-box{display:inline-block;margin:2px;width:60px;line-height:42px;text-align:center;cursor:pointer;vertical-align:top;height:40px}.fip-box{font-size:35px;}.icons-selector .selector-footer{line-height:25px;padding:5px 5px 0;text-align:center}.icons-selector .selector-footer,.icons-selector .selector-footer i{font-size:14px}.icons-selector .selector-arrows{float:right;}.selector-arrows span i{font-size:25px !important;}.icons-selector .selector-pages{font-size:12px;float:left;line-height:25px;color:#222222;letter-spacing:1px;}.icons-selector .selector-arrows i{cursor:pointer}.icons-selector .selector-footer em{font-style:italic}.icons-selector .icons-picker-error i:before{color:#eee}@font-face{font-family:iconpicker;src:url(iconpicker.eot?90190138);src:url(iconpicker.eot?90190138#iefix) format('embedded-opentype'),url(iconpicker.woff?90190138) format('woff'),url(icon
picker.ttf?90190138) format('truetype'),url(iconpicker.svg?90190138#iconpicker) format('svg');font-weight:400;font-style:normal}.icons-selector [class*=" fip-icon-"]:before,.icons-selector [class^=fip-icon-]:before{font-family:iconpicker;font-style:normal;font-weight:400;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em}.icons-selector .fip-icon-search:before{content:'\e812';cursor:default}.icons-selector .fip-icon-cancel:before{content:'\e814';cursor:pointer}.icons-selector .fip-icon-block:before{content:'\e84e';color:#fed0d0}.icons-selector .fip-icon-down-dir:before{content:'\e800'}.icons-selector .fip-icon-up-dir:before{content:'\e813'}.icons-selector .fip-icon-left-dir:before{content:'\e801'}.icons-selector .fip-icon-right-dir:before{content:'\e802'}.icons-selector .fip-icon-spin3:before{content:'\e815'}.icons-selector .fip-icon-spin3{-moz-animation:spin 2
s infinite linear;-o-animation:spin 2s infinite linear;-webkit-animation:spin 2s infinite linear;animation:spin 2s infinite linear;display:inline-block}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg);-o-transform:rotate(0deg);-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-moz-transform:rotate(359deg);-o-transform:rotate(359deg);-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-moz-transform:rotate(0deg);-o-transform:rotate(0deg);-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-moz-transform:rotate(359deg);-o-transform:rotate(359deg);-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-o-keyframes spin{0%{-moz-transform:rotate(0deg);-o-transform:rotate(0deg);-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-moz-transform:rotate(359deg);-o-transform:rotate(359deg);-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@-ms-keyframes spin{0%{-moz-transform:rotate(0deg);-o-transform:rotate(0deg);-webk
it-transform:rotate(0deg);transform:rotate(0deg)}100%{-moz-transform:rotate(359deg);-o-transform:rotate(359deg);-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes spin{0%{-moz-transform:rotate(0deg);-o-transform:rotate(0deg);-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-moz-transform:rotate(359deg);-o-transform:rotate(359deg);-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fip-box i{line-height:42px;}
Modified: trunk/mapbender/http/plugins/mb_digitize_widget.php
===================================================================
--- trunk/mapbender/http/plugins/mb_digitize_widget.php 2018-08-15 15:43:25 UTC (rev 9947)
+++ trunk/mapbender/http/plugins/mb_digitize_widget.php 2018-08-21 08:07:40 UTC (rev 9948)
@@ -282,7 +282,6 @@
$('#kmlTree li.kmltree-selected').removeClass('kmltree-selected');
attributesDialog.dialog('close');
editStyleDialog.dialog('close');
-
});
copyDialog = $(copyHtml);
copyDialog.dialog({
@@ -498,6 +497,9 @@
editStyleDialog.find('input[name="marker-symbol"]').val('icon-' + v + '-24');
}
});
+ var cls = $('.digitize-style-predefined .selected-icon i').attr('class');
+ $('.digitize-style-predefined input[name="marker-symbol"]').val(cls);
+ editStyleDialog.find('input').change();
editStyleDialog.find('form input').bind('click', function() {
editStyleDialog.find('.digitize-style-' + $(this).val()).css('display', 'block').siblings('table').css('display', 'none');
@@ -505,14 +507,16 @@
editStyleDialog.find('button[name="digitize-reset-style"]').bind('click', function() {
if(ispoint) {
- editStyleDialog.find('.digitize-style-custom,form').css('display', 'block');
- editStyleDialog.find('.digitize-style-predefined').css('display', 'none');
- editStyleDialog.find('input[value="custom"]').attr('checked', 'checked');
+ editStyleDialog.find('form').css('display', 'block');
+ editStyleDialog.find('.digitize-style-custom').css('display', 'none');
+ editStyleDialog.find('.digitize-style-predefined').css('display', 'block');
editStyleDialog.find('.digitize-style-custom input[name="marker-symbol"]').val('../img/marker/red.png');
editStyleDialog.find('.digitize-style-custom input[name="marker-size"]').val(20);
editStyleDialog.find('.digitize-style-predefined input[name="marker-symbol"]').val('icon-airfield-24');
+ $('.digitize-style-predefined .selected-icon i').attr('class', 'icon-airfield-24');
editStyleDialog.find('.digitize-style-predefined input[name="marker-size"]').val('medium');
editStyleDialog.find('.digitize-style-predefined input[name="marker-color"]').spectrum('set', 'white');
+ editStyleDialog.find('input').change();
}
editStyleDialog.find('input[name="stroke"]').spectrum('set', '#555555');
editStyleDialog.find('.opacity-slider').slider('value', 100);
@@ -529,6 +533,10 @@
return;
}
+ if($(this).attr('name').match(/marker-type/) && !$(this).get(0).checked) {
+ return;
+ }
+
if($(this).attr('name') === 'stroke-width') {
var val = $(this).val();
if(!(!isNaN(parseFloat(val)) && isFinite(val)) || $(this).val() <= 0) {
Modified: trunk/mapbender/http/plugins/mb_geodata_edit.js
===================================================================
--- trunk/mapbender/http/plugins/mb_geodata_edit.js 2018-08-15 15:43:25 UTC (rev 9947)
+++ trunk/mapbender/http/plugins/mb_geodata_edit.js 2018-08-21 08:07:40 UTC (rev 9948)
@@ -77,6 +77,13 @@
}
$geodataForm.easyform("reset");
$geodataForm.easyform("fill", obj);
+ // select mdContact option
+ var select = document.getElementById('fkey_mb_group_id');
+ select.childNodes.forEach(function(option) {
+ if (option.value === obj.fkey_mb_group_id) {
+ option.selected = true;
+ }
+ });
that.valid();
}
});
Modified: trunk/mapbender/http/plugins/mb_metadata_edit.js
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_edit.js 2018-08-15 15:43:25 UTC (rev 9947)
+++ trunk/mapbender/http/plugins/mb_metadata_edit.js 2018-08-21 08:07:40 UTC (rev 9948)
@@ -80,6 +80,13 @@
$('#license_source').css("display","none");
//check if obj.wms_termsofuse not null
that.fillLicence(obj.wms_termsofuse);
+ // select mdContact option
+ var select = document.getElementById('fkey_mb_group_id');
+ select.childNodes.forEach(function(option) {
+ if (option.value === obj.fkey_mb_group_id) {
+ option.selected = true;
+ }
+ });
that.valid();
}
});
More information about the Mapbender_commits
mailing list