CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-04-01 01:30:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

big commit modal cleanup.

Browse Source
This commit is contained in:
Saman Bemel-Benrud
2013-03-21 17:02:22 -04:00
parent 36da7fee4e
commit 992df47cac
10 changed files with 105 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
js/id/ui/commit.js
View File

@@ -28,22 +28,30 @@ iD.ui.Commit = function(context) {
var changes = selection.datum(),
connection = changes.connection,
user = connection.user(),
header = selection.append('div').attr('class', 'header modal-section fillL'),
header = selection.append('div').attr('class', 'header modal-section'),
body = selection.append('div').attr('class', 'body');
header.append('h2')
header.append('h3')
.text(t('commit.title'));
// Comment Section
var commentSection = body.append('div')
.attr('class', 'modal-section fillD');
.attr('class', 'modal-section preset-field');
var commentField = commentSection.append('textarea')
.attr('class', 'changeset-comment')
.attr('placeholder', t('commit.description_placeholder'))
.property('value', context.storage('comment') || '');
commentSection.append('h4')
.attr('for','input-commit-note')
.text(t('commit.message_label'));
var commentField = commentSection
.append('textarea')
.attr('placeholder', t('commit.description_placeholder'))
.property('value', context.storage('comment') || '');
commentField.node().select();
// Save Section
var saveSection = body.append('div').attr('class','modal-section cf');
var userLink = d3.select(document.createElement('div'));
if (user.image_url) {
@@ -58,18 +66,14 @@ iD.ui.Commit = function(context) {
.attr('href', connection.url() + '/user/' + user.display_name)
.attr('target', '_blank');
commentSection.append('p')
saveSection.append('p')
.attr('class', 'commit-info')
.html(t('commit.upload_explanation', {user: userLink.html()}));
// Confirm / Cancel Buttons
var buttonWrap = commentSection.append('div')
.attr('class', 'buttons cf')
.append('div')
.attr('class', 'button-wrap joined col4');
var saveButton = buttonWrap.append('button')
.attr('class', 'save action col6 button')
var saveButton = saveSection.append('button')
.attr('class', 'action col3 button')
.on('click.save', function() {
var comment = commentField.node().value;
localStorage.comment = comment;
@@ -82,21 +86,11 @@ iD.ui.Commit = function(context) {
.attr('class', 'label')
.text(t('commit.save'));
var cancelButton = buttonWrap.append('button')
.attr('class', 'cancel col6 button')
.on('click.cancel', function() {
event.cancel();
});
cancelButton.append('span')
.attr('class', 'label')
.text(t('commit.cancel'));
var warnings = body.selectAll('div.warning-section')
.data(iD.validate(changes, context.graph()))
.enter()
.append('div')
.attr('class', 'modal-section warning-section fillL');
.attr('class', 'modal-section warning-section fillL2');
warnings.append('h3')
.text(t('commit.warnings'));