CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-03 09:53:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

rework save UI

Browse Source
This commit is contained in:
samanpwbb
2015-02-09 14:28:55 -05:00
parent c1d393302a
commit e49ebe2784
5 changed files with 61 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
css/app.css
View File

@@ -436,6 +436,11 @@ button.action {
color: white;
}
button[disabled].action {
background: #cccccc;
color: #888;
}
button.action:focus,
button.action:hover {
background: #597BE7;
@@ -2575,8 +2580,6 @@ img.wiki-image {
}
.error-detail-container {
display: block;
padding: 20px;
background: #f6f6f6;
border-radius: 3px;
margin: 10px 0;
@@ -2587,8 +2590,12 @@ img.wiki-image {
list-style: disc;
}
.error-detail-list {
padding: 20px 20px 10px 20px;
}
.error-choice-buttons {
margin-top: 10px;
padding: 0 20px 20px 20px;
}
.error-choice-button {

6
data/core.yaml
View File

@@ -321,8 +321,8 @@ en:
conflict:
header: Resolve conflicting edits
message: 'Conflicting edits were made to {name}'
keep_local: Keep my changes
keep_remote: Discard my changes
keep_local: Keep mine
keep_remote: Use theirs
restore: Restore
delete: Leave Deleted
annotation:
@@ -331,8 +331,8 @@ en:
keep_remote: 'Kept remote version of {id}.'
restore: 'Restored local version of {id}.'
delete: 'Deleted local version of {id}.'
try_again: Try to Save
download_changes: Download your changes.
done: "All conflicts resolved!"
help: |
Another user changed some of the same map features you changed.
Click on each item below for more details about the conflict, and choose whether to keep

6
dist/locales/en.json vendored
View File

@@ -395,8 +395,8 @@
"conflict": {
"header": "Resolve conflicting edits",
"message": "Conflicting edits were made to {name}",
"keep_local": "Keep my changes",
"keep_remote": "Discard my changes",
"keep_local": "Keep mine",
"keep_remote": "Use theirs",
"restore": "Restore",
"delete": "Leave Deleted",
"annotation": {
@@ -406,8 +406,8 @@
"restore": "Restored local version of {id}.",
"delete": "Deleted local version of {id}."
},
"try_again": "Try to Save",
"download_changes": "Download your changes.",
"done": "All conflicts resolved!",
"help": "Another user changed some of the same map features you changed.\nClick on each item below for more details about the conflict, and choose whether to keep\nyour changes or the other user's changes.\n"
}
},

6
index.html
View File

@@ -261,6 +261,12 @@
"oauth_secret": "aMnOOCwExO2XYtRVWJ1bI9QOdqh1cay2UgpbhA6p"
}
]));
id.connection()
.switch({
"url": "http://api06.dev.openstreetmap.org",
"oauth_consumer_key": "zwQZFivccHkLs3a8Rq5CoS412fE5aPCXDw9DZj7R",
"oauth_secret": "aMnOOCwExO2XYtRVWJ1bI9QOdqh1cay2UgpbhA6p"
});
});
</script>

49
js/id/modes/save.js
View File

@@ -212,12 +212,13 @@ iD.modes.Save = function(context) {
buttons
.append('button')
.attr('disabled', true)
.attr('class', 'action conflicts-button col6')
.on('click.try_again', function() {
confirm.remove();
save(e);
})
.text(t('save.conflict.try_again'));
.text(t('save.title'));
buttons
.append('button')
@@ -259,22 +260,35 @@ iD.modes.Save = function(context) {
.attr('class', 'error-description')
.attr('href', '#')
.classed('hide-toggle', true)
.classed('expanded', function(d, i) {
return i === 0;
})
.text(function(d) { return d.msg || t('save.unknown_error_details'); })
.on('click', function() {
var error = d3.select(this),
detail = d3.select(this.nextElementSibling),
exp = error.classed('expanded');
detail.style('display', exp ? 'none' : 'block');
error.classed('expanded', !exp);
toggleExpanded(this);
d3.event.preventDefault();
});
function toggleExpanded(el) {
var error = d3.select(el),
detail = d3.select(el.nextElementSibling),
exp = error.classed('expanded');
detail
.style('opacity', exp ? 1 : 0)
.transition()
.style('opacity', exp ? 0 : 1)
.style('display', exp ? 'none' : 'block');
error.classed('expanded', !exp);
};
var details = enter
.append('div')
.attr('class', 'error-detail-container')
.style('display', 'none');
.style('display', function(d,i) {
return i === 0 ? 'block' : 'none';
});
details
.append('ul')
@@ -298,7 +312,22 @@ iD.modes.Save = function(context) {
.on('click', function(d) {
d.action();
d3.event.preventDefault();
d3.select(this.parentElement.parentElement.parentElement)
var container = this.parentElement.parentElement.parentElement;
var next = container.nextElementSibling;
window.setTimeout( function() {
if (next) {
toggleExpanded(next.getElementsByTagName('A')[0]);
} else {
d3.select(container.parentElement).append('p')
.text(t('save.conflict.done'));
d3.select('.conflicts-button')
.attr('disabled', null);
}
}, 250);
d3.select(container)
.transition()
.style('opacity', 0)
.remove();