From d4582e03bf69fb822ca42bab1cc3eb0a057d283c Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Thu, 20 Jun 2013 17:52:50 -0400 Subject: [PATCH] fix translation. --- css/app.css | 11 +---------- data/core.yaml | 3 ++- dist/locales/en.json | 3 ++- js/id/ui/entity_editor.js | 16 ++++++++++------ 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/css/app.css b/css/app.css index c1564641a..2afb3ec7a 100644 --- a/css/app.css +++ b/css/app.css @@ -944,6 +944,7 @@ a:hover .icon.out-link { background-position: -500px -14px;} .entity-editor-pane .preset-icon-wrap { border-bottom: 1px solid #ccc; padding: 20px; + height: 100px; } .entity-editor-pane .preset-icon-wrap::after { @@ -960,16 +961,6 @@ a:hover .icon.out-link { background-position: -500px -14px;} border-bottom-color: #ccc; } -.entity-editor-pane .preset-icon-wrap > button { - display: block; - height: 60px; - width: 60px; - margin: auto; - border-radius: 4px; - position: relative; - background-color: transparent; -} - .form-field { margin-bottom: 10px; width: 100%; diff --git a/data/core.yaml b/data/core.yaml index 035f7615f..fdb70da69 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -185,7 +185,8 @@ en: search: Search unknown: Unknown incomplete: - feature_list: Feature List + feature_list: Feature list + edit: edit feature background: title: Background description: Background settings diff --git a/dist/locales/en.json b/dist/locales/en.json index 5e647f930..6ac8a2fb1 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -228,7 +228,8 @@ "search": "Search", "unknown": "Unknown", "incomplete": "", - "feature_list": "Feature List" + "feature_list": "Feature list", + "edit": "edit feature" }, "background": { "title": "Background", diff --git a/js/id/ui/entity_editor.js b/js/id/ui/entity_editor.js index dd6039578..eebdbb18c 100644 --- a/js/id/ui/entity_editor.js +++ b/js/id/ui/entity_editor.js @@ -34,7 +34,7 @@ iD.ui.EntityEditor = function(context) { // Update $header.select('h3') - .text(preset.name()); + .text(t('inspector.edit')); $header.select('.preset-close') .on('click', function() { @@ -49,11 +49,15 @@ iD.ui.EntityEditor = function(context) { $enter = $body.enter().append('div') .attr('class', 'inspector-body'); - $enter.append('div') - .attr('class', 'preset-icon-wrap inspector-inner') - .append('button') - .attr('class', 'preset-reset preset-icon-button') - .call(bootstrap.tooltip() + var headerbutton = $enter.append('div') + .attr('class', 'preset-icon-wrap inspector-inner fillL') + .append('button') + .attr('class', 'preset-list-button preset-reset') + .append('div') + .attr('class', 'label') + .text(preset.name()) + + headerbutton.call(bootstrap.tooltip() .title(t('inspector.back_tooltip')) .placement('right'));