diff --git a/css/65_data.css b/css/65_data.css index 2b19ae553..8de9ca09c 100644 --- a/css/65_data.css +++ b/css/65_data.css @@ -1,7 +1,7 @@ /* OSM Notes and KeepRight Layers */ -.kr_error-header-icon .qa_error-fill, +.error-header-icon .qa_error-fill, .layer-keepRight .qa_error .qa_error-fill, .layer-improveOSM .qa_error .qa_error-fill { stroke: #333; @@ -44,12 +44,12 @@ /* adjustment for error icon */ -.kr_error-header-icon .preset-icon-28 { +.error-header-icon .preset-icon-28 { top: auto; left: auto; } -.kr_error-header-icon { +.error-header-icon { display: flex; align-items: center; justify-content: center; @@ -211,4 +211,4 @@ stroke: #000; stroke-width: 5px; stroke-miterlimit: 1; -} \ No newline at end of file +} diff --git a/css/80_app.css b/css/80_app.css index df759735d..4715c07d4 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -591,7 +591,7 @@ button.add-note svg.icon { .field-help-title button.close, .sidebar-component .header button.data-editor-close, .sidebar-component .header button.note-editor-close, -.sidebar-component .header button.keepRight-editor-close, +.sidebar-component .header button.error-editor-close, .entity-editor-pane .header button.preset-close, .preset-list-pane .header button.preset-choose { position: absolute; @@ -601,7 +601,7 @@ button.add-note svg.icon { [dir='rtl'] .field-help-title button.close, [dir='rtl'] .sidebar-component .header button.data-editor-close, [dir='rtl'] .sidebar-component .header button.note-editor-close, -[dir='rtl'] .sidebar-component .header button.keepRight-editor-close, +[dir='rtl'] .sidebar-component .header button.error-editor-close, [dir='rtl'] .entity-editor-pane .header button.preset-close, [dir='rtl'] .preset-list-pane .header button.preset-choose { left: 0; @@ -1175,7 +1175,7 @@ img.tag-reference-wiki-image { } .data-editor .quick-links, -.keepRight-editor .quick-links, +.error-editor .quick-links, .note-editor .quick-links { padding: 5px 0 0 0; } @@ -2488,7 +2488,7 @@ input.key-trap { /* OSM Note / KeepRight Editors ------------------------------------------------------- */ .note-header, -.kr_error-header { +.error-header { background-color: #f6f6f6; border-radius: 5px; border: 1px solid #ccc; @@ -2498,7 +2498,7 @@ input.key-trap { } .note-header-icon, -.kr_error-header-icon { +.error-header-icon { background-color: #fff; padding: 10px; flex: 0 0 62px; @@ -2509,20 +2509,20 @@ input.key-trap { border-radius: 5px 0 0 5px; } [dir='rtl'] .note-header-icon, -[dir='rtl'] .kr_error-header-icon { +[dir='rtl'] .error-header-icon { border-right: unset; border-left: 1px solid #ccc; border-radius: 0 5px 5px 0; } .note-header-icon .icon-wrap, -.kr_error-header-icon .icon-wrap { +.error-header-icon .icon-wrap { position: absolute; top: 0px; } .note-header-label, -.kr_error-header-label { +.error-header-label { background-color: #f6f6f6; padding: 0 15px; flex: 1 1 100%; @@ -2531,7 +2531,7 @@ input.key-trap { border-radius: 0 5px 5px 0; } [dir='rtl'] .note-header-label, -[dir='rtl'] .kr_error-header-label { +[dir='rtl'] .error-header-label { border-radius: 5px 0 0 5px; } @@ -2598,46 +2598,44 @@ input.key-trap { } .note-save, -.keepRight-save { +.error-save { padding-top: 20px; } -.kr_error-details, -.kr_error-comment-container { + +.error-details { padding: 10px; } - -.keepRight-save .new-comment-input, -.note-save .new-comment-input { - width: 100%; - height: 100px; - max-height: 300px; - min-height: 100px; -} - -.keepRight-save .detail-section, -.note-save .detail-section { - margin: 10px 0; -} - -.note-report { - float: right; -} - -.kr_error-details-container { +.error-details-container { background: #ececec; padding: 10px; margin-top: 20px; border-radius: 4px; border: 1px solid #ccc; } - -.kr_error-details-description { +.error-details-description { margin-bottom: 10px; } -.kr_error-details-description-text::first-letter { +.error-details-description-text::first-letter { text-transform: capitalize; } +.note-save .new-comment-input, +.error-save .new-comment-input { + width: 100%; + height: 100px; + max-height: 300px; + min-height: 100px; +} + +.note-save .detail-section, +.error-save .detail-section { + margin: 10px 0; +} + +.note-report { + float: right; +} + /* Custom Data Editor ------------------------------------------------------- */ diff --git a/modules/services/improveOSM.js b/modules/services/improveOSM.js index 83572cefc..9d3b51ab7 100644 --- a/modules/services/improveOSM.js +++ b/modules/services/improveOSM.js @@ -65,11 +65,11 @@ function updateRtree(item, replace) { } function linkErrorObject(d) { - return '' + d + ''; + return '' + d + ''; } function linkEntity(d) { - return '' + d + ''; + return '' + d + ''; } function pointAverage(points) { @@ -476,4 +476,4 @@ export default { getClosedIDs: function() { return Object.keys(_erCache.closed).sort(); } -}; \ No newline at end of file +}; diff --git a/modules/services/keepRight.js b/modules/services/keepRight.js index 0995cab27..68e34587a 100644 --- a/modules/services/keepRight.js +++ b/modules/services/keepRight.js @@ -168,11 +168,11 @@ function parseError(capture, idType) { function linkErrorObject(d) { - return '' + d + ''; + return '' + d + ''; } function linkEntity(d) { - return '' + d + ''; + return '' + d + ''; } function linkURL(d) { @@ -499,4 +499,4 @@ export default { return Object.keys(_krCache.closed).sort(); } -}; \ No newline at end of file +}; diff --git a/modules/ui/improveOSM_details.js b/modules/ui/improveOSM_details.js index 075ccd0cb..efa27ef9b 100644 --- a/modules/ui/improveOSM_details.js +++ b/modules/ui/improveOSM_details.js @@ -32,7 +32,7 @@ export function uiImproveOsmDetails(context) { function improveOsmDetails(selection) { - var details = selection.selectAll('.kr_error-details') + var details = selection.selectAll('.error-details') .data( (_error ? [_error] : []), function(d) { return d.id + '-' + (d.status || 0); } @@ -43,13 +43,13 @@ export function uiImproveOsmDetails(context) { var detailsEnter = details.enter() .append('div') - .attr('class', 'kr_error-details kr_error-details-container'); + .attr('class', 'error-details error-details-container'); // description var descriptionEnter = detailsEnter .append('div') - .attr('class', 'kr_error-details-description'); + .attr('class', 'error-details-description'); descriptionEnter .append('h4') @@ -57,14 +57,14 @@ export function uiImproveOsmDetails(context) { descriptionEnter .append('div') - .attr('class', 'kr_error-details-description-text') + .attr('class', 'error-details-description-text') .html(errorDetail); // If there are entity links in the error message.. - descriptionEnter.selectAll('.kr_error_entity_link, .kr_error_object_link') + descriptionEnter.selectAll('.error_entity_link, .error_object_link') .each(function() { var link = d3_select(this); - var isObjectLink = link.classed('kr_error_object_link'); + var isObjectLink = link.classed('error_object_link'); var entityID = isObjectLink ? (utilEntityRoot(_error.object_type) + _error.object_id) : this.textContent; @@ -124,4 +124,4 @@ export function uiImproveOsmDetails(context) { return improveOsmDetails; -} \ No newline at end of file +} diff --git a/modules/ui/improveOSM_editor.js b/modules/ui/improveOSM_editor.js index 54699067f..14405b538 100644 --- a/modules/ui/improveOSM_editor.js +++ b/modules/ui/improveOSM_editor.js @@ -50,7 +50,7 @@ export function uiImproveOsmEditor(context) { headerEnter .append('button') - .attr('class', 'fr keepRight-editor-close') + .attr('class', 'fr error-editor-close') .on('click', function() { context.enter(modeBrowse(context)); }) @@ -69,12 +69,12 @@ export function uiImproveOsmEditor(context) { .attr('class', 'body') .merge(body); - var editor = body.selectAll('.keepRight-editor') + var editor = body.selectAll('.error-editor') .data([0]); editor.enter() .append('div') - .attr('class', 'modal-section keepRight-editor') + .attr('class', 'modal-section error-editor') .merge(editor) .call(errorHeader.error(_error)) .call(quickLinks.choices(choices)) @@ -99,7 +99,7 @@ export function uiImproveOsmEditor(context) { // enter var saveSectionEnter = saveSection.enter() .append('div') - .attr('class', 'keepRight-save save-section cf'); + .attr('class', 'error-save save-section cf'); saveSectionEnter .append('h4') @@ -229,4 +229,4 @@ export function uiImproveOsmEditor(context) { return utilRebind(improveOsmEditor, dispatch, 'on'); -} \ No newline at end of file +} diff --git a/modules/ui/improveOSM_header.js b/modules/ui/improveOSM_header.js index d87b7cb3e..f9ae38327 100644 --- a/modules/ui/improveOSM_header.js +++ b/modules/ui/improveOSM_header.js @@ -22,7 +22,7 @@ export function uiImproveOsmHeader() { function improveOsmHeader(selection) { - var header = selection.selectAll('.kr_error-header') + var header = selection.selectAll('.error-header') .data( (_error ? [_error] : []), function(d) { return d.id + '-' + (d.status || 0); } @@ -33,11 +33,11 @@ export function uiImproveOsmHeader() { var headerEnter = header.enter() .append('div') - .attr('class', 'kr_error-header'); + .attr('class', 'error-header'); var iconEnter = headerEnter .append('div') - .attr('class', 'kr_error-header-icon') + .attr('class', 'error-header-icon') .classed('new', function(d) { return d.id < 0; }); var svgEnter = iconEnter @@ -81,7 +81,7 @@ export function uiImproveOsmHeader() { headerEnter .append('div') - .attr('class', 'kr_error-header-label') + .attr('class', 'error-header-label') .text(errorTitle); } @@ -94,4 +94,4 @@ export function uiImproveOsmHeader() { return improveOsmHeader; -} \ No newline at end of file +} diff --git a/modules/ui/keepRight_details.js b/modules/ui/keepRight_details.js index 12d613448..96b6536b6 100644 --- a/modules/ui/keepRight_details.js +++ b/modules/ui/keepRight_details.js @@ -37,7 +37,7 @@ export function uiKeepRightDetails(context) { function keepRightDetails(selection) { - var details = selection.selectAll('.kr_error-details') + var details = selection.selectAll('.error-details') .data( (_error ? [_error] : []), function(d) { return d.id + '-' + (d.status || 0); } @@ -48,13 +48,13 @@ export function uiKeepRightDetails(context) { var detailsEnter = details.enter() .append('div') - .attr('class', 'kr_error-details kr_error-details-container'); + .attr('class', 'error-details error-details-container'); // description var descriptionEnter = detailsEnter .append('div') - .attr('class', 'kr_error-details-description'); + .attr('class', 'error-details-description'); descriptionEnter .append('h4') @@ -62,14 +62,14 @@ export function uiKeepRightDetails(context) { descriptionEnter .append('div') - .attr('class', 'kr_error-details-description-text') + .attr('class', 'error-details-description-text') .html(errorDetail); // If there are entity links in the error message.. - descriptionEnter.selectAll('.kr_error_entity_link, .kr_error_object_link') + descriptionEnter.selectAll('.error_entity_link, .error_object_link') .each(function() { var link = d3_select(this); - var isObjectLink = link.classed('kr_error_object_link'); + var isObjectLink = link.classed('error_object_link'); var entityID = isObjectLink ? (utilEntityRoot(_error.object_type) + _error.object_id) : this.textContent; diff --git a/modules/ui/keepRight_editor.js b/modules/ui/keepRight_editor.js index ca502b1e1..c35ea4b5e 100644 --- a/modules/ui/keepRight_editor.js +++ b/modules/ui/keepRight_editor.js @@ -49,7 +49,7 @@ export function uiKeepRightEditor(context) { headerEnter .append('button') - .attr('class', 'fr keepRight-editor-close') + .attr('class', 'fr error-editor-close') .on('click', function() { context.enter(modeBrowse(context)); }) @@ -68,12 +68,12 @@ export function uiKeepRightEditor(context) { .attr('class', 'body') .merge(body); - var editor = body.selectAll('.keepRight-editor') + var editor = body.selectAll('.error-editor') .data([0]); editor.enter() .append('div') - .attr('class', 'modal-section keepRight-editor') + .attr('class', 'modal-section error-editor') .merge(editor) .call(keepRightHeader.error(_error)) .call(quickLinks.choices(choices)) @@ -108,7 +108,7 @@ export function uiKeepRightEditor(context) { // enter var saveSectionEnter = saveSection.enter() .append('div') - .attr('class', 'keepRight-save save-section cf'); + .attr('class', 'error-save save-section cf'); saveSectionEnter .append('h4') diff --git a/modules/ui/keepRight_header.js b/modules/ui/keepRight_header.js index 0e611c74f..33a958b75 100644 --- a/modules/ui/keepRight_header.js +++ b/modules/ui/keepRight_header.js @@ -28,7 +28,7 @@ export function uiKeepRightHeader() { function keepRightHeader(selection) { - var header = selection.selectAll('.kr_error-header') + var header = selection.selectAll('.error-header') .data( (_error ? [_error] : []), function(d) { return d.id + '-' + (d.status || 0); } @@ -39,11 +39,11 @@ export function uiKeepRightHeader() { var headerEnter = header.enter() .append('div') - .attr('class', 'kr_error-header'); + .attr('class', 'error-header'); var iconEnter = headerEnter .append('div') - .attr('class', 'kr_error-header-icon') + .attr('class', 'error-header-icon') .classed('new', function(d) { return d.id < 0; }); iconEnter @@ -55,7 +55,7 @@ export function uiKeepRightHeader() { headerEnter .append('div') - .attr('class', 'kr_error-header-label') + .attr('class', 'error-header-label') .text(errorTitle); } @@ -68,4 +68,4 @@ export function uiKeepRightHeader() { return keepRightHeader; -} \ No newline at end of file +}