preset style/layout cleanup.

This commit is contained in:
saman bb
2013-03-12 15:32:07 -04:00
parent 50019cd34c
commit 6dc7b7b236
6 changed files with 39 additions and 30 deletions
+3 -6
View File
@@ -6,16 +6,13 @@ iD.ui.Inspector = function(context) {
function inspector(selection) {
var entity = selection.datum();
var inspectorbody = selection.append('div')
.attr('class', 'fillL');
var presetGrid = iD.ui.PresetGrid(context)
.entity(entity)
.on('close', function() {
event.close();
})
.on('choose', function(preset) {
inspectorbody.call(tagEditor, preset);
selection.call(tagEditor, preset);
});
tagEditor = iD.ui.TagEditor(context)
@@ -27,10 +24,10 @@ iD.ui.Inspector = function(context) {
event.close(entity);
})
.on('choose', function() {
inspectorbody.call(presetGrid, true);
selection.call(presetGrid, true);
});
inspectorbody.call(initial ? presetGrid : tagEditor);
selection.call(initial ? presetGrid : tagEditor);
selection.call(iD.ui.Toggle(true));
}
+1 -1
View File
@@ -30,7 +30,7 @@ iD.ui.preset = function(context) {
.data(preset.form)
.enter()
.append('div')
.attr('class', 'preset-section inspector-inner col12');
.attr('class', 'preset-section fillL inspector-inner col12');
sections.each(function(d) {
var s = d3.select(this);
+3 -3
View File
@@ -20,7 +20,7 @@ iD.ui.PresetGrid = function(context) {
.attr('class', 'preset-grid-search-wrap inspector-inner');
var grid = selection.append('div')
.attr('class', 'preset-grid fillD inspector-body inspector-body-' + entity.geometry(context.graph()))
.attr('class', 'preset-grid inspector-body fillL2 inspector-body-' + entity.geometry(context.graph()))
.call(drawGrid, context.presets().defaults(entity, 12));
searchwrap.append('span').attr('class', 'icon search');
@@ -120,7 +120,7 @@ iD.ui.PresetGrid = function(context) {
entered.append('button')
.attr('tabindex', -1)
.attr('class', 'preset-help minor')
.attr('class', 'preset-help')
.on('click', function(d) {
// Display description box inline
@@ -165,7 +165,7 @@ iD.ui.PresetGrid = function(context) {
_.find(data, function(d) { return d.lang === 'en'; });
description.text(doc.description);
link.attr('href', 'http://wiki.openstreetmap.org/wiki/' + encodeURIComponent(doc.title));
link.text(doc.title);
link.text(t('inspector.reference'));
});
})
.append('span')
+3 -3
View File
@@ -38,7 +38,7 @@ iD.ui.TagEditor = function(context) {
.text(t('inspector.choose'));
var editorwrap = selection.append('div')
.attr('class', 'tag-wrap inspector-body inspector-body-' + entity.geometry(context.graph()));
.attr('class', 'tag-wrap inspector-body fillL2 inspector-body-' + entity.geometry(context.graph()));
var headerwrap = editorwrap.append('div').attr('class','col12 head');
@@ -57,10 +57,10 @@ iD.ui.TagEditor = function(context) {
typebutton.node().focus();
var namewrap = headerwrap.append('div')
.attr('class', 'name preset-section inspector-inner col9');
.attr('class', 'name preset-section fillL inspector-inner col9');
typebutton.append('span')
.attr('class','h4')
.attr('class','label')
.text(preset.name);
namewrap.append('h4').text(t('inspector.name'));