From 64ad80c5c62be12b175fbb6f9e9b60cce686b4df Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis.brammanis@gmail.com>
Date: Wed, 20 Mar 2013 15:29:30 -0400
Subject: [PATCH] move preset icon and type name into header

---
 css/app.css            | 10 ++++++++++
 data/core.yaml         |  2 +-
 js/id/ui/tag_editor.js | 23 +++++++----------------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/css/app.css b/css/app.css
index c24c39e1a..5c4f77470 100644
--- a/css/app.css
+++ b/css/app.css
@@ -649,11 +649,21 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     position: relative;
 }
 
+.inspector-wrap .message div.fl,
 .inspector-wrap .message button.fl {
     height: 100%;
     border-radius: 0;
     border-right: 1px solid #CCC;
     width: 12.5%;
+    text-align: center;
+}
+
+.inspector-wrap .message div.fl .icon{
+    margin-top: 18px;
+}
+.inspector-wrap .message div.fl.line .icon{
+    margin-left: -25px;
+    margin-top: -23px;
 }
 
 .inspector-wrap .message button.fr {
diff --git a/data/core.yaml b/data/core.yaml
index c8f94ba1b..1a0e77793 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -139,7 +139,7 @@ en:
     okay: Okay
     view_on_osm: View on OSM
     name: Name
-    editing: Edit details
+    editing_feature: "Editing {feature}"
     additional: Additional tags
     choose: Select feature type
     results: "{n} results for {search}"
diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js
index 847d99bc2..bfbda692c 100644
--- a/js/id/ui/tag_editor.js
+++ b/js/id/ui/tag_editor.js
@@ -37,9 +37,14 @@ iD.ui.TagEditor = function(context, entity) {
             .append('span')
             .attr('class', 'icon back');
 
+        messagewrap.append('div')
+            .attr('class', 'preset-reset fl ' + geometry)
+            .append('span')
+            .attr('class', 'icon' + (preset ?  ' feature-' + (preset.icon || 'marker-stroked') : ''));
+
         messagewrap.append('h3')
             .attr('class', 'inspector-inner fl')
-            .text(t('inspector.editing'));
+            .text('Editing ' + preset.name());
 
         messagewrap.append('button')
             .attr('class', 'preset-close fr')
@@ -52,22 +57,8 @@ iD.ui.TagEditor = function(context, entity) {
 
         var headerwrap = editorwrap.append('div').attr('class','col12 head');
 
-        var typebutton = headerwrap.append('div')
-            .attr('class','grid-button-wrap col4')
-                .append('div')
-                .attr('class','col12 grid-entry');
-
-        typebutton.append('div')
-            .attr('class', 'icon' + (preset ?  ' feature-' + (preset.icon || 'marker-stroked') : ''));
-
-        typebutton.node().focus();
-
          var namewrap = headerwrap.append('div')
-             .attr('class', 'name fillL inspector-inner col8');
-
-        typebutton.append('span')
-            .attr('class','label')
-            .text(preset.name());
+             .attr('class', 'name fillL inspector-inner col12');
 
         namewrap.append('h4')
             .text(t('inspector.name'));